diff --git a/.ci/Fedora43/Dockerfile b/.ci/Fedora41/Dockerfile
similarity index 95%
rename from .ci/Fedora43/Dockerfile
rename to .ci/Fedora41/Dockerfile
index 27570cf99..fc9e86c2e 100644
--- a/.ci/Fedora43/Dockerfile
+++ b/.ci/Fedora41/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:43
+FROM fedora:41
 
 RUN dnf install -y \
         ccache \
diff --git a/.ci/Servatrice_Debian11/Dockerfile b/.ci/Servatrice_Debian11/Dockerfile
deleted file mode 100644
index fadc9e0e7..000000000
--- a/.ci/Servatrice_Debian11/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM debian:11
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        build-essential \
-        ccache \
-        clang-format \
-        cmake \
-        file \
-        g++ \
-        git \
-        libmariadb-dev-compat \
-        libprotobuf-dev \
-        libqt5sql5-mysql \
-        libqt5websockets5-dev \
-        ninja-build \
-        protobuf-compiler \
-        qttools5-dev \
-        qttools5-dev-tools \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
diff --git a/.ci/Ubuntu22.04/Dockerfile b/.ci/Ubuntu22.04/Dockerfile
index 93c8fdea9..ff2e6e43b 100644
--- a/.ci/Ubuntu22.04/Dockerfile
+++ b/.ci/Ubuntu22.04/Dockerfile
@@ -9,18 +9,20 @@ RUN apt-get update && \
         file \
         g++ \
         git \
+        libgl-dev \
         liblzma-dev \
         libmariadb-dev-compat \
         libprotobuf-dev \
-        libqt5multimedia5-plugins \
-        libqt5sql5-mysql \
-        libqt5svg5-dev \
-        libqt5websockets5-dev \
+        libqt6multimedia6 \
+        libqt6sql6-mysql \
+        libqt6svg6-dev \
+        libqt6websockets6-dev \
         ninja-build \
         protobuf-compiler \
-        qt5-image-formats-plugins \
-        qtmultimedia5-dev \
-        qttools5-dev \
-        qttools5-dev-tools \
+        qt6-image-formats-plugins \
+        qt6-l10n-tools \
+        qt6-multimedia-dev \
+        qt6-tools-dev \
+        qt6-tools-dev-tools \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
diff --git a/.ci/Ubuntu26.04/Dockerfile b/.ci/Ubuntu26.04/Dockerfile
deleted file mode 100644
index 7b0cd389f..000000000
--- a/.ci/Ubuntu26.04/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM ubuntu:26.04
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        build-essential \
-        ca-certificates \
-        ccache \
-        clang-format \
-        cmake \
-        file \
-        g++ \
-        git \
-        libgl-dev \
-        liblzma-dev \
-        libmariadb-dev-compat \
-        libprotobuf-dev \
-        libqt6multimedia6 \
-        libqt6sql6-mysql \
-        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 7ebdd6e4e..2938e0902 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -10,11 +10,8 @@
 # --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_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR CMAKE_GENERATOR
 # (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
 
@@ -49,10 +46,6 @@ while [[ $# != 0 ]]; do
       MAKE_SERVER=1
       shift
       ;;
-    '--no-client')
-      MAKE_NO_CLIENT=1
-      shift
-      ;;
     '--test')
       MAKE_TEST=1
       shift
@@ -73,19 +66,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
-      ;;
     '--dir')
       shift
       if [[ $# == 0 ]]; then
@@ -95,24 +75,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
-        echo "::error file=$0::--target-macos-version expects an argument"
-        exit 3
-      fi
-      TARGET_MACOS_VERSION="$1"
-      shift
-      ;;
     *)
       echo "::error file=$0::unrecognized option: $1"
       exit 3
@@ -141,9 +103,6 @@ flags=("-DCMAKE_BUILD_TYPE=$BUILDTYPE")
 if [[ $MAKE_SERVER ]]; then
   flags+=("-DWITH_SERVER=1")
 fi
-if [[ $MAKE_NO_CLIENT ]]; then
-  flags+=("-DWITH_CLIENT=0" "-DWITH_ORACLE=0")
-fi
 if [[ $MAKE_TEST ]]; then
   flags+=("-DTEST=1")
 fi
@@ -157,9 +116,6 @@ fi
 if [[ $PACKAGE_TYPE ]]; then
   flags+=("-DCPACK_GENERATOR=$PACKAGE_TYPE")
 fi
-if [[ $USE_VCPKG ]]; then
-  flags+=("-DUSE_VCPKG=1")
-fi
 
 # Add cmake --build flags
 buildflags=(--config "$BUILDTYPE")
@@ -176,47 +132,9 @@ function ccachestatsverbose() {
 
 # Compile
 if [[ $RUNNER_OS == macOS ]]; then
-  # QTDIR is needed for macOS since we actually only use the cached thin Qt binaries instead of the install-qt-action,
-  # which sets a few environment variables
-  if QTDIR=$(find "$GITHUB_WORKSPACE/Qt" -depth -maxdepth 2 -name macos -type d -print -quit); then
-    echo "found QTDIR at $QTDIR"
-  else
-    echo "could not find QTDIR!"
-    exit 2
-  fi
-  # the qtdir is located at Qt/[qtversion]/macos
-  # we use find to get the first subfolder with the name "macos"
-  # this works independent of the qt version as there should be only one version installed on the runner at a time
-  export QTDIR
-
-  if [[ $TARGET_MACOS_VERSION ]]; then
-    # CMAKE_OSX_DEPLOYMENT_TARGET is a vanilla cmake flag needed to compile to target macOS version
-    flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=$TARGET_MACOS_VERSION")
-
-    # vcpkg dependencies need a vcpkg triplet file to compile to the target macOS version
-    # an easy way is to copy the x64-osx.cmake file and modify it
-    triplets_dir="/tmp/cmake/triplets"
-    triplet_version="custom-triplet"
-    triplet_file="$triplets_dir/$triplet_version.cmake"
-    arch=$(uname -m)
-    if [[ $arch == x86_64 ]]; then
-      arch="x64"
-    fi
-    mkdir -p "$triplets_dir"
-    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")
-    flags+=("-DVCPKG_HOST_TRIPLET=$triplet_version")
-    flags+=("-DVCPKG_TARGET_TRIPLET=$triplet_version")
-    echo "::group::Generated triplet $triplet_file"
-    cat "$triplet_file"
-    echo "::endgroup::"
-  fi
-
   echo "::group::Signing Certificate"
   if [[ -n "$MACOS_CERTIFICATE_NAME" ]]; then
-    echo "$MACOS_CERTIFICATE" | base64 --decode >"certificate.p12"
+    echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
     security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
     security default-keychain -s build.keychain
     security set-keychain-settings -t 3600 -l build.keychain
@@ -228,29 +146,6 @@ if [[ $RUNNER_OS == macOS ]]; then
     echo "No signing certificate configured. Skipping set up of keychain in macOS environment."
   fi
   echo "::endgroup::"
-
-  if [[ $MAKE_PACKAGE ]]; then
-    # Workaround https://github.com/actions/runner-images/issues/7522
-    # have hdiutil repeat the command 10 times in hope of success
-    hdiutil_script="/tmp/hdiutil.sh"
-    # shellcheck disable=SC2016
-    echo '#!/bin/bash
-    i=0
-    while ! hdiutil "$@"; do
-      if (( ++i >= 10 )); then
-        echo "Error: hdiutil failed $i times!" >&2
-        break
-      fi
-      sleep 1
-    done' >"$hdiutil_script"
-    chmod +x "$hdiutil_script"
-    flags+=(-DCPACK_COMMAND_HDIUTIL="$hdiutil_script")
-  fi
-
-elif [[ $RUNNER_OS == Windows ]]; then
-  # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
-  # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
-  buildflags+=(-- -p:UseMultiToolTask=true -p:EnableClServerMode=true)
 fi
 
 if [[ $USE_CCACHE ]]; then
@@ -261,39 +156,23 @@ fi
 
 echo "::group::Configure cmake"
 cmake --version
-echo "Running cmake with flags: ${flags[*]}"
 cmake .. "${flags[@]}"
 echo "::endgroup::"
 
 echo "::group::Build project"
-echo "Running cmake --build with flags: ${buildflags[*]}"
-cmake --build . "${buildflags[@]}"
+if [[ $RUNNER_OS == Windows ]]; then
+  # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
+  # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
+  cmake --build . "${buildflags[@]}" -- -p:UseMultiToolTask=true -p:EnableClServerMode=true
+else
+  cmake --build . "${buildflags[@]}"
+fi
 echo "::endgroup::"
 
 if [[ $USE_CCACHE ]]; then
-  if [[ $CCACHE_EVICTION_AGE ]]; then
-    echo "::group::evict ccache files older than $CCACHE_EVICTION_AGE"
-    ccache --evict-older-than "$CCACHE_EVICTION_AGE"
-    echo "::endgroup::"
-  fi
   echo "::group::Show ccache stats again"
   ccachestatsverbose
   echo "::endgroup::"
-elif [[ $CCACHE_EVICTION_AGE ]]; then
-  echo "::error file=$0::ccache eviction is enabled while ccache is disabled!"
-fi
-
-if [[ $RUNNER_OS == macOS ]]; then
-  echo "::group::Inspect Mach-O binaries"
-  for app in cockatrice oracle servatrice; do
-    binary="$GITHUB_WORKSPACE/build/$app/$app.app/Contents/MacOS/$app"
-    echo "Inspecting $app..."
-    vtool -show-build "$binary"
-    file "$binary"
-    lipo -info "$binary"
-    echo ""
-  done
-  echo "::endgroup::"
 fi
 
 if [[ $MAKE_TEST ]]; then
@@ -310,6 +189,12 @@ fi
 
 if [[ $MAKE_PACKAGE ]]; then
   echo "::group::Create package"
+  
+  if [[ $RUNNER_OS == macOS ]]; then
+    # Workaround https://github.com/actions/runner-images/issues/7522
+    echo "killing XProtectBehaviorService"; sudo pkill -9 XProtect >/dev/null || true;
+    echo "waiting for XProtectBehaviorService kill"; while pgrep "XProtect"; do sleep 3; done;
+  fi
   cmake --build . --target package --config "$BUILDTYPE"
   echo "::endgroup::"
 
diff --git a/.ci/docker.sh b/.ci/docker.sh
index 46112daaa..a9fcfcc5b 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
@@ -153,11 +137,10 @@ if [[ $SAVE ]]; then
 fi
 
 # Set compile function, runs the compile script on the image, passes arguments to the script
-# shellcheck disable=2120
 function RUN ()
 {
   echo "running image:"
-  if [[ $(docker images) =~ $IMAGE_NAME ]]; then
+  if [[ $(docker images) =~ "$IMAGE_NAME" ]]; then
     local args=(--mount "type=bind,source=$PWD,target=/src")
     args+=(--workdir "/src")
     args+=(--user "$(id -u):$(id -g)")
@@ -165,11 +148,9 @@ 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
     docker run "${args[@]}" $RUN_ARGS "$IMAGE_NAME" bash "$BUILD_SCRIPT" $RUN_OPTS "$@"
     return $?
   else
@@ -183,6 +164,5 @@ function RUN ()
 if [[ $INTERACTIVE ]]; then
   export BUILD_SCRIPT="-i"
   export RUN_ARGS="$RUN_ARGS -it"
-  # shellcheck disable=2119
   RUN
 fi
diff --git a/.ci/lint_cpp.sh b/.ci/lint_cpp.sh
index cfb1e1f07..b08efab1a 100755
--- a/.ci/lint_cpp.sh
+++ b/.ci/lint_cpp.sh
@@ -11,19 +11,11 @@ if ! git merge-base origin/master HEAD; then
 fi
 
 # Check formatting using format.sh
-echo "Checking your code using format.sh..."
+echo "Checking your code using clang-format/cmake-format..."
 
-diff="$(./format.sh --diff --cmake --shell --print-version --branch origin/master)"
+diff="$(./format.sh --diff --cmake --cf-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
@@ -41,13 +33,14 @@ case $err in
 ***********************************************************
 
 Used version:
-$used_version
-
-Affected files:
-$files_to_edit
+${diff%%
+----------
+*}
 
 The following changes should be made:
-$changes_to_make
+${diff#*
+----------
+}
 
 Exiting...
 EOM
@@ -65,9 +58,6 @@ EOM
 ***                                                     ***
 ***********************************************************
 
-Used version:
-$used_version
-
 Exiting...
 EOM
     exit 0
diff --git a/.ci/name_build.sh b/.ci/name_build.sh
index 85818bbd9..060f8a68e 100755
--- a/.ci/name_build.sh
+++ b/.ci/name_build.sh
@@ -2,6 +2,7 @@
 # used by the ci to rename build artifacts
 # renames the file to [original name][SUFFIX].[original extension]
 # where SUFFIX is either available in the environment or as the first arg
+# if MAKE_ZIP is set instead a zip is made
 # expected to be run in the build directory unless BUILD_DIR is set
 # adds output to GITHUB_OUTPUT
 builddir="${BUILD_DIR:=.}"
@@ -21,8 +22,8 @@ set -e
 
 # find file
 found="$(find "$builddir" -maxdepth 1 -type f -name "$findrx" -print -quit)"
-path="${found%/*}"    # remove all including first "/" from right side
-file="${found##*/}"    # remove all including last "/" from left side
+path="${found%/*}" # remove all after last /
+file="${found##*/}" # remove all before last /
 if [[ ! $file ]]; then
   echo "::error file=$0::could not find package"
   exit 1
@@ -34,16 +35,21 @@ if ! cd "$path"; then
 fi
 
 # set filename
-name="${file%.*}"    # remove all including first "." from right side
-new_name="$name$SUFFIX"
-extension="${file##*.}"    # remove all including last "." from left side
-filename="$new_name.$extension"
-echo "renaming '$file' to '$filename'"
-mv "$file" "$filename"
+name="${file%.*}" # remove all after last .
+new_name="$name$SUFFIX."
+if [[ $MAKE_ZIP ]]; then
+  filename="${new_name}zip"
+  echo "creating zip '$filename' from '$file'"
+  zip "$filename" "$file"
+else
+  extension="${file##*.}" # remove all before last .
+  filename="$new_name$extension"
+  echo "renaming '$file' to '$filename'"
+  mv "$file" "$filename"
+fi
 
 cd "$oldpwd"
 relative_path="$path/$filename"
 ls -l "$relative_path"
 echo "path=$relative_path" >>"$GITHUB_OUTPUT"
-echo "name=$new_name" >>"$GITHUB_OUTPUT"
-echo "fullname=$filename" >>"$GITHUB_OUTPUT"
+echo "name=$filename" >>"$GITHUB_OUTPUT"
diff --git a/.ci/release_template.md b/.ci/release_template.md
index 1ce9f4bf7..e5c66a29a 100644
--- a/.ci/release_template.md
+++ b/.ci/release_template.md
@@ -10,6 +10,7 @@ Available pre-compiled binaries for installation:
 
   <b>Windows</b>
    • <kbd>Windows 10+</kbd>
+   • <kbd>Windows 7+</kbd>
 
   <b>macOS</b>
    • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub> <sub>Apple M</sub>
@@ -17,19 +18,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>Debian 11</kbd> <sub><i>Bullseye</i></sub>
-   • <kbd>Fedora 43</kbd>
    • <kbd>Fedora 42</kbd>
+   • <kbd>Fedora 41</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>
 
 
diff --git a/.ci/resolve_latest_aqt_qt_version.sh b/.ci/resolve_latest_aqt_qt_version.sh
deleted file mode 100755
index 066140ac9..000000000
--- a/.ci/resolve_latest_aqt_qt_version.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# This script is used to resolve the latest patch version of Qt using aqtinstall.
-# It interprets wildcards to get the latest patch version. E.g. "6.6.*" -> "6.6.3".
-
-# This script is meant to be used by the ci enironment.
-# It uses the runner's GITHUB_OUTPUT env variable.
-
-# Usage example: .ci/resolve_latest_aqt_qt_version.sh "6.6.*"
-
-qt_spec=$1
-if [[ ! $qt_spec ]]; then
-  echo "usage: $0 [version]"
-  exit 2
-fi
-
-# If version is already specific (no wildcard), use it as-is
-if [[ $qt_spec != *"*" ]]; then
-  echo "version $qt_spec is already resolved"
-  echo "version=$qt_spec" >> "$GITHUB_OUTPUT"
-  exit 0
-fi
-
-if ! hash aqt; then
-  echo "aqt could not be found, has aqtinstall been installed?"
-  exit 2
-fi
-
-# Resolve latest patch
-if [[ $RUNNER_OS == macOS ]]; then
-  if ! qt_resolved=$(aqt list-qt mac desktop --spec "$qt_spec" --latest-version); then
-    exit 1
-  fi
-elif [[ $RUNNER_OS == Windows ]]; then
-  if ! qt_resolved=$(aqt list-qt windows desktop --spec "$qt_spec" --latest-version); then
-    exit 1
-  fi
-else
-  echo "aqt command for $RUNNER_OS not defined."
-  exit 1
-fi
-
-echo "resolved $qt_spec to $qt_resolved"
-if [[ ! $qt_resolved ]]; then
-  echo "Error: Could not resolve Qt version for $qt_spec"
-  exit 1
-fi
-
-echo "version=$qt_resolved" >> "$GITHUB_OUTPUT"
diff --git a/.ci/thin_macos_qtlib.sh b/.ci/thin_macos_qtlib.sh
deleted file mode 100755
index 6c3cc6720..000000000
--- a/.ci/thin_macos_qtlib.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# The macos binaries from aqt are fat (universal), so we thin them to the target architecture to reduce the size of
-# the packages and caches using lipo.
-
-# This script is meant to be used by the ci enironment on macos runners only.
-# It uses the runner's GITHUB_WORKSPACE env variable.
-arch=$(uname -m)
-nproc=$(sysctl -n hw.ncpu)
-
-function thin() {
-  local libfile=$1
-  if [[ $(file -b --mime-type "$libfile") == application/x-mach-binary* ]]; then
-    echo "Processing $libfile"
-    lipo "$libfile" -thin "$arch" -output "$libfile"
-  fi
-  return 0
-}
-export -f thin  # export to allow use in xargs
-export arch
-set -eo pipefail
-
-echo "::group::Thinning Qt libraries to $arch using $nproc cores"
-find "$GITHUB_WORKSPACE/Qt" -type f -print0 | xargs -0 -n1 -P"$nproc" -I{} bash -c "thin '{}'"
-echo "::endgroup::"
diff --git a/.clang-format b/.clang-format
index 1ef3ca6db..6347a2037 100644
--- a/.clang-format
+++ b/.clang-format
@@ -25,9 +25,6 @@ IndentCaseLabels: true
 PointerAlignment: Right
 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 b293b3937..10ffa3493 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,5 +1,3 @@
-<!--! @page contributing Contributing -->
-
 &nbsp; [Introduction](#contributing-to-cockatrice) | [Code Style Guide](
 #code-style-guide) | [Translations](#translations) | [Release Management](
 #release-management)
@@ -461,11 +459,7 @@ revoke the tag by doing the following:
 git push --delete upstream $TAG_NAME
 git tag -d $TAG_NAME
 ```
-You can also do this on GitHub.
-
-> [!NOTE]
-> If you want to push a new release to replace it immediately with the same
-> name you have to delete the automatically created release first!
+You can also do this on GitHub, you'll also want to delete the false release.
 
 In the first lines of [CMakeLists.txt](
 https://github.com/Cockatrice/Cockatrice/blob/master/CMakeLists.txt)
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 02bdc148a..c5354332b 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,12 +1,9 @@
 blank_issues_enabled: false
 contact_links:
   - name: 💬 Discord Community (Get help with server issues, e.g. Login)
-    url: https://discord.com/invite/3Z9yzmA
+    url: https://discord.gg/3Z9yzmA
     about: Need help with using the client? Want to find some games? Try the Discord server!
   - name: 🌐 Translations (Help improve the localization of the app)
     url: https://explore.transifex.com/cockatrice/cockatrice/
     # it is not possible to add a link to the wiki to this description
     about: For more information and guidance check our Translation FAQ on our wiki!
-  - name: 📖 Code Documentation
-    url: https://cockatrice.github.io/docs/
-    about: Helpful source focusing on developers, but there are also references for users!
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 88bed3663..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) & macOS Intel triplet broken with newer releases)
-      - 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:
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 3c8e915a8..b1afcbfa5 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -4,49 +4,35 @@ permissions:
   contents: write
   id-token: write
   attestations: write
-  actions: write # needed for ccache action to be able to delete gha caches
 
 on:
   push:
     branches:
       - master
-    paths:
-      - '*/**'    # matches all files not in root
-      - '!**.md'
-      - '!.github/**'
-      - '!.husky/**'
-      - '!.tx/**'
-      - '!doc/**'
-      - '!webclient/**'
-      - '.github/workflows/desktop-build.yml'
-      - 'CMakeLists.txt'
-      - 'vcpkg.json'
-      - 'vcpkg'
+    paths-ignore:
+      - '**.md'
+      - 'webclient/**'
+      - '.github/workflows/web-*.yml'
+      - '.github/workflows/translations-*.yml'
+      - '.github/workflows/docker-release.yml'
     tags:
       - '*'
   pull_request:
-    paths:
-      - '*/**'    # matches all files not in root
-      - '!**.md'
-      - '!.github/**'
-      - '!.husky/**'
-      - '!.tx/**'
-      - '!doc/**'
-      - '!webclient/**'
-      - '.github/workflows/desktop-build.yml'
-      - 'CMakeLists.txt'
-      - 'vcpkg.json'
-      - 'vcpkg'
+    paths-ignore:
+      - '**.md'
+      - 'webclient/**'
+      - '.github/workflows/web-*.yml'
+      - '.github/workflows/translations-*.yml'
 
-# 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}}
@@ -70,7 +56,7 @@ jobs:
 
       - name: Checkout
         if: steps.configure.outputs.tag != null
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -114,12 +100,7 @@ jobs:
           - distro: Debian
             version: 11
             package: DEB
-
-          - distro: Servatrice_Debian
-            version: 11
-            package: DEB
-            test: skip
-            server_only: yes
+            test: skip    # Running tests on all distros is superfluous
 
           - distro: Debian
             version: 12
@@ -131,12 +112,12 @@ jobs:
             package: DEB
 
           - distro: Fedora
-            version: 42
+            version: 41
             package: RPM
             test: skip    # Running tests on all distros is superfluous
 
           - distro: Fedora
-            version: 43
+            version: 42
             package: RPM
 
           - distro: Ubuntu
@@ -148,31 +129,25 @@ jobs:
             version: 24.04
             package: DEB
 
-          - distro: Ubuntu
-            version: 26.04
-            package: DEB
-
     name: ${{matrix.distro}} ${{matrix.version}}
     needs: configure
     runs-on: ubuntu-latest
     continue-on-error: ${{matrix.allow-failure == 'yes'}}
-    timeout-minutes: 70
     env:
       NAME: ${{matrix.distro}}${{matrix.version}}
       CACHE: ${{github.workspace}}/.cache/${{matrix.distro}}${{matrix.version}}   # directory for caching docker image and ccache
       # Cache size over the entire repo is 10Gi:
       # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
-      CCACHE_SIZE: 550M
-      CCACHE_EVICTION_AGE: 7d
+      CCACHE_SIZE: 500M
       CMAKE_GENERATOR: 'Ninja'
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Restore compiler cache (ccache)
         id: ccache_restore
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
         env:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
@@ -187,47 +162,30 @@ jobs:
       - 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
         id: build
         if: matrix.package != 'skip'
         shell: bash
         env:
+          BUILD_DIR: build
           SUFFIX: '-${{matrix.distro}}${{matrix.version}}'
           package: '${{matrix.package}}'
-          server_only: '${{matrix.server_only}}'
+          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
         run: |
           source .ci/docker.sh
-          args=()
-          if [[ $server_only == yes ]]; then
-            args+=(--no-client)
-          fi
-          if [[ $GITHUB_REF == "refs/heads/master" ]]; then
-            args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
-          fi
-          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"
+          .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)
-        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
-
-      - name: Save updated compiler cache (ccache)
+      - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
         with:
           path: ${{env.CACHE}}
           key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@@ -235,10 +193,10 @@ jobs:
       - name: Upload artifact
         id: upload_artifact
         if: matrix.package != 'skip'
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
+          name: ${{matrix.distro}}${{matrix.version}}-package
           path: ${{steps.build.outputs.path}}
-          archive: false
           if-no-files-found: error
 
       - name: Upload to release
@@ -248,194 +206,97 @@ jobs:
         env:
           GH_TOKEN: ${{github.token}}
           tag_name: ${{needs.configure.outputs.tag}}
-          asset_name: ${{steps.build.outputs.fullname}}
           asset_path: ${{steps.build.outputs.path}}
+          asset_name: ${{steps.build.outputs.name}}
         run: gh release upload "$tag_name" "$asset_path#$asset_name"
 
       - name: Attest binary provenance
         id: attestation
         if: steps.upload_release.outcome == 'success'
-        uses: actions/attest@v4
+        uses: actions/attest-build-provenance@v3
         with:
-          subject-path: ${{steps.build.outputs.path}}
-          show-summary: false
+          subject-name: ${{steps.build.outputs.name}}
+          subject-digest: sha256:${{ steps.upload_artifact.outputs.artifact-digest }}
 
       - 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
+        run: gh attestation verify ${{steps.build.outputs.path}} -R Cockatrice/Cockatrice
 
-  build-vcpkg:
+  build-macos:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: macOS
-            target: 13
-            runner: macos-15-intel
+          - target: 13
             soc: Intel
-            xcode: "16.4"
+            os: macos-13
+            xcode: "14.3.1"
             type: Release
-            override_target: 13
             make_package: 1
-            package_suffix: "-macOS13_Intel"
-            qt_version: 6.11.*
-            qt_arch: clang_64
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
-            cmake_generator: Ninja
-            use_ccache: 1
-            ccache_eviction_age: 7d
 
-          - os: macOS
-            target: 14
-            runner: macos-14
+          - target: 14
             soc: Apple
+            os: macos-14
             xcode: "15.4"
             type: Release
             make_package: 1
-            package_suffix: "-macOS14"
-            qt_version: 6.11.*
-            qt_arch: clang_64
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
-            cmake_generator: Ninja
-            use_ccache: 1
-            ccache_eviction_age: 7d
 
-          - os: macOS
-            target: 15
-            runner: macos-15
+          - target: 15
             soc: Apple
-            xcode: "16.4"
+            os: macos-15
+            xcode: "16.2"
             type: Release
             make_package: 1
-            package_suffix: "-macOS15"
-            qt_version: 6.11.*
-            qt_arch: clang_64
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
-            cmake_generator: Ninja
-            use_ccache: 1
-            ccache_eviction_age: 7d
 
-          - os: macOS
-            target: 15
-            runner: macos-15
+          - target: 15
             soc: Apple
-            xcode: "16.4"
+            os: macos-15
+            xcode: "16.2"
             type: Debug
-            qt_version: 6.11.*
-            qt_arch: clang_64
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
-            cmake_generator: Ninja
-            use_ccache: 1
-            ccache_eviction_age: 7d
 
-          - os: Windows
-            target: 10
-            runner: windows-2025
-            type: Release
-            make_package: 1
-            package_suffix: "-Win10"
-            qt_version: 6.11.*
-            qt_arch: win64_msvc2022_64
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
-            cmake_generator: "Visual Studio 17 2022"
-            cmake_generator_platform: x64
-
-    name: ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
+    name: macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
     needs: configure
-    runs-on: ${{matrix.runner}}
-    timeout-minutes: 100
+    runs-on: ${{matrix.os}}
+    continue-on-error: ${{matrix.allow-failure == 'yes'}}
     env:
-      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
+      # Common parameters for all macOS builds
+      QT_VERSION: 6.6.*
+      QT_ARCH: clang_64
+      QT_MODULES: "qtimageformats qtmultimedia qtwebsockets"
+      # Build-specific environment variables
+      CCACHE_DIR: ${{github.workspace}}/.ccache/${{matrix.os}}-${{matrix.type}}
+      CCACHE_SIZE: 500M
+      DEVELOPER_DIR:
+        /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer
+      CMAKE_GENERATOR: 'Ninja'
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
-      - name: Add msbuild to PATH
-        if: matrix.os == 'Windows'
-        id: add-msbuild
-        uses: microsoft/setup-msbuild@v3
-        with:
-          msbuild-architecture: x64
-
+      # Using jianmingyong/ccache-action to setup ccache without using brew
+      # It tries to download a binary of ccache from GitHub Release and falls back to building from source if it fails
       - name: Setup ccache
-        if: matrix.use_ccache == 1 && matrix.os == 'macOS'
-        run: brew install ccache
-
-      - 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 }}
+        uses: jianmingyong/ccache-action@v1
         with:
-          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
-        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
-        id: resolve_qt_version
-        shell: bash
-        run: .ci/resolve_latest_aqt_qt_version.sh "${{matrix.qt_version}}"
-
-      - 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:
-          path: ${{ github.workspace }}/Qt
-          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
+          install-type: "binary"
+          ccache-key-prefix: ccache-${{matrix.os}}-${{matrix.soc}}-${{matrix.type}}
+          gh-token: ${{ secrets.GITHUB_TOKEN }}
 
       # 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: Install fat Qt ${{ steps.resolve_qt_version.outputs.version }} (${{ matrix.soc }} macOS)
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
+      - name: Install Qt ${{env.QT_VERSION}}
         uses: jurplel/install-qt-action@v4
         with:
-          version: ${{ steps.resolve_qt_version.outputs.version }}
-          arch: ${{matrix.qt_arch}}
-          modules: ${{matrix.qt_modules}}
-          cache: false
-          dir: ${{github.workspace}}
-
-      - 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: Cache thin Qt libraries (${{ matrix.soc }} macOS)
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v5
-        with:
-          path: ${{ github.workspace }}/Qt
-          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.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
-          version: ${{ steps.resolve_qt_version.outputs.version }}
-          arch: ${{matrix.qt_arch}}
-          modules: ${{matrix.qt_modules}}
-          cache: true
-
-      - name: Install NSIS
-        if: matrix.os == 'Windows'
-        shell: bash
-        run: choco install nsis
+          cache: false # qt caches take too much space for macOS (1.1Gi)
+          version: ${{env.QT_VERSION}}
+          arch: ${{env.QT_ARCH}}
+          modules: ${{env.QT_MODULES}}
 
       - name: Setup vcpkg cache
         id: vcpkg-cache
@@ -443,50 +304,24 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      # uses environment variables, see compile.sh for more details
-      - name: Build Cockatrice
-        id: build
+      - name: Build on Xcode ${{matrix.xcode}}
         shell: bash
+        id: build
         env:
           BUILDTYPE: '${{matrix.type}}'
           MAKE_PACKAGE: '${{matrix.make_package}}'
-          PACKAGE_SUFFIX: '${{matrix.package_suffix}}'
-          CMAKE_GENERATOR: ${{matrix.cmake_generator}}
-          CMAKE_GENERATOR_PLATFORM: ${{matrix.cmake_generator_platform}}
-          USE_CCACHE: ${{matrix.use_ccache}}
-          VCPKG_DISABLE_METRICS: 1
-          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
-          # macOS-specific environment variables, will be ignored on Windows
+          PACKAGE_SUFFIX: '-macOS${{matrix.target}}_${{matrix.soc}}'
           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 }}
-          CCACHE_EVICTION_AGE: ${{ matrix.ccache_eviction_age }}
-        run: .ci/compile.sh --server --test --vcpkg
-
-      # 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
-        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
-
-      - 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 }}
+          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
+          VCPKG_DISABLE_METRICS: 1
+          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
+        run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE"
 
       - name: Sign app bundle
-        if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null
-        id: sign_macos
+        if: matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
         env:
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
@@ -498,7 +333,7 @@ jobs:
           fi
 
       - name: Notarize app bundle
-        if: steps.sign_macos.outcome == 'success'
+        if: matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
         env:
           MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
           MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
@@ -509,20 +344,20 @@ jobs:
             # Store the notarization credentials so that we can prevent a UI password dialog from blocking the CI
             echo "Create keychain profile"
             xcrun notarytool store-credentials "notarytool-profile" --apple-id "$MACOS_NOTARIZATION_APPLE_ID" --team-id "$MACOS_NOTARIZATION_TEAM_ID" --password "$MACOS_NOTARIZATION_PWD"
-
+  
             # We can't notarize an app bundle directly, but we need to compress it as an archive.
             # 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"
-
+  
             # 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
             # characteristics. Visit the Notarization docs for more information and strategies on how to optimize it if
             # you're curious
             echo "Notarize app"
             xcrun notarytool submit "notarization.zip" --keychain-profile "notarytool-profile" --wait
-
+  
             # 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"
@@ -530,47 +365,140 @@ jobs:
           fi
 
       - name: Upload artifact
-        if: matrix.make_package
         id: upload_artifact
-        uses: actions/upload-artifact@v7
+        if: matrix.make_package
+        uses: actions/upload-artifact@v4
         with:
+          name: macOS${{matrix.target}}${{ matrix.soc == 'Intel' && '_Intel' || '' }}${{ matrix.type == 'Debug' && '_Debug' || '' }}-package
           path: ${{steps.build.outputs.path}}
-          archive: false
-          if-no-files-found: error
-
-      - name: Upload PDBs (Program Databases)
-        if: matrix.os == 'Windows' && github.ref_type != 'tag'
-        uses: actions/upload-artifact@v7
-        with:
-          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
-        if: needs.configure.outputs.tag != null && matrix.make_package == '1'
         id: upload_release
+        if: matrix.make_package && needs.configure.outputs.tag != null
         shell: bash
         env:
           GH_TOKEN: ${{github.token}}
           tag_name: ${{needs.configure.outputs.tag}}
-          asset_name: ${{steps.build.outputs.fullname}}
           asset_path: ${{steps.build.outputs.path}}
+          asset_name: ${{steps.build.outputs.name}}
         run: gh release upload "$tag_name" "$asset_path#$asset_name"
 
       - name: Attest binary provenance
-        if: steps.upload_release.outcome == 'success'
         id: attestation
-        uses: actions/attest@v4
+        if: steps.upload_release.outcome == 'success'
+        uses: actions/attest-build-provenance@v3
         with:
-          subject-path: ${{steps.build.outputs.path}}
-          show-summary: false
+          subject-name: ${{steps.build.outputs.name}}
+          subject-digest: sha256:${{ steps.upload_artifact.outputs.artifact-digest }}
 
       - 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
+        run: gh attestation verify ${{steps.build.outputs.path}} -R Cockatrice/Cockatrice
+
+  build-windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - target: 7
+            qt_version: 5.15.*
+            qt_arch: msvc2019_64
+
+          - target: 10
+            qt_version: 6.6.*
+            qt_arch: msvc2019_64
+            qt_modules: "qtimageformats qtmultimedia qtwebsockets"
+
+    name: Windows ${{matrix.target}}
+    needs: configure
+    runs-on: windows-2022
+    env:
+      CMAKE_GENERATOR: 'Visual Studio 17 2022'
+
+    steps:
+      - name: Add msbuild to PATH
+        id: add-msbuild
+        uses: microsoft/setup-msbuild@v2
+        with:
+          msbuild-architecture: x64
+
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+
+      - name: Install Qt ${{matrix.qt_version}}
+        uses: jurplel/install-qt-action@v4
+        with:
+          cache: true
+          setup-python: true
+          version: ${{matrix.qt_version}}
+          arch: win64_${{matrix.qt_arch}}
+          modules: ${{matrix.qt_modules}}
+
+      - name: Setup vcpkg cache
+        id: vcpkg-cache
+        uses: TAServers/vcpkg-cache@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Cockatrice
+        id: build
+        shell: bash
+        env:
+          PACKAGE_SUFFIX: '-Win${{matrix.target}}'
+          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
+          CMAKE_GENERATOR_PLATFORM: 'x64'
+          QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\win64_${{matrix.qt_arch}}'
+          VCPKG_DISABLE_METRICS: 1
+          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
+        # No need for --parallel flag, MTT is added in the compile script to let cmake/msbuild manage core count,
+        # project and process parallelism: https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
+        run: .ci/compile.sh --server --release --test --package
+
+      - name: Upload artifact
+        id: upload_artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: Windows${{matrix.target}}-installer
+          path: ${{steps.build.outputs.path}}
+          if-no-files-found: error
+
+      - name: Upload pdb database
+        uses: actions/upload-artifact@v4
+        with:
+          name: Windows${{matrix.target}}-debug-pdbs
+          path: |
+            build/cockatrice/Release/*.pdb
+            build/servatrice/Release/*.pdb
+          if-no-files-found: error
+
+      - name: Upload to release
+        id: upload_release
+        if: needs.configure.outputs.tag != null
+        shell: bash
+        env:
+          GH_TOKEN: ${{github.token}}
+          tag_name: ${{needs.configure.outputs.tag}}
+          asset_path: ${{steps.build.outputs.path}}
+          asset_name: ${{steps.build.outputs.name}}
+        run: gh release upload "$tag_name" "$asset_path#$asset_name"
+
+      - name: Attest binary provenance
+        id: attestation
+        if: steps.upload_release.outcome == 'success'
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-name: ${{steps.build.outputs.name}}
+          subject-digest: sha256:${{ steps.upload_artifact.outputs.artifact-digest }}
+
+      - name: Verify binary attestation
+        if: steps.attestation.outcome == 'success'
+        shell: bash
+        env:
+          GH_TOKEN: ${{github.token}}
+        run: gh attestation verify ${{steps.build.outputs.path}} -R Cockatrice/Cockatrice
diff --git a/.github/workflows/desktop-lint.yml b/.github/workflows/desktop-lint.yml
index fe7be0287..39b68eb72 100644
--- a/.github/workflows/desktop-lint.yml
+++ b/.github/workflows/desktop-lint.yml
@@ -1,38 +1,29 @@
 name: Code Style (C++) 
 
 on:
-  # 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'
-      - '.cmake-format.json'
-      - 'format.sh'
+    paths-ignore:
+      - '**.md'
+      - 'webclient/**'
+      - '.github/workflows/web-*.yml'
+      - '.github/workflows/translations-*.yml'
+      - '.github/workflows/docker-release.yml'
 
 jobs:
   format:
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5
       with:
-        fetch-depth: 20    # should be enough to find merge base
+        fetch-depth: 20 # should be enough to find merge base
 
     - 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
 
     - name: Check code formatting
       shell: bash
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index fca1e97d4..aa341c7a9 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -11,12 +11,6 @@ on:
       - master
     paths:
       - '.github/workflows/docker-release.yml'
-      - 'Dockerfile'
-
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
-concurrency:
-  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: ${{ github.ref_type != 'tag' }}
 
 jobs:
   docker:
@@ -28,11 +22,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Docker metadata
         id: metadata
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/cockatrice/servatrice
@@ -46,27 +40,26 @@ jobs:
             org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games  
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         if: github.ref_type == 'tag'
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           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
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/documentation-build.yml b/.github/workflows/documentation-build.yml
index ce331d113..3dc4262d9 100644
--- a/.github/workflows/documentation-build.yml
+++ b/.github/workflows/documentation-build.yml
@@ -6,14 +6,11 @@ on:
       - '*'   # Only re-generate docs when a new tagged version is pushed
   pull_request:
     paths:
-      - 'doc/doxygen/**'
       - '.github/workflows/documentation-build.yml'
       - 'Doxyfile'
+      - 'doxygen_style.css'
   workflow_dispatch:
 
-env:
-  COCKATRICE_REF: ${{ github.ref_name }}    # Tag name if the commit is tagged, otherwise branch name
-
 jobs:
   docs:
     name: Doxygen
@@ -21,40 +18,17 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
-        with:
-          submodules: recursive
+        uses: actions/checkout@v5
 
-      - name: Install Graphviz
-        run: |
-          sudo apt-get install -y graphviz
-          dot -V
-
-      - name: Install Doxygen
-        uses: ssciwr/doxygen-install@v2
-        with:
-          version: "1.14.0"
-
-      - name: Update Doxygen Configuration
-        run: |
-          git diff Doxyfile
-          doxygen -u Doxyfile
-          if git diff --quiet Doxyfile; then
-            echo "::notice::No config changes in Doxyfile detected."
-          else
-            echo "::error::Config changes in Doxyfile detected! Please update the file by running 'doxygen -u Doxyfile'."
-            echo ""
-            git diff --color=always Doxyfile
-            exit 1
-          fi
+      - name: Install Doxygen and Graphviz
+        run: sudo apt-get install -y doxygen graphviz
 
       - name: Generate Documentation
-        if: always()
         run: doxygen Doxyfile
 
       - name: Deploy to cockatrice.github.io
         if: github.event_name != 'pull_request'
-        uses: peaceiris/actions-gh-pages@v4
+        uses: peaceiris/actions-gh-pages@v3
         with:
           deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
           external_repository: Cockatrice/cockatrice.github.io
diff --git a/.github/workflows/translations-pull.yml b/.github/workflows/translations-pull.yml
index ca9069192..54bc76b19 100644
--- a/.github/workflows/translations-pull.yml
+++ b/.github/workflows/translations-pull.yml
@@ -7,7 +7,6 @@ on:
     - cron: '0 0 15 1,4,7,10 *'
   pull_request:
     paths:
-      - '.tx/**'
       - '.github/workflows/translations-pull.yml'
 
 jobs:
@@ -16,11 +15,11 @@ 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
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Pull translated strings from Transifex
         uses: transifex/cli-action@v2
@@ -33,7 +32,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           add-paths: |
             cockatrice/translations/*.ts
diff --git a/.github/workflows/translations-push.yml b/.github/workflows/translations-push.yml
index e926a58ed..5e299bf1f 100644
--- a/.github/workflows/translations-push.yml
+++ b/.github/workflows/translations-push.yml
@@ -7,7 +7,6 @@ on:
     - cron: '0 0 1 1,4,7,10 *'
   pull_request:
     paths:
-      - '.ci/update_translation_source_strings.sh'
       - '.github/workflows/translations-push.yml'
 
 jobs:
@@ -16,11 +15,11 @@ 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
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Install lupdate
         shell: bash
@@ -31,10 +30,10 @@ jobs:
       - name: Update Cockatrice translation source
         id: cockatrice
         shell: bash
-        run: |
-          FILE="cockatrice/cockatrice_en@source.ts"
-          export DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')"
-          FILE="$FILE" DIRS="$DIRS" .ci/update_translation_source_strings.sh
+        env:
+          FILE: 'cockatrice/cockatrice_en@source.ts'
+          DIRS: 'cockatrice/src common'
+        run: .ci/update_translation_source_strings.sh
 
       - name: Update Oracle translation source
         id: oracle
@@ -46,7 +45,7 @@ jobs:
 
       - 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: |
@@ -57,7 +56,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           add-paths: |
             cockatrice/cockatrice_en@source.ts
diff --git a/.github/workflows/web-build.yml b/.github/workflows/web-build.yml
index 8d756da02..f328fac88 100644
--- a/.github/workflows/web-build.yml
+++ b/.github/workflows/web-build.yml
@@ -5,16 +5,14 @@ on:
     branches:
       - master
     paths:
-      - '.husky/**'
+      - '.github/workflows/web-*.yml'
       - 'webclient/**'
       - '!**.md'
-      - '.github/workflows/web-build.yml'
   pull_request:
     paths:
-      - '.husky/**'
+      - '.github/workflows/web-*.yml'
       - 'webclient/**'
       - '!**.md'
-      - '.github/workflows/web-build.yml'
 
 jobs:
   build-web:
@@ -35,10 +33,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Setup Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v5
         with:
           node-version: ${{matrix.node_version}}
           cache: 'npm'
diff --git a/.github/workflows/web-lint.yml b/.github/workflows/web-lint.yml
index ecc6d14d1..7a962ea55 100644
--- a/.github/workflows/web-lint.yml
+++ b/.github/workflows/web-lint.yml
@@ -1,16 +1,15 @@
 name: Code Style (TypeScript) 
 
 on:
-  # push trigger not needed for linting, we do not allow direct pushes to master
   pull_request:
     paths:
+      - '.github/workflows/web-*.yml'
       - 'webclient/**'
       - '!**.md'
-      - '.github/workflows/web-lint.yml'
 
 jobs:
   ESLint:
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     
     defaults:
       run:
@@ -18,10 +17,10 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5
 
     - name: Setup Node.js
-      uses: actions/setup-node@v6
+      uses: actions/setup-node@v5
       with:
         cache: 'npm'
         cache-dependency-path: 'webclient/package-lock.json'
diff --git a/.gitignore b/.gitignore
index 33c1ae31d..f147c1458 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,3 @@ compile_commands.json
 .cache
 .gdb_history
 cockatrice/resources/config/qtlogging.ini
-docs/
diff --git a/.gitmodules b/.gitmodules
index 732fec7ca..a0a57f3d7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/microsoft/vcpkg.git
-[submodule "doxygen-awesome-css"]
-	path = doc/doxygen/theme
-	url = https://github.com/jothepro/doxygen-awesome-css.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a5e944c4..34afff90b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,10 +20,10 @@ option(WITH_SERVER "build servatrice" OFF)
 option(WITH_CLIENT "build cockatrice" ON)
 # Compile oracle
 option(WITH_ORACLE "build oracle" ON)
+# Compile dbconverter
+option(WITH_DBCONVERTER "build dbconverter" ON)
 # Compile tests
 option(TEST "build tests" OFF)
-# Use vcpkg regardless of OS
-option(USE_VCPKG "Use vcpkg regardless of OS" OFF)
 
 # Default to "Release" build type
 # User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call
@@ -48,8 +48,8 @@ if(USE_CCACHE)
   endif()
 endif()
 
-if(WIN32 OR USE_VCPKG)
-  # Use vcpkg toolchain on Windows (and on macOS in CI)
+if(WIN32 OR APPLE)
+  # Use vcpkg toolchain on Windows and macOS
   set(CMAKE_TOOLCHAIN_FILE
       ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
       CACHE STRING "Vcpkg toolchain file"
@@ -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.0.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
@@ -254,9 +254,7 @@ endif()
 set(CPACK_PACKAGE_CONTACT "Zach Halpern <zach@cockatrice.us>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}")
 set(CPACK_PACKAGE_VENDOR "Cockatrice Development Team")
-set(CPACK_PACKAGE_DESCRIPTION
-    "Cockatrice is an open-source, multiplatform application for playing tabletop card games over a network. The program's server design prevents users from manipulating the game for unfair advantage. The client also provides a single-player mode, which allows users to brew while offline."
-)
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
@@ -328,24 +326,7 @@ endif()
 
 include(CPack)
 
-add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_interfaces ${CMAKE_BINARY_DIR}/libcockatrice_interfaces)
-add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_protocol ${CMAKE_BINARY_DIR}/libcockatrice_protocol)
-if(WITH_CLIENT
-   OR WITH_SERVER
-   OR WITH_ORACLE
-)
-  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_network ${CMAKE_BINARY_DIR}/libcockatrice_network)
-endif()
-add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_deck_list ${CMAKE_BINARY_DIR}/libcockatrice_deck_list)
-add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libcockatrice_rng)
-add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_card ${CMAKE_BINARY_DIR}/libcockatrice_card)
-add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility)
-if(WITH_ORACLE OR WITH_CLIENT)
-  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_settings ${CMAKE_BINARY_DIR}/libcockatrice_settings)
-  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_models ${CMAKE_BINARY_DIR}/libcockatrice_models)
-  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_filters ${CMAKE_BINARY_DIR}/libcockatrice_filters)
-endif()
-
+add_subdirectory(common)
 if(WITH_SERVER)
   add_subdirectory(servatrice)
   set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
@@ -361,6 +342,11 @@ if(WITH_ORACLE)
   set(CPACK_INSTALL_CMAKE_PROJECTS "Oracle;Oracle;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
 endif()
 
+if(WITH_DBCONVERTER)
+  add_subdirectory(dbconverter)
+  set(CPACK_INSTALL_CMAKE_PROJECTS "Dbconverter;Dbconverter;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
+endif()
+
 if(TEST)
   include(CTest)
   add_subdirectory(tests)
diff --git a/Dockerfile b/Dockerfile
index d185b746a..2a0d10eba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,8 @@
-# -------- Build Stage --------
-FROM ubuntu:24.04 AS build
+FROM ubuntu:24.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install -y\
   build-essential \
   cmake \
   file \
@@ -17,28 +16,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   qt6-tools-dev \
   qt6-tools-dev-tools
 
-WORKDIR /src
-COPY . .
-RUN mkdir build && cd build && \
-    cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 && \
-    make -j$(nproc) && \
-    make install
+COPY ./CMakeLists.txt ./LICENSE ./README.md /home/servatrice/code/
+COPY ./cmake /home/servatrice/code/cmake
+COPY ./common /home/servatrice/code/common
+COPY ./servatrice /home/servatrice/code/servatrice
 
+WORKDIR /home/servatrice/code
 
-# -------- Runtime Stage (clean) --------
-FROM ubuntu:24.04
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  libprotobuf32t64 \
-  libqt6sql6-mysql \
-  libqt6websockets6 \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Only copy installed binaries, not source
-COPY --from=build /usr/local /usr/local
+WORKDIR build
+RUN cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=0 &&\
+  make &&\
+  make install
 
 WORKDIR /home/servatrice
 
 EXPOSE 4748
+
 ENTRYPOINT [ "servatrice", "--log-to-console" ]
diff --git a/Doxyfile b/Doxyfile
index 0f2642fd8..e36f0d70d 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -42,32 +42,32 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = Cockatrice
+PROJECT_NAME           = "Cockatrice"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = $(COCKATRICE_REF)
+PROJECT_NUMBER         =
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewers a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "A virtual tabletop for multiplayer card games"
+PROJECT_BRIEF          =
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           = cockatrice/resources/cockatrice.png
+PROJECT_LOGO           =
 
 # With the PROJECT_ICON tag one can specify an icon that is included in the tabs
 # when the HTML document is shown. Doxygen will copy the logo to the output
 # directory.
 
-PROJECT_ICON           = cockatrice/resources/cockatrice.png
+PROJECT_ICON           =
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -379,7 +379,7 @@ TOC_INCLUDE_HEADINGS   = 6
 # The default value is: DOXYGEN.
 # This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
 
-MARKDOWN_ID_STYLE      = GITHUB
+MARKDOWN_ID_STYLE      = DOXYGEN
 
 # When enabled Doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
@@ -839,7 +839,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, Doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
-LAYOUT_FILE            = doc/doxygen/DoxygenLayout.xml
+LAYOUT_FILE            =
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@@ -991,7 +991,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = .
+INPUT                  = cockatrice common
 
 # This tag can be used to specify the character encoding of the source files
 # that Doxygen parses. Internally Doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1031,7 +1031,8 @@ INPUT_FILE_ENCODING    =
 # provided as Doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
 # *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
-FILE_PATTERNS          = *.cc \
+FILE_PATTERNS          = *.c \
+                         *.cc \
                          *.cxx \
                          *.cxxm \
                          *.cpp \
@@ -1039,19 +1040,47 @@ FILE_PATTERNS          = *.cc \
                          *.ccm \
                          *.c++ \
                          *.c++m \
+                         *.java \
                          *.ii \
                          *.ixx \
                          *.ipp \
                          *.i++ \
                          *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
                          *.h \
                          *.hh \
                          *.hxx \
                          *.hpp \
                          *.h++ \
+                         *.l \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
                          *.markdown \
                          *.md \
-                         *.dox
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.pyw \
+                         *.f90 \
+                         *.f95 \
+                         *.f03 \
+                         *.f08 \
+                         *.f18 \
+                         *.f \
+                         *.for \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf \
+                         *.ice
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -1066,12 +1095,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which Doxygen is
 # run.
 
-EXCLUDE                = build/ \
-                         cmake/ \
-                         doc/doxygen/theme/docs/ \
-                         doc/doxygen/theme/include/ \
-                         vcpkg/ \
-                         webclient/
+EXCLUDE                = common/lib
 
 # 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
@@ -1087,8 +1111,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = .* \
-                         .*/
+EXCLUDE_PATTERNS       =
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -1122,7 +1145,7 @@ EXAMPLE_RECURSIVE      = NO
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             = doc/doxygen/images
+IMAGE_PATH             =
 
 # The INPUT_FILTER tag can be used to specify a program that Doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -1290,46 +1313,6 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
-# If the CLANG_ASSISTED_PARSING tag is set to YES then Doxygen will use the
-# clang parser (see:
-# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
-# performance. This can be particularly helpful with template rich C++ code for
-# which Doxygen's built-in parser lacks the necessary type information.
-# Note: The availability of this option depends on whether or not Doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
-# tag is set to YES then Doxygen will add the directory of each input to the
-# include path.
-# The default value is: YES.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_ADD_INC_PATHS    = YES
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by Doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-# If clang assisted parsing is enabled you can provide the clang parser with the
-# path to the directory containing a file called compile_commands.json. This
-# file is the compilation database (see:
-# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
-# options used when the source files were built. This is equivalent to
-# specifying the -p option to a clang tool, such as clang-check. These options
-# will then be passed to the parser. Any options specified with CLANG_OPTIONS
-# will be added as well.
-# Note: The availability of this option depends on whether or not Doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-
-CLANG_DATABASE_PATH    =
-
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1432,9 +1415,7 @@ HTML_STYLESHEET        =
 # documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = doc/doxygen/theme/doxygen-awesome.css \
-                         doc/doxygen/css/hide_nav_sync.css \
-                         doc/doxygen/css/cockatrice_docs_style.css
+HTML_EXTRA_STYLESHEET  = doc/doxygen/css/doxygen_style.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1457,7 +1438,7 @@ HTML_EXTRA_FILES       = doc/doxygen/js/graph_toggle.js
 # The default value is: AUTO_LIGHT.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE        = LIGHT
+HTML_COLORSTYLE        = DARK
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
@@ -2040,7 +2021,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, Doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = YES
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -2626,7 +2607,7 @@ DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
 # The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10,arrowhead=open, arrowtail=open, arrowsize=0.5"
+DOT_EDGE_ATTR  = "labelfontname=Helvetica,labelfontsize=10,arrowhead=open, arrowtail=open, arrowsize=0.5"
 
 # DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
 # around nodes set 'shape=plain' or 'shape=plaintext' <a
@@ -2634,7 +2615,7 @@ DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10,arrowhead=ope
 # The default value is: shape=box,height=0.2,width=0.4.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+DOT_NODE_ATTR  = "shape=box,height=0.2,width=0.4"
 
 # You can set the path where dot can find font specified with fontname in
 # DOT_COMMON_ATTR and others dot attributes.
diff --git a/README.md b/README.md
index 8ad9a092c..3e415fa23 100644
--- a/README.md
+++ b/README.md
@@ -44,42 +44,24 @@ Latest <kbd>beta</kbd> version:
 
 # Related Repositories
 
-- [Magic-Token](https://github.com/Cockatrice/Magic-Token): File with MtG token data for use in Cockatrice
-- [Magic-Spoiler](https://github.com/Cockatrice/Magic-Spoiler): Code to generate MtG spoiler data from [MTGJSON](https://github.com/mtgjson/mtgjson) for use in Cockatrice
-- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official Cockatrice webpage
-- [io.github.Cockatrice.cockatrice](https://github.com/flathub/io.github.Cockatrice.cockatrice): Configuration of our Linux `flatpak` package hosted at [Flathub](https://flathub.org/en/apps/io.github.Cockatrice.cockatrice)
+- [Magic-Token](https://github.com/Cockatrice/Magic-Token): MtG token data to use in Cockatrice
+- [Magic-Spoiler](https://github.com/Cockatrice/Magic-Spoiler): Script to generate MtG spoiler data from [MTGJSON](https://github.com/mtgjson/mtgjson) to use in Cockatrice
+- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official webpage of the Cockatrice project
 
 
 # Community Resources [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA)
 
-Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with other project contributors (`#dev` channel) or fellow users of the app. Come here to talk about the application, features, or just to hang out.
+Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with other projet contributors (`#dev` channel) or fellow users of the app. Come here to talk about the application, features, or just to hang out.
 - [Official Website](https://cockatrice.github.io)
 - [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki)
 - [Official Discord](https://discord.gg/3Z9yzmA)
 - [reddit r/Cockatrice](https://reddit.com/r/cockatrice)
 
-> [!IMPORTANT]
-> For support regarding specific servers, please contact that server's admin/mods and use their dedicated communication channels rather than contacting the team building the software.
+>[!IMPORTANT]
+>For support regarding specific servers, please contact that server's admin/mods and use their dedicated communication channels rather than contacting the team building the software.
 
 
 # Contribute
-<p>
-   <a href="#code">Code</a> <b>|</b>
-   <a href="#documentation-">Documentation</a> <b>|</b>
-   <a href="#translation-">Translation</a>
-</p>
-
-#### Repository Activity
-![Cockatrice Repo Analytics](https://repobeats.axiom.co/api/embed/c7cec938789a5bbaeb4182a028b4dbb96db8f181.svg "Cockatrice Repo Analytics by Repobeats")
-
-<details>
-<summary><b>Kudos to all our amazing contributors ❤️</b></summary>
-<br>
-   <a href="https://github.com/Cockatrice/Cockatrice/graphs/contributors">
-      <img src="https://contrib.rocks/image?repo=Cockatrice/Cockatrice" />
-   </a><br>
-   <sub><i>Made with <a href="https://contrib.rocks">contrib.rocks</a></i></sub>
-</details>
 
 ### Code
 
@@ -93,23 +75,22 @@ This tag is used for issues that we are looking for somebody to pick up. Often t
 For both tags, we're willing to provide help to contributors in showing them where and how they can make changes, as well as code reviews for submitted changes.<br>
 We'll happily advice on how best to implement a feature, or we can show you where the codebase is doing something similar before you get too far along - put a note on an issue you want to discuss more on!
 
-You can also have a look at our `Todo List` in our [Code Documentation](https://cockatrice.github.io/docs) or search the repo for [`\todo` comments](https://github.com/search?q=repo%3ACockatrice%2FCockatrice%20%5Ctodo&type=code).
-
-### Documentation [![CI Docs](https://github.com/Cockatrice/Cockatrice/actions/workflows/documentation-build.yml/badge.svg?event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/documentation-build.yml?query=event%3Apush)
-
-There are various places where useful information for different needs are maintained:
-- [Official Code Documentation](https://cockatrice.github.io/docs/) 
-- [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki) `Community supported`
-- [Official Webpage](https://cockatrice.github.io/)
-- [Official README](https://github.com/Cockatrice/Cockatrice/blob/master/README.md) `This file`
-
 Cockatrice tries to use the [Google Developer Documentation Style Guide](https://developers.google.com/style/) to ensure consistent documentation. We encourage you to improve the documentation by suggesting edits based on this guide.
 
-### Translation [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://explore.transifex.com/cockatrice/cockatrice/)
+<details>
+<summary><b>Kudos to our amazing contributors ❤️</b></summary>
+<br>
+   <a href="https://github.com/Cockatrice/Cockatrice/graphs/contributors">
+      <img src="https://contrib.rocks/image?repo=Cockatrice/Cockatrice" />
+   </a><br>
+   <sub><i>Made with <a href="https://contrib.rocks">contrib.rocks</a></i></sub>
+</details>
+
+### Translations [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://explore.transifex.com/cockatrice/cockatrice/)
 
 Cockatrice uses Transifex to manage translations. You can help us bring <kbd>Cockatrice</kbd>, <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>
+Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information about getting invovled, and join a group of hundreds of others!<br>
 
 
 # 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)
@@ -143,8 +124,8 @@ You can then
     make package
     ```
 
-> [!NOTE]
-> Detailed compiling instructions can be found in the Cockatrice wiki at [Compiling Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/Compiling-Cockatrice)
+>[!NOTE]
+>Detailed compiling instructions can be found in the Cockatrice wiki at [Compiling Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/Compiling-Cockatrice)
 
 <br>
 
diff --git a/cmake/CMakeDMGSetup.script b/cmake/CMakeDMGSetup.script
index e9a826eb8..fe02eea13 100644
--- a/cmake/CMakeDMGSetup.script
+++ b/cmake/CMakeDMGSetup.script
@@ -42,6 +42,7 @@ tell disk image_name
       set position of item "Cockatrice.app" to { 139, 214 }
       set position of item "Oracle.app" to { 139, 414 }
       set position of item "Servatrice.app" to { 139, 614 }
+      set position of item "dbconverter.app" to { 1400, 1400 }
       set position of item "Applications" to { 861, 414 }
     end tell
     update without registering applications
diff --git a/cmake/FindQtRuntime.cmake b/cmake/FindQtRuntime.cmake
index 485affe52..3025934f4 100644
--- a/cmake/FindQtRuntime.cmake
+++ b/cmake/FindQtRuntime.cmake
@@ -1,11 +1,12 @@
 # Find a compatible Qt version
-# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE, FORCE_USE_QT5
+# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE, WITH_DBCONVERTER, FORCE_USE_QT5
 # Optional Input: QT6_DIR -- Hint as to where Qt6 lives on the system
 # Optional Input: QT5_DIR -- Hint as to where Qt5 lives on the system
 # Output: COCKATRICE_QT_VERSION_NAME -- Example values: Qt5, Qt6
 # Output: SERVATRICE_QT_MODULES
 # Output: COCKATRICE_QT_MODULES
 # Output: ORACLE_QT_MODULES
+# Output: DBCONVERTER_QT_MODULES
 # Output: TEST_QT_MODULES
 
 set(REQUIRED_QT_COMPONENTS Core)
@@ -28,21 +29,22 @@ endif()
 if(WITH_ORACLE)
   set(_ORACLE_NEEDED Concurrent Network Svg Widgets)
 endif()
+if(WITH_DBCONVERTER)
+  set(_DBCONVERTER_NEEDED Network Widgets)
+endif()
 if(TEST)
-  # Union of Qt modules required across all test targets (independent of application targets).
-  # When adding a new test that needs additional Qt modules, add them here rather than in the test's CMakeLists.txt.
-  set(_TEST_NEEDED Concurrent Network Svg Widgets)
+  set(_TEST_NEEDED Widgets)
 endif()
 
 set(REQUIRED_QT_COMPONENTS ${REQUIRED_QT_COMPONENTS} ${_SERVATRICE_NEEDED} ${_COCKATRICE_NEEDED} ${_ORACLE_NEEDED}
-                           ${_TEST_NEEDED}
+                           ${_DBCONVERTER_NEEDED} ${_TEST_NEEDED}
 )
 list(REMOVE_DUPLICATES REQUIRED_QT_COMPONENTS)
 
 if(NOT FORCE_USE_QT5)
   # Linguist is now a component in Qt6 instead of an external package
   find_package(
-    Qt6 6.4.2
+    Qt6 6.2.3
     COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist
     QUIET HINTS ${Qt6_DIR}
   )
@@ -61,7 +63,7 @@ if(Qt6_FOUND)
   endif()
 else()
   find_package(
-    Qt5 5.15.2
+    Qt5 5.8.0
     COMPONENTS ${REQUIRED_QT_COMPONENTS}
     QUIET HINTS ${Qt5_DIR}
   )
@@ -110,9 +112,7 @@ message(DEBUG "QT_LIBRARY_DIR = ${QT_LIBRARY_DIR}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" SERVATRICE_QT_MODULES "${_SERVATRICE_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" COCKATRICE_QT_MODULES "${_COCKATRICE_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" ORACLE_QT_MODULES "${_ORACLE_NEEDED}")
+string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" DB_CONVERTER_QT_MODULES "${_DBCONVERTER_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" TEST_QT_MODULES "${_TEST_NEEDED}")
 
-# Core-only export (useful for headless libs)
-set(QT_CORE_MODULE "${COCKATRICE_QT_VERSION_NAME}::Core")
-
 message(STATUS "Found Qt ${${COCKATRICE_QT_VERSION_NAME}_VERSION} at: ${${COCKATRICE_QT_VERSION_NAME}_DIR}")
diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in
index 7b52b7bcc..fbdde0b86 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
@@ -27,25 +26,14 @@ Var ReinstallMode
 !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Cockatrice.$\r$\n$\r$\nClick Next to continue."
 !define MUI_FINISHPAGE_RUN "$INSTDIR/cockatrice.exe"
 !define MUI_FINISHPAGE_RUN_TEXT "Run 'Cockatrice' now"
-!define MUI_ICON "${NSIS_SOURCE_PATH}\cockatrice\resources\appicon.ico"
 
-!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_WELCOME
-
-!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_LICENSE "${NSIS_SOURCE_PATH}\LICENSE"
-
 Page Custom PortableModePageCreate PortableModePageLeave
 !define MUI_PAGE_CUSTOMFUNCTION_PRE componentsPagePre
 !insertmacro MUI_PAGE_COMPONENTS
-
-!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_DIRECTORY
-
-!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_FINISH
 
 !insertmacro MUI_UNPAGE_CONFIRM
@@ -84,7 +72,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 +89,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 +96,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 +125,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 +158,6 @@ ${EndIf}
 FunctionEnd
 
 Function componentsPagePre
-
-${If} $ReinstallMode = 1
-    Return
-${EndIf}
-
 ${If} $PortableMode = 0
     SetShellVarContext all
 
@@ -249,12 +167,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 +183,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
@@ -303,6 +213,7 @@ ${AndIf} ${FileExists} "$INSTDIR\portable.dat"
 	Delete "$INSTDIR\uninstall.exe"
 	Delete "$INSTDIR\cockatrice.exe"
 	Delete "$INSTDIR\oracle.exe"
+	Delete "$INSTDIR\dbconverter.exe"
 	Delete "$INSTDIR\servatrice.exe"
 	Delete "$INSTDIR\Qt*.dll"
 	Delete "$INSTDIR\libmysql.dll"
@@ -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/SignMacApplications.cmake b/cmake/SignMacApplications.cmake
index c08c30c1e..b91e53725 100644
--- a/cmake/SignMacApplications.cmake
+++ b/cmake/SignMacApplications.cmake
@@ -3,7 +3,7 @@
 string(LENGTH "$ENV{MACOS_CERTIFICATE_NAME}" MACOS_CERTIFICATE_NAME_LEN)
 
 if(APPLE AND MACOS_CERTIFICATE_NAME_LEN GREATER 0)
-  set(APPLICATIONS "cockatrice" "servatrice" "oracle")
+  set(APPLICATIONS "cockatrice" "servatrice" "oracle" "dbconverter")
   foreach(app_name IN LISTS APPLICATIONS)
     set(FULL_APP_PATH "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/${app_name}.app")
 
diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 12733afe6..5ab2a066a 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -7,57 +7,74 @@ 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/update/client/update_downloader.cpp
-    src/client/network/interfaces/deck_stats_interface.cpp
-    src/client/network/interfaces/tapped_out_interface.cpp
+    src/card/card_info.cpp
+    src/card/exact_card.cpp
+    src/client/deck_editor_menu.cpp
+    src/client/get_text_with_max.cpp
+    src/client/network/client_update_checker.cpp
     src/client/network/parsers/deck_link_to_api_transformer.cpp
-    src/client/network/update/client/client_update_checker.cpp
-    src/client/network/update/client/release_channel.cpp
-    src/client/network/update/card_spoiler/spoiler_background_updater.cpp
+    src/client/network/release_channel.cpp
+    src/client/network/replay_timeline_widget.cpp
+    src/client/network/sets_model.cpp
+    src/client/network/spoiler_background_updater.cpp
+    src/client/replay_manager.cpp
     src/client/sound_engine.cpp
-    src/client/settings/cache_settings.cpp
-    src/client/settings/card_counter_settings.cpp
-    src/client/settings/shortcut_treeview.cpp
-    src/client/settings/shortcuts_settings.cpp
-    src/interface/deck_loader/card_node_function.cpp
-    src/interface/deck_loader/deck_file_format.cpp
-    src/interface/deck_loader/deck_loader.cpp
-    src/interface/deck_loader/loaded_deck.cpp
-    src/interface/widgets/dialogs/dlg_connect.cpp
-    src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
-    src/interface/widgets/dialogs/dlg_create_game.cpp
-    src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
-    src/interface/widgets/dialogs/dlg_edit_avatar.cpp
-    src/interface/widgets/dialogs/dlg_edit_password.cpp
-    src/interface/widgets/dialogs/dlg_edit_tokens.cpp
-    src/interface/widgets/dialogs/dlg_edit_user.cpp
-    src/interface/widgets/dialogs/dlg_filter_games.cpp
-    src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
-    src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
-    src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
-    src/interface/widgets/dialogs/dlg_load_deck.cpp
-    src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
-    src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
-    src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
-    src/interface/widgets/dialogs/dlg_local_game_options.cpp
-    src/interface/widgets/dialogs/dlg_manage_sets.cpp
-    src/interface/widgets/dialogs/dlg_register.cpp
-    src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
-    src/interface/widgets/dialogs/dlg_settings.cpp
-    src/interface/widgets/dialogs/dlg_startup_card_check.cpp
-    src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
-    src/interface/widgets/dialogs/dlg_update.cpp
-    src/interface/widgets/dialogs/dlg_view_log.cpp
-    src/interface/widgets/dialogs/override_printing_warning.cpp
-    src/interface/widgets/dialogs/tip_of_the_day.cpp
+    src/client/tapped_out_interface.cpp
+    src/client/update_downloader.cpp
+    src/database/card_database.cpp
+    src/database/card_database_loader.cpp
+    src/database/card_database_manager.cpp
+    src/database/card_database_querier.cpp
+    src/database/model/card_database_model.cpp
+    src/database/model/card_database_display_model.cpp
+    src/database/model/card/card_completer_proxy_model.cpp
+    src/database/model/card/card_search_model.cpp
+    src/database/model/token/token_display_model.cpp
+    src/database/model/token/token_edit_model.cpp
+    src/database/parser/card_database_parser.cpp
+    src/database/parser/cockatrice_xml_3.cpp
+    src/database/parser/cockatrice_xml_4.cpp
+    src/deck/custom_line_edit.cpp
+    src/deck/deck_list_model.cpp
+    src/deck/deck_loader.cpp
+    src/deck/deck_stats_interface.cpp
+    src/dialogs/dlg_connect.cpp
+    src/dialogs/dlg_convert_deck_to_cod_format.cpp
+    src/dialogs/dlg_create_game.cpp
+    src/dialogs/dlg_default_tags_editor.cpp
+    src/dialogs/dlg_edit_avatar.cpp
+    src/dialogs/dlg_edit_password.cpp
+    src/dialogs/dlg_edit_tokens.cpp
+    src/dialogs/dlg_edit_user.cpp
+    src/dialogs/dlg_filter_games.cpp
+    src/dialogs/dlg_forgot_password_challenge.cpp
+    src/dialogs/dlg_forgot_password_request.cpp
+    src/dialogs/dlg_forgot_password_reset.cpp
+    src/dialogs/dlg_load_deck.cpp
+    src/dialogs/dlg_load_deck_from_clipboard.cpp
+    src/dialogs/dlg_load_deck_from_website.cpp
+    src/dialogs/dlg_load_remote_deck.cpp
+    src/dialogs/dlg_manage_sets.cpp
+    src/dialogs/dlg_register.cpp
+    src/dialogs/dlg_select_set_for_cards.cpp
+    src/dialogs/dlg_settings.cpp
+    src/dialogs/dlg_startup_card_check.cpp
+    src/dialogs/dlg_tip_of_the_day.cpp
+    src/dialogs/dlg_update.cpp
+    src/dialogs/dlg_view_log.cpp
+    src/dialogs/tip_of_the_day.cpp
     src/filters/deck_filter_string.cpp
     src/filters/filter_builder.cpp
+    src/filters/filter_card.cpp
+    src/filters/filter_string.cpp
+    src/filters/filter_tree.cpp
     src/filters/filter_tree_model.cpp
     src/filters/syntax_help.cpp
     src/game/abstract_game.cpp
     src/game/board/abstract_card_drag_item.cpp
     src/game/board/abstract_card_item.cpp
     src/game/board/abstract_counter.cpp
+    src/game/board/abstract_graphics_item.cpp
     src/game/board/arrow_item.cpp
     src/game/board/arrow_target.cpp
     src/game/board/card_drag_item.cpp
@@ -117,17 +134,9 @@ set(cockatrice_SOURCES
     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
-    src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
-    src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
-    src/interface/card_picture_loader/card_picture_loader_worker.cpp
-    src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
-    src/interface/card_picture_loader/card_picture_to_load.cpp
     src/interface/layouts/flow_layout.cpp
     src/interface/layouts/overlap_layout.cpp
-    src/interface/widgets/utility/line_edit_completer.cpp
+    src/interface/line_edit_completer.cpp
     src/interface/pixel_map_generator.cpp
     src/interface/theme_manager.cpp
     src/interface/widgets/cards/additional_info/color_identity_widget.cpp
@@ -146,104 +155,47 @@ set(cockatrice_SOURCES
     src/interface/widgets/cards/card_size_widget.cpp
     src/interface/widgets/cards/deck_card_zone_display_widget.cpp
     src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
-    src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
-    src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
-    src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
-    src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.cpp
     src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
-    src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
-    src/interface/widgets/deck_analytics/resizable_panel.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
-    src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
-    src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
+    src/interface/widgets/deck_analytics/mana_base_widget.cpp
+    src/interface/widgets/deck_analytics/mana_curve_widget.cpp
+    src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
-    src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
-    src/interface/widgets/deck_editor/deck_state_manager.cpp
-    src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
     src/interface/widgets/general/background_sources.cpp
-    src/interface/widgets/general/display/background_plate_widget.cpp
     src/interface/widgets/general/display/banner_widget.cpp
+    src/interface/widgets/general/display/bar_widget.cpp
     src/interface/widgets/general/display/dynamic_font_size_label.cpp
     src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
     src/interface/widgets/general/display/labeled_input.cpp
+    src/interface/widgets/general/display/percent_bar_widget.cpp
     src/interface/widgets/general/display/shadow_background_label.cpp
-    src/interface/widgets/general/display/charts/bars/bar_widget.cpp
-    src/interface/widgets/general/display/charts/bars/color_bar.cpp
-    src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
-    src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
-    src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
-    src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
-    src/interface/widgets/general/display/charts/pies/color_pie.cpp
     src/interface/widgets/general/home_styled_button.cpp
     src/interface/widgets/general/home_widget.cpp
     src/interface/widgets/general/layout_containers/flow_widget.cpp
     src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
     src/interface/widgets/general/layout_containers/overlap_widget.cpp
-    src/interface/widgets/menus/deck_editor_menu.cpp
     src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
     src/interface/widgets/printing_selector/card_amount_widget.cpp
     src/interface/widgets/printing_selector/printing_selector.cpp
     src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
-    src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
     src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
     src/interface/widgets/quick_settings/settings_button_widget.cpp
     src/interface/widgets/quick_settings/settings_popup_widget.cpp
-    src/interface/widgets/replay/replay_manager.cpp
-    src/interface/widgets/replay/replay_timeline_widget.cpp
-    src/interface/widgets/server/chat_view/chat_view.cpp
-    src/interface/widgets/server/game_selector.cpp
-    src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
-    src/interface/widgets/server/games_model.cpp
-    src/interface/widgets/server/handle_public_servers.cpp
-    src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
-    src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
-    src/interface/widgets/server/user/user_context_menu.cpp
-    src/interface/widgets/server/user/user_info_box.cpp
-    src/interface/widgets/server/user/user_info_connection.cpp
-    src/interface/widgets/server/user/user_list_manager.cpp
-    src/interface/widgets/server/user/user_list_widget.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
-    src/interface/widgets/utility/visibility_change_listener.cpp
-    src/interface/widgets/utility/visibility_change_listener.h
     src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
-    src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
-    src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
-    src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
-    src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
     src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
     src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
     src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
@@ -261,70 +213,94 @@ set(cockatrice_SOURCES
     src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
     src/interface/window_main.cpp
     src/main.cpp
-    src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
-    src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h
-    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
-    src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
-    src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
-    src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
-    src/interface/widgets/tabs/tab.cpp
-    src/interface/widgets/tabs/tab_account.cpp
-    src/interface/widgets/tabs/tab_admin.cpp
-    src/interface/widgets/tabs/tab_deck_editor.cpp
-    src/interface/widgets/tabs/tab_deck_storage.cpp
-    src/interface/widgets/tabs/tab_game.cpp
-    src/interface/widgets/tabs/tab_home.cpp
-    src/interface/widgets/tabs/tab_logs.cpp
-    src/interface/widgets/tabs/tab_message.cpp
-    src/interface/widgets/tabs/tab_replays.cpp
-    src/interface/widgets/tabs/tab_room.cpp
-    src/interface/widgets/tabs/tab_server.cpp
-    src/interface/widgets/tabs/tab_supervisor.cpp
-    src/interface/widgets/tabs/tab_visual_database_display.cpp
-    src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
-    src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
-    src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
-    src/interface/key_signals.cpp
-    src/interface/logger.cpp
-    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
-    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
+    src/picture_loader/picture_loader.cpp
+    src/picture_loader/picture_loader_local.cpp
+    src/picture_loader/picture_loader_request_status_display_widget.cpp
+    src/picture_loader/picture_loader_status_bar.cpp
+    src/picture_loader/picture_loader_worker.cpp
+    src/picture_loader/picture_loader_worker_work.cpp
+    src/picture_loader/picture_to_load.cpp
+    src/server/abstract_client.cpp
+    src/server/chat_view/chat_view.cpp
+    src/server/game_selector.cpp
+    src/server/games_model.cpp
+    src/server/handle_public_servers.cpp
+    src/server/local_client.cpp
+    src/server/local_server.cpp
+    src/server/local_server_interface.cpp
+    src/server/pending_command.cpp
+    src/server/remote/remote_client.cpp
+    src/server/remote/remote_decklist_tree_widget.cpp
+    src/server/remote/remote_replay_list_tree_widget.cpp
+    src/server/user/user_context_menu.cpp
+    src/server/user/user_info_box.cpp
+    src/server/user/user_info_connection.cpp
+    src/server/user/user_list_manager.cpp
+    src/server/user/user_list_widget.cpp
+    src/settings/cache_settings.cpp
+    src/settings/card_counter_settings.cpp
+    src/settings/card_database_settings.cpp
+    src/settings/card_override_settings.cpp
+    src/settings/debug_settings.cpp
+    src/settings/download_settings.cpp
+    src/settings/game_filters_settings.cpp
+    src/settings/layouts_settings.cpp
+    src/settings/message_settings.cpp
+    src/settings/recents_settings.cpp
+    src/settings/servers_settings.cpp
+    src/settings/settings_manager.cpp
+    src/settings/shortcut_treeview.cpp
+    src/settings/shortcuts_settings.cpp
+    src/tabs/abstract_tab_deck_editor.cpp
+    src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
+    src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
+    src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
+    src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
+    src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
+    src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
+    src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
+    src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
+    src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
+    src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
+    src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
+    src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
+    src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
+    src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
+    src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
+    src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
+    src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
+    src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
+    src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
+    src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
+    src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
+    src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
+    src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
+    src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
+    src/tabs/api/edhrec/tab_edhrec.cpp
+    src/tabs/api/edhrec/tab_edhrec_main.cpp
+    src/tabs/tab.cpp
+    src/tabs/tab_account.cpp
+    src/tabs/tab_admin.cpp
+    src/tabs/tab_deck_editor.cpp
+    src/tabs/tab_deck_storage.cpp
+    src/tabs/tab_game.cpp
+    src/tabs/tab_home.cpp
+    src/tabs/tab_logs.cpp
+    src/tabs/tab_message.cpp
+    src/tabs/tab_replays.cpp
+    src/tabs/tab_room.cpp
+    src/tabs/tab_server.cpp
+    src/tabs/tab_supervisor.cpp
+    src/tabs/tab_visual_database_display.cpp
+    src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+    src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
+    src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
+    src/utility/card_info_comparator.cpp
+    src/utility/deck_list_sort_filter_proxy_model.cpp
+    src/utility/key_signals.cpp
+    src/utility/levenshtein.cpp
+    src/utility/logger.cpp
+    src/utility/sequence_edit.cpp
 )
 
 add_subdirectory(sounds)
@@ -336,23 +312,15 @@ configure_file(
 set(cockatrice_RESOURCES cockatrice.qrc)
 
 if(UPDATE_TRANSLATIONS)
-  # Cockatrice main sources
   file(GLOB_RECURSE translate_cockatrice_SRCS ${CMAKE_SOURCE_DIR}/cockatrice/src/*.cpp
        ${CMAKE_SOURCE_DIR}/cockatrice/src/*.h
   )
-
-  # All libcockatrice_* libraries (recursively)
-  file(GLOB_RECURSE translate_lib_SRCS ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.cpp
-       ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.h
-  )
-
-  # Combine all sources for translation
-  set(translate_SRCS ${translate_cockatrice_SRCS} ${translate_lib_SRCS})
-
+  file(GLOB_RECURSE translate_common_SRCS ${CMAKE_SOURCE_DIR}/common/*.cpp ${CMAKE_SOURCE_DIR}/common/*.h)
+  set(translate_SRCS ${translate_cockatrice_SRCS} ${translate_common_SRCS})
   set(cockatrice_TS "${CMAKE_CURRENT_SOURCE_DIR}/cockatrice_en@source.ts")
 else()
   file(GLOB cockatrice_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts")
-endif()
+endif(UPDATE_TRANSLATIONS)
 
 if(WIN32)
   set(cockatrice_SOURCES ${cockatrice_SOURCES} cockatrice.rc)
@@ -382,6 +350,12 @@ set(DESKTOPDIR
     CACHE STRING "desktop file destination"
 )
 
+# Include directories
+include_directories(../common)
+include_directories(${PROTOBUF_INCLUDE_DIR})
+include_directories(${CMAKE_BINARY_DIR}/common)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 set(COCKATRICE_MAC_QM_INSTALL_DIR "cockatrice.app/Contents/Resources/translations")
 set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations")
 set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations")
@@ -421,31 +395,9 @@ elseif(Qt5_FOUND)
 endif()
 
 if(Qt5_FOUND)
-  target_link_libraries(
-    cockatrice
-    libcockatrice_card
-    libcockatrice_deck_list
-    libcockatrice_filters
-    libcockatrice_utility
-    libcockatrice_network
-    libcockatrice_models
-    libcockatrice_rng
-    libcockatrice_settings
-    ${COCKATRICE_QT_MODULES}
-  )
+  target_link_libraries(cockatrice cockatrice_common ${COCKATRICE_QT_MODULES})
 else()
-  target_link_libraries(
-    cockatrice
-    PUBLIC libcockatrice_card
-           libcockatrice_deck_list
-           libcockatrice_filters
-           libcockatrice_utility
-           libcockatrice_network
-           libcockatrice_models
-           libcockatrice_rng
-           libcockatrice_settings
-           ${COCKATRICE_QT_MODULES}
-  )
+  target_link_libraries(cockatrice PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES})
 endif()
 
 if(UNIX)
@@ -564,9 +516,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 37fb145f0..88d1e62dc 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -7,46 +7,33 @@
 
         <file>resources/icons/arrow_bottom_green.svg</file>
         <file>resources/icons/arrow_down_green.svg</file>
-        <file>resources/icons/arrow_history.svg</file>
         <file>resources/icons/arrow_left_green.svg</file>
-        <file>resources/icons/arrow_redo.svg</file>
         <file>resources/icons/arrow_right_blue.svg</file>
         <file>resources/icons/arrow_right_green.svg</file>
         <file>resources/icons/arrow_top_green.svg</file>
         <file>resources/icons/arrow_up_green.svg</file>
-        <file>resources/icons/arrow_undo.svg</file>
-        <file>resources/icons/circle_half_stroke.svg</file>
         <file>resources/icons/clearsearch.svg</file>
         <file>resources/icons/cogwheel.svg</file>
         <file>resources/icons/conceded.svg</file>
         <file>resources/icons/decrement.svg</file>
         <file>resources/icons/delete.svg</file>
-        <file>resources/icons/dragon.svg</file>
         <file>resources/icons/dropdown_collapsed.svg</file>
         <file>resources/icons/dropdown_expanded.svg</file>
-        <file>resources/icons/filter.svg</file>
-        <file>resources/icons/floppy_disk.svg</file>
         <file>resources/icons/forgot_password.svg</file>
-        <file>resources/icons/gear.svg</file>
         <file>resources/icons/increment.svg</file>
         <file>resources/icons/info.svg</file>
         <file>resources/icons/lock.svg</file>
         <file>resources/icons/not_ready_start.svg</file>
-        <file>resources/icons/pen_to_square.svg</file>
         <file>resources/icons/pencil.svg</file>
-        <file>resources/icons/pin.svg</file>
         <file>resources/icons/player.svg</file>
         <file>resources/icons/ready_start.svg</file>
         <file>resources/icons/reload.svg</file>
         <file>resources/icons/remove_row.svg</file>
         <file>resources/icons/rename.svg</file>
-        <file>resources/icons/scale_balanced.svg</file>
         <file>resources/icons/scales.svg</file>
-        <file>resources/icons/scroll.svg</file>
         <file>resources/icons/search.svg</file>
         <file>resources/icons/settings.svg</file>
         <file>resources/icons/share.svg</file>
-        <file>resources/icons/sort_arrow_down.svg</file>
         <file>resources/icons/spectator.svg</file>
         <file>resources/icons/swap.svg</file>
         <file>resources/icons/sync.svg</file>
@@ -61,8 +48,6 @@
         <file>resources/icons/mana/W.svg</file>
 
         <file>resources/backgrounds/home.png</file>
-        <file>resources/backgrounds/card_triplet.svg</file>
-        <file>resources/backgrounds/placeholder_printing_selector.svg</file>
 
         <file>resources/config/general.svg</file>
         <file>resources/config/appearance.svg</file>
diff --git a/cockatrice/cockatrice_en@source.ts b/cockatrice/cockatrice_en@source.ts
index 810b345df..5a3b88d09 100644
--- a/cockatrice/cockatrice_en@source.ts
+++ b/cockatrice/cockatrice_en@source.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12,12 +12,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25,12 +25,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -38,81 +38,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="501"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="513"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="501"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="513"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -120,12 +118,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
         <source>Mainboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
         <source>Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -133,199 +131,176 @@ 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/dialogs/dlg_settings.cpp" line="445"/>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="645"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="645"/>
         <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"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="683"/>
         <source>Theme settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Current theme:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="685"/>
         <source>Open themes folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="686"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <source>Disabled</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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="690"/>
         <source>Menu settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <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="734"/>
-        <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/dialogs/dlg_settings.cpp" line="693"/>
         <source>Card rendering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="694"/>
         <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/dialogs/dlg_settings.cpp" line="695"/>
         <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"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="697"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="700"/>
         <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/dialogs/dlg_settings.cpp" line="701"/>
         <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/dialogs/dlg_settings.cpp" line="702"/>
         <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/dialogs/dlg_settings.cpp" line="704"/>
         <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/dialogs/dlg_settings.cpp" line="705"/>
         <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/dialogs/dlg_settings.cpp" line="706"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="708"/>
         <source> rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="707"/>
         <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/dialogs/dlg_settings.cpp" line="710"/>
         <source>Card counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="714"/>
         <source>Counter %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="717"/>
         <source>Hand layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="718"/>
         <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/dialogs/dlg_settings.cpp" line="719"/>
         <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/dialogs/dlg_settings.cpp" line="721"/>
         <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/dialogs/dlg_settings.cpp" line="722"/>
         <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/dialogs/dlg_settings.cpp" line="723"/>
         <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/dialogs/dlg_settings.cpp" line="724"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BackgroundSources</name>
     <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
+        <location filename="src/client/ui/widgets/general/background_sources.h" line="29"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
+        <location filename="src/client/ui/widgets/general/background_sources.h" line="30"/>
         <source>Art crop of random card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
+        <location filename="src/client/ui/widgets/general/background_sources.h" line="31"/>
         <source>Art crop of background.cod deck file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -333,111 +308,111 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -445,22 +420,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -468,32 +443,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/database/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/database/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/database/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/database/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/database/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/database/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -501,101 +476,96 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -603,22 +573,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="68"/>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="69"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Both</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="73"/>
         <source>View transformation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -626,22 +596,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="366"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="411"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="424"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="430"/>
         <source>Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -649,27 +619,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -677,124 +637,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="273"/>
         <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="304"/>
         <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="337"/>
         <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="385"/>
         <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="402"/>
         <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="425"/>
         <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="426"/>
         <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="427"/>
         <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="429"/>
         <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="430"/>
         <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="431"/>
         <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="433"/>
         <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="434"/>
+        <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="436"/>
         <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="439"/>
         <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="440"/>
         <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="441"/>
         <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="442"/>
         <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="443"/>
         <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="444"/>
         <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="446"/>
         <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="451"/>
         <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="454"/>
         <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="457"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -802,7 +762,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -810,133 +770,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="170"/>
         <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="170"/>
         <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="174"/>
         <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="175"/>
         <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="177"/>
         <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="178"/>
         <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="189"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="183"/>
         <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="185"/>
         <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="185"/>
         <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="188"/>
         <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="188"/>
         <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="190"/>
         <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="190"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <source>their sideboard</source>
+        <comment>look at zone</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <source>%1&apos;s sideboard</source>
+        <comment>look at zone</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <source>their sideboard</source>
+        <comment>nominative</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <source>%1&apos;s sideboard</source>
+        <comment>nominative</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
-        <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="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"/>
         <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="204"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
@@ -945,7 +905,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/database/parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -953,7 +913,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/database/parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -972,41 +932,10 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1014,47 +943,47 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="203"/>
         <source>Add to Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="220"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="256"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="257"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1062,97 +991,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
         <source>Select Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
         <source>Group by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
         <source>Hash:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1160,17 +1079,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>&amp;Clear all filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1178,114 +1097,114 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="154"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="156"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="166"/>
         <source>Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="168"/>
         <source>Not Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="174"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="176"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="177"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="178"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="180"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1293,7 +1212,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1301,227 +1220,194 @@ 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/dialogs/dlg_settings.cpp" line="1190"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1253"/>
         <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/dialogs/dlg_settings.cpp" line="1084"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1084"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1123"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1123"/>
         <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/dialogs/dlg_settings.cpp" line="1130"/>
         <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/dialogs/dlg_settings.cpp" line="1130"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1150"/>
         <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/dialogs/dlg_settings.cpp" line="1150"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1255"/>
         <source>Edit URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1247"/>
         <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/dialogs/dlg_settings.cpp" line="1249"/>
         <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/dialogs/dlg_settings.cpp" line="1250"/>
         <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/dialogs/dlg_settings.cpp" line="1251"/>
         <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/dialogs/dlg_settings.cpp" line="1254"/>
         <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/dialogs/dlg_settings.cpp" line="1256"/>
         <source>Remove URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1257"/>
         <source>Day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Updating...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1235"/>
         <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/dialogs/dlg_settings.cpp" line="1236"/>
         <source>Spoilers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1237"/>
         <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/dialogs/dlg_settings.cpp" line="1238"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1239"/>
         <source>Last Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1240"/>
         <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/dialogs/dlg_settings.cpp" line="1241"/>
         <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/dialogs/dlg_settings.cpp" line="1242"/>
         <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/dialogs/dlg_settings.cpp" line="1243"/>
         <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/dialogs/dlg_settings.cpp" line="1244"/>
         <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/dialogs/dlg_settings.cpp" line="1245"/>
         <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/dialogs/dlg_settings.cpp" line="1246"/>
         <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/dialogs/dlg_settings.cpp" line="1248"/>
         <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/dialogs/dlg_settings.cpp" line="1252"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <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="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="209"/>
         <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="src/deck/deck_list_model.cpp" line="211"/>
         <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="src/deck/deck_list_model.cpp" line="205"/>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1529,12 +1415,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/deck/deck_loader.cpp" line="23"/>
         <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/deck/deck_loader.cpp" line="23"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1542,17 +1428,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1560,7 +1446,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1568,62 +1454,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1631,166 +1517,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
         <source>Delete failed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Added</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="24"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="36"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="36"/>
         <source>The reply from the server could not be parsed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1798,74 +1626,75 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="123"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Load deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="124"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Load remote deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
         <source>Load from website...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
         <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
         <source>Ready to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
         <source>Force start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
         <source>Sideboard locked</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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
         <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="272"/>
         <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="284"/>
         <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="347"/>
         <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="349"/>
         <source>Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1873,19 +1702,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1893,148 +1722,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2042,122 +1871,117 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="105"/>
         <source>Open decklists in lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="114"/>
         <source>Game setup options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="165"/>
         <source>&amp;Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="171"/>
         <source>Create game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="217"/>
         <source>Game information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="306"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="306"/>
         <source>Server error.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2165,97 +1989,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2263,53 +2087,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2317,39 +2141,39 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2357,17 +2181,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2375,38 +2199,38 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2414,93 +2238,93 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation type="unfinished"></translation>
@@ -2509,27 +2333,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2537,143 +2361,142 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="43"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="51"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="56"/>
         <source>Game &amp;description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="60"/>
         <source>&amp;Creator name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="70"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="86"/>
         <source>&amp;Game types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="91"/>
         <source>at &amp;least:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="98"/>
         <source>at &amp;most:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="111"/>
         <source>Maximum player count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="123"/>
         <source>Restrictions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="133"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="135"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="145"/>
         <source>Spectators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="178"/>
         <source>Filter games</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2681,52 +2504,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2734,37 +2557,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2772,86 +2595,86 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2859,7 +2682,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2867,17 +2690,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2885,43 +2708,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/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
+        <location filename="src/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
+        <location filename="src/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2935,78 +2758,45 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="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/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <source>Number of hits:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <source>Auto play hits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <source>Put top cards on stack until...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="82"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3014,91 +2804,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you&apos;d like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3106,17 +2896,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3124,55 +2914,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1823"/>
         <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/dialogs/dlg_settings.cpp" line="1831"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3183,7 +2958,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/dialogs/dlg_settings.cpp" line="1837"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3194,7 +2969,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/dialogs/dlg_settings.cpp" line="1843"/>
         <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 +2978,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/dialogs/dlg_settings.cpp" line="1849"/>
         <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/dialogs/dlg_settings.cpp" line="1853"/>
         <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/dialogs/dlg_settings.cpp" line="1857"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3226,59 +3001,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/dialogs/dlg_settings.cpp" line="1865"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1885"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <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/dialogs/dlg_settings.cpp" line="1886"/>
         <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/dialogs/dlg_settings.cpp" line="1898"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1900"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1901"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1902"/>
         <source>User Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1903"/>
         <source>Card Sources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1904"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1905"/>
         <source>Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3286,39 +3061,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3326,17 +3101,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3344,164 +3119,168 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3509,162 +3288,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3672,47 +3319,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3720,44 +3367,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3773,22 +3414,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3796,22 +3437,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
+        <location filename="src/game/game_event_handler.cpp" line="406"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
+        <location filename="src/game/game_event_handler.cpp" line="409"/>
         <source>player left the game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
+        <location filename="src/game/game_event_handler.cpp" line="412"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
+        <location filename="src/game/game_event_handler.cpp" line="416"/>
         <source>reason unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3819,186 +3460,133 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="221"/>
+        <location filename="src/game/game_selector.cpp" line="224"/>
+        <location filename="src/game/game_selector.cpp" line="227"/>
+        <location filename="src/game/game_selector.cpp" line="230"/>
+        <location filename="src/game/game_selector.cpp" line="233"/>
+        <location filename="src/game/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="320"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="221"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="224"/>
         <source>Wrong password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="227"/>
         <source>Spectators are not allowed in this game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="230"/>
         <source>The game is already full.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="233"/>
         <source>The game does not exist any more.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="236"/>
         <source>This game is only open to registered users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="239"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="242"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="265"/>
         <source>Join Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="268"/>
         <source>Spectate Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="271"/>
         <source>Game Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="305"/>
         <source>Join game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="305"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="320"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>&amp;Filter games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="364"/>
         <source>C&amp;lear filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>C&amp;reate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>&amp;Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="368"/>
         <source>J&amp;oin as spectator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="389"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="391"/>
         <source>Games</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished">
@@ -4007,12 +3595,12 @@ You may have to manually download the new version.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished">
@@ -4021,83 +3609,83 @@ You may have to manually download the new version.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
+        <location filename="src/game/games_model.cpp" line="157"/>
         <source>open decklists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="191"/>
         <source>see hands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="196"/>
         <source>can see hands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="201"/>
         <source>not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="219"/>
         <source>Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="223"/>
         <source>Age</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Creator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="237"/>
         <source>Restrictions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="241"/>
         <source>Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="249"/>
         <source>Spectators</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4105,143 +3693,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/dialogs/dlg_settings.cpp" line="392"/>
         <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/dialogs/dlg_settings.cpp" line="199"/>
         <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/dialogs/dlg_settings.cpp" line="274"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="284"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="294"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="324"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="334"/>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="362"/>
         <source>Personal settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="363"/>
         <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="366"/>
         <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/dialogs/dlg_settings.cpp" line="368"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <source>Decks directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="373"/>
         <source>Filters directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="374"/>
         <source>Replays directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="375"/>
         <source>Pictures directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="376"/>
         <source>Card database:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <source>Token database:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="379"/>
         <source>Update channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="382"/>
         <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/dialogs/dlg_settings.cpp" line="384"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <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/dialogs/dlg_settings.cpp" line="388"/>
         <source> days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="400"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4249,47 +3837,42 @@ 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="66"/>
         <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="68"/>
         <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="71"/>
         <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="72"/>
         <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="73"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <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="74"/>
         <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="75"/>
         <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="76"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4297,88 +3880,57 @@ 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="60"/>
         <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="63"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="64"/>
+        <source>&amp;Sort hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="65"/>
+        <source>Take &amp;mulligan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <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"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <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="67"/>
         <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="68"/>
         <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="69"/>
         <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="70"/>
         <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="71"/>
         <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="73"/>
         <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"/>
-        <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="74"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4386,52 +3938,47 @@ 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/client/ui/widgets/general/home_widget.cpp" line="183"/>
         <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/client/ui/widgets/general/home_widget.cpp" line="187"/>
         <source>Browse Decks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="191"/>
         <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/client/ui/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="198"/>
         <source>View Replays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="202"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="217"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="221"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="227"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4439,274 +3986,238 @@ 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="177"/>
         <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="180"/>
         <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="181"/>
         <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="182"/>
         <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="183"/>
         <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="184"/>
         <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="185"/>
         <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="186"/>
         <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="187"/>
         <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="188"/>
         <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="189"/>
         <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="190"/>
         <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="192"/>
         <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="193"/>
         <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="194"/>
         <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="196"/>
         <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="198"/>
         <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="199"/>
         <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="200"/>
         <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="201"/>
         <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="202"/>
         <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="203"/>
         <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="204"/>
         <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="205"/>
         <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="206"/>
         <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="208"/>
         <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="209"/>
         <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="210"/>
         <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="211"/>
         <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="212"/>
         <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="213"/>
         <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="214"/>
         <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="215"/>
         <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="216"/>
         <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="217"/>
         <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"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4716,592 +4227,602 @@ Reason for shutdown: %1</source>
         </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <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/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5311,81 +4832,81 @@ Do you want to enable it/them?</source>
         </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,549 +4914,359 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <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/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </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/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/message_log_widget.cpp" line="43"/>
         <source> from play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/server/message_log_widget.cpp" line="45"/>
         <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/server/message_log_widget.cpp" line="47"/>
         <source> from exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
+        <location filename="src/server/message_log_widget.cpp" line="49"/>
         <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/server/message_log_widget.cpp" line="54"/>
         <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/server/message_log_widget.cpp" line="56"/>
         <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/server/message_log_widget.cpp" line="61"/>
         <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/server/message_log_widget.cpp" line="63"/>
         <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/server/message_log_widget.cpp" line="69"/>
         <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/server/message_log_widget.cpp" line="71"/>
         <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/server/message_log_widget.cpp" line="76"/>
         <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/server/message_log_widget.cpp" line="78"/>
         <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/server/message_log_widget.cpp" line="83"/>
         <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/server/message_log_widget.cpp" line="85"/>
         <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/server/message_log_widget.cpp" line="89"/>
         <source> from sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
+        <location filename="src/server/message_log_widget.cpp" line="91"/>
         <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/server/message_log_widget.cpp" line="93"/>
         <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/server/message_log_widget.cpp" line="119"/>
         <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/server/message_log_widget.cpp" line="120"/>
         <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/server/message_log_widget.cpp" line="127"/>
         <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/server/message_log_widget.cpp" line="128"/>
         <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/server/message_log_widget.cpp" line="135"/>
         <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/server/message_log_widget.cpp" line="146"/>
         <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/server/message_log_widget.cpp" line="155"/>
         <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/server/message_log_widget.cpp" line="165"/>
         <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/server/message_log_widget.cpp" line="169"/>
         <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/server/message_log_widget.cpp" line="185"/>
         <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/server/message_log_widget.cpp" line="188"/>
         <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/server/message_log_widget.cpp" line="193"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="206"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="216"/>
         <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/server/message_log_widget.cpp" line="222"/>
         <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/server/message_log_widget.cpp" line="236"/>
         <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/server/message_log_widget.cpp" line="238"/>
         <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/server/message_log_widget.cpp" line="249"/>
         <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/server/message_log_widget.cpp" line="251"/>
         <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/server/message_log_widget.cpp" line="261"/>
         <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/server/message_log_widget.cpp" line="296"/>
         <source>a card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="319"/>
         <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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/server/message_log_widget.cpp" line="321"/>
         <source>%1 exiles %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="328"/>
         <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/server/message_log_widget.cpp" line="330"/>
         <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/server/message_log_widget.cpp" line="334"/>
         <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/server/message_log_widget.cpp" line="337"/>
         <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/server/message_log_widget.cpp" line="340"/>
         <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/server/message_log_widget.cpp" line="343"/>
         <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/server/message_log_widget.cpp" line="363"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -5943,13 +5274,14 @@ 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/server/message_log_widget.cpp" line="375"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <comment>top card for singular, top %3 cards for plural</comment>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -5957,72 +5289,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/server/message_log_widget.cpp" line="384"/>
         <source>bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="384"/>
         <source>top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="392"/>
         <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/server/message_log_widget.cpp" line="395"/>
         <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/server/message_log_widget.cpp" line="401"/>
         <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/server/message_log_widget.cpp" line="406"/>
         <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/server/message_log_widget.cpp" line="411"/>
         <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/server/message_log_widget.cpp" line="417"/>
         <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/server/message_log_widget.cpp" line="423"/>
         <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/server/message_log_widget.cpp" line="428"/>
         <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/server/message_log_widget.cpp" line="434"/>
         <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/server/message_log_widget.cpp" line="442"/>
         <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/server/message_log_widget.cpp" line="449"/>
         <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/server/message_log_widget.cpp" line="458"/>
         <source>%1 shuffles their deck and draws a new hand of %2 card(s).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -6030,28 +5362,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/server/message_log_widget.cpp" line="463"/>
         <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/server/message_log_widget.cpp" line="469"/>
         <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/server/message_log_widget.cpp" line="474"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="502"/>
         <source>%1 card(s)</source>
         <comment>a card for singular, %1 cards for plural</comment>
         <translation type="unfinished">
@@ -6060,107 +5392,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/server/message_log_widget.cpp" line="511"/>
         <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/server/message_log_widget.cpp" line="516"/>
         <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/server/message_log_widget.cpp" line="522"/>
         <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/server/message_log_widget.cpp" line="528"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="542"/>
         <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/server/message_log_widget.cpp" line="546"/>
         <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/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="559"/>
         <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/server/message_log_widget.cpp" line="566"/>
         <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/server/message_log_widget.cpp" line="568"/>
         <source>reversed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="568"/>
         <source>normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="576"/>
         <source>Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="576"/>
         <source>Tails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="577"/>
         <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/server/message_log_widget.cpp" line="581"/>
         <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/server/message_log_widget.cpp" line="588"/>
         <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/server/message_log_widget.cpp" line="598"/>
         <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/server/message_log_widget.cpp" line="626"/>
         <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/server/message_log_widget.cpp" line="632"/>
         <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/server/message_log_widget.cpp" line="643"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -6168,7 +5500,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/server/message_log_widget.cpp" line="645"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -6176,97 +5508,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/server/message_log_widget.cpp" line="663"/>
         <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/server/message_log_widget.cpp" line="675"/>
         <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/server/message_log_widget.cpp" line="677"/>
         <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/server/message_log_widget.cpp" line="696"/>
         <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/server/message_log_widget.cpp" line="701"/>
         <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/server/message_log_widget.cpp" line="704"/>
         <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/server/message_log_widget.cpp" line="713"/>
         <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/server/message_log_widget.cpp" line="716"/>
         <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/server/message_log_widget.cpp" line="734"/>
         <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/server/message_log_widget.cpp" line="734"/>
         <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/server/message_log_widget.cpp" line="737"/>
         <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/server/message_log_widget.cpp" line="737"/>
         <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/server/message_log_widget.cpp" line="753"/>
         <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/server/message_log_widget.cpp" line="757"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="767"/>
         <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/server/message_log_widget.cpp" line="782"/>
         <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/server/message_log_widget.cpp" line="790"/>
         <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/server/message_log_widget.cpp" line="793"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6274,110 +5606,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/dialogs/dlg_settings.cpp" line="1496"/>
         <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/dialogs/dlg_settings.cpp" line="1497"/>
         <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/dialogs/dlg_settings.cpp" line="1498"/>
         <source>Edit Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1499"/>
         <source>Remove Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1448"/>
         <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/dialogs/dlg_settings.cpp" line="1448"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1461"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1461"/>
         <source>Edit message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1479"/>
         <source>Chat settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1480"/>
         <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/dialogs/dlg_settings.cpp" line="1481"/>
         <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/dialogs/dlg_settings.cpp" line="1482"/>
         <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/dialogs/dlg_settings.cpp" line="1483"/>
         <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/dialogs/dlg_settings.cpp" line="1485"/>
         <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/dialogs/dlg_settings.cpp" line="1486"/>
         <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/dialogs/dlg_settings.cpp" line="1487"/>
         <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/dialogs/dlg_settings.cpp" line="1488"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1489"/>
         <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/dialogs/dlg_settings.cpp" line="1490"/>
         <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/dialogs/dlg_settings.cpp" line="1491"/>
         <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/dialogs/dlg_settings.cpp" line="1492"/>
         <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/dialogs/dlg_settings.cpp" line="1493"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1494"/>
         <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/dialogs/dlg_settings.cpp" line="1495"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6390,37 +5722,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>
@@ -6428,52 +5755,52 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/card/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/card/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/card/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/card/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/card/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/card/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/card/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/card/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/card/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/card/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6481,17 +5808,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6499,62 +5826,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6562,57 +5889,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6620,7 +5947,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="269"/>
         <source>en</source>
         <comment>code for scryfall&apos;s language property, not available for all languages</comment>
         <translation type="unfinished"></translation>
@@ -6629,138 +5956,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="149"/>
         <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="150"/>
+        <location filename="src/game/player/player_actions.cpp" line="163"/>
+        <location filename="src/game/player/player_actions.cpp" line="236"/>
+        <location filename="src/game/player/player_actions.cpp" line="265"/>
+        <location filename="src/game/player/player_actions.cpp" line="299"/>
+        <location filename="src/game/player/player_actions.cpp" line="325"/>
+        <location filename="src/game/player/player_actions.cpp" line="397"/>
+        <location filename="src/game/player/player_actions.cpp" line="429"/>
+        <location filename="src/game/player/player_actions.cpp" line="601"/>
+        <location filename="src/game/player/player_actions.cpp" line="633"/>
+        <location filename="src/game/player/player_actions.cpp" line="750"/>
         <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="162"/>
         <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="235"/>
         <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="264"/>
         <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="298"/>
         <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="300"/>
         <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="324"/>
         <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="396"/>
+        <source>Move top cards to grave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <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>
+        <source>Move top cards to exile</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>
+        <location filename="src/game/player/player_actions.cpp" line="600"/>
+        <source>Move bottom 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="632"/>
+        <source>Move bottom 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>
-        <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="749"/>
         <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="854"/>
+        <location filename="src/game/player/player_actions.cpp" line="900"/>
         <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="1028"/>
         <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="1028"/>
+        <location filename="src/game/player/player_actions.cpp" line="1568"/>
         <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="1194"/>
         <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="1195"/>
         <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="1195"/>
         <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="1354"/>
         <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="1354"/>
         <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="1474"/>
         <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="1475"/>
         <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="1568"/>
         <source>Set counters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6768,65 +6091,63 @@ 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="162"/>
+        <source>Reveal top cards of library</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/player_menu.cpp" line="163"/>
+        <source>Number of cards: (max. %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/player_menu.cpp" line="211"/>
         <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="228"/>
         <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>
+        <location filename="src/game/player/menu/player_menu.cpp" line="245"/>
+        <source>&amp;All players</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="249"/>
+        <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/client/ui/widgets/printing_selector/printing_selector.cpp" line="91"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="166"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="174"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="181"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="189"/>
         <source>Show Related cards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6834,7 +6155,7 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6842,17 +6163,17 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6860,40 +6181,32 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <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>
@@ -6955,37 +6268,37 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6993,162 +6306,135 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <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>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7156,17 +6442,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7174,32 +6460,32 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7207,37 +6493,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>
@@ -7245,78 +6531,70 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7324,27 +6602,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7352,53 +6630,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/dialogs/dlg_settings.cpp" line="1671"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1694"/>
         <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/dialogs/dlg_settings.cpp" line="1672"/>
         <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/dialogs/dlg_settings.cpp" line="1679"/>
         <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/dialogs/dlg_settings.cpp" line="1680"/>
         <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/dialogs/dlg_settings.cpp" line="1689"/>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1690"/>
         <source>Action:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1691"/>
         <source>Shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1693"/>
         <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/dialogs/dlg_settings.cpp" line="1695"/>
         <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/dialogs/dlg_settings.cpp" line="1696"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7406,12 +6684,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7419,13 +6697,13 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"></translation>
@@ -7434,17 +6712,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7452,12 +6730,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
+        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7465,27 +6743,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/dialogs/dlg_settings.cpp" line="1573"/>
         <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/dialogs/dlg_settings.cpp" line="1574"/>
         <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/dialogs/dlg_settings.cpp" line="1575"/>
         <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/dialogs/dlg_settings.cpp" line="1576"/>
         <source>Sound settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1577"/>
         <source>Master volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7493,48 +6771,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7542,27 +6820,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7570,17 +6848,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7588,289 +6866,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <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"/>
-        <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>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</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"/>
-        <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"/>
-        <source>Formats</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <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/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <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/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7878,55 +7033,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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="142"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="304"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="306"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="307"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="313"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="310"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="314"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="317"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
         <source>Reset layout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7934,22 +7095,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7957,138 +7118,138 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8096,17 +7257,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8114,7 +7275,7 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -8122,224 +7283,229 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
         <source>EDHRec: </source>
+        <oldsource>EDHREC: </oldsource>
         <translation type="unfinished"></translation>
     </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/client/tabs/tab_game.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="887"/>
         <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/client/tabs/tab_game.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="279"/>
         <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/client/tabs/tab_game.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="345"/>
         <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/client/tabs/tab_game.cpp" line="283"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="343"/>
         <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/client/tabs/tab_game.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="344"/>
         <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/client/tabs/tab_game.cpp" line="286"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="357"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="291"/>
         <source>&amp;Phases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="294"/>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="296"/>
         <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/client/tabs/tab_game.cpp" line="299"/>
         <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/client/tabs/tab_game.cpp" line="302"/>
         <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/client/tabs/tab_game.cpp" line="305"/>
         <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/client/tabs/tab_game.cpp" line="308"/>
         <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/client/tabs/tab_game.cpp" line="311"/>
         <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/client/tabs/tab_game.cpp" line="314"/>
         <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/client/tabs/tab_game.cpp" line="317"/>
         <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/client/tabs/tab_game.cpp" line="320"/>
         <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/client/tabs/tab_game.cpp" line="322"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="326"/>
         <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/client/tabs/tab_game.cpp" line="329"/>
         <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/client/tabs/tab_game.cpp" line="332"/>
         <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/client/tabs/tab_game.cpp" line="335"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="339"/>
         <source>Selected cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="342"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="353"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="358"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="348"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="354"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="359"/>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="362"/>
         <source>Reset layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="497"/>
         <source>Concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="497"/>
         <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/client/tabs/tab_game.cpp" line="502"/>
         <source>Unconcede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="503"/>
         <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/client/tabs/tab_game.cpp" line="521"/>
         <source>Leave game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="521"/>
         <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/client/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8347,7 +7513,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
+        <location filename="src/client/tabs/tab_home.h" line="25"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8355,157 +7521,157 @@ Please enter a name:</source>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8513,37 +7679,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8551,185 +7717,185 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="199"/>
         <source>Local file system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="200"/>
         <source>Server replay storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="207"/>
         <source>Watch replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="203"/>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="318"/>
         <source>New folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="210"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="206"/>
         <source>Open replays folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="208"/>
         <source>Download replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="209"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="211"/>
         <source>Get replay share code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="566"/>
         <source>Look up replay by share code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="282"/>
         <source>Rename local folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="282"/>
         <source>Rename local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="285"/>
         <source>New name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="300"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="300"/>
         <source>Rename failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="318"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="333"/>
         <source>Delete local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="333"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="490"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="537"/>
         <source>Failed to get code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="541"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="602"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="539"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="600"/>
         <source>Either this server does not support replay sharing, or does not permit replay sharing for you.</source>
         <translation type="unfinished"></translation>
     </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"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="605"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="545"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="553"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="555"/>
         <source>Others can use this code to add the replay to their list of remote replays:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="557"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="566"/>
         <source>Replay share code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="587"/>
         <source>Replay code found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="588"/>
         <source>Replay was added, or you already had access to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="593"/>
         <source>Replay code not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="598"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="605"/>
         <source>Unexpected error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="489"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="81"/>
         <source>Game Replays</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8737,47 +7903,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8785,35 +7951,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8821,97 +7987,92 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="205"/>
         <source>Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="206"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="207"/>
         <source>EDHRec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="208"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="209"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="210"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="211"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="212"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="213"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="214"/>
         <source>Game Replays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="215"/>
         <source>Administration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="216"/>
         <source>Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="275"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="276"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="999"/>
         <source>Click to view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1027"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1068"/>
         <source>Unknown Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1069"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8919,38 +8080,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1074"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1074"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1078"/>
         <source>Promotion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1079"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1083"/>
         <source>Warned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1084"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1098"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"></translation>
@@ -8959,12 +8120,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8972,13 +8128,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="24"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="64"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="45"/>
         <source>Unable to analyze the deck.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8986,13 +8142,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"></translation>
@@ -9001,42 +8157,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9044,7 +8200,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9052,206 +8208,206 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="88"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="92"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="84"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="89"/>
         <source>You are being ignored by %1 and can&apos;t see their games.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="93"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="120"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="175"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="198"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="202"/>
         <source>Ban History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="181"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="199"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="203"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="213"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="238"/>
         <source>Warning History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="218"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="235"/>
         <source>User has never been warned.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="239"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="247"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="264"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="267"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="265"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="247"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="272"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="360"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="380"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9259,109 +8415,109 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished">
@@ -9370,7 +8526,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished">
@@ -9379,59 +8535,59 @@ Please refrain from engaging in this activity or further actions may be taken ag
         </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9439,152 +8595,137 @@ 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/dialogs/dlg_settings.cpp" line="903"/>
         <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/dialogs/dlg_settings.cpp" line="904"/>
         <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/dialogs/dlg_settings.cpp" line="905"/>
         <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/dialogs/dlg_settings.cpp" line="906"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="907"/>
         <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/dialogs/dlg_settings.cpp" line="908"/>
         <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/dialogs/dlg_settings.cpp" line="909"/>
         <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/dialogs/dlg_settings.cpp" line="910"/>
         <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/dialogs/dlg_settings.cpp" line="911"/>
         <source>Notifications settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="912"/>
         <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/dialogs/dlg_settings.cpp" line="913"/>
         <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/dialogs/dlg_settings.cpp" line="914"/>
         <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/dialogs/dlg_settings.cpp" line="915"/>
         <source>Animation settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="916"/>
         <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/dialogs/dlg_settings.cpp" line="917"/>
         <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/dialogs/dlg_settings.cpp" line="918"/>
         <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/dialogs/dlg_settings.cpp" line="919"/>
         <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/dialogs/dlg_settings.cpp" line="920"/>
         <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/dialogs/dlg_settings.cpp" line="922"/>
         <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/dialogs/dlg_settings.cpp" line="924"/>
         <source>do nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="926"/>
         <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/dialogs/dlg_settings.cpp" line="928"/>
         <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/dialogs/dlg_settings.cpp" line="929"/>
         <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/dialogs/dlg_settings.cpp" line="930"/>
         <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/dialogs/dlg_settings.cpp" line="931"/>
         <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/dialogs/dlg_settings.cpp" line="932"/>
         <source>Replay settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="933"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9592,22 +8733,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9615,32 +8756,32 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9648,185 +8789,63 @@ 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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <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="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="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"/>
-        <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"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9834,27 +8853,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9862,7 +8881,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/client/ui/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 +8889,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9890,37 +8909,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9928,93 +8937,50 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
         <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/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
+        <source>Save and load filters</source>
         <translation type="unfinished"></translation>
     </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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
+        <source>Filter by exact card name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
-        <source>Sort by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"></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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10022,25 +8988,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
+        <source>Click and drag to change the sort order within the groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10048,52 +9035,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10101,7 +9083,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10109,22 +9091,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10132,17 +9114,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10150,43 +9132,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10194,133 +9176,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="74"/>
         <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/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10328,72 +9310,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="52"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="223"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="236"/>
         <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="240"/>
         <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="241"/>
         <source>pile view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10401,7 +9383,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10409,12 +9391,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10422,1058 +9404,1006 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation type="unfinished"></translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"></translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Replays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation type="unfinished"></translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="684"/>
         <source>Reset Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/settings/shortcuts_settings.h" line="417"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="420"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="423"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="426"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="429"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="432"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="435"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="438"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="441"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="444"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="447"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Untap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="454"/>
         <source>Upkeep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="457"/>
         <source>First Main Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Start Combat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Attack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="466"/>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Damage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="469"/>
         <source>End Combat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="477"/>
         <source>Next Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="480"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="483"/>
         <source>Next Turn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="486"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="489"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="492"/>
         <source>Untap All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <location filename="src/settings/shortcuts_settings.h" line="495"/>
+        <source>Toggle Untap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="498"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="501"/>
         <source>Peek Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="504"/>
         <source>Play Card</source>
         <translation type="unfinished"></translation>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="507"/>
         <source>Attach Card...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="510"/>
         <source>Unattach Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="513"/>
         <source>Clone Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="516"/>
         <source>Create Token...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="519"/>
         <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/settings/shortcuts_settings.h" line="522"/>
         <source>Create Another Token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="525"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="528"/>
         <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/settings/shortcuts_settings.h" line="531"/>
         <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/settings/shortcuts_settings.h" line="534"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <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/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="600"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <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/settings/shortcuts_settings.h" line="548"/>
+        <location filename="src/settings/shortcuts_settings.h" line="619"/>
         <source>Top of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="551"/>
+        <location filename="src/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="605"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <source>Battlefield</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="559"/>
+        <source>Sort Hand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="565"/>
         <source>Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="568"/>
         <source>Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="571"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="574"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="577"/>
         <source>Close Recent View</source>
         <translation type="unfinished"></translation>
     </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/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="589"/>
+        <location filename="src/settings/shortcuts_settings.h" line="611"/>
         <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/settings/shortcuts_settings.h" line="594"/>
+        <location filename="src/settings/shortcuts_settings.h" line="616"/>
         <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/settings/shortcuts_settings.h" line="597"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="622"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="625"/>
         <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/settings/shortcuts_settings.h" line="628"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="634"/>
         <source>Leave Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <source>Concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="639"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="642"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="645"/>
         <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/settings/shortcuts_settings.h" line="648"/>
         <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/settings/shortcuts_settings.h" line="651"/>
         <source>Mulligan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <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/settings/shortcuts_settings.h" line="654"/>
         <source>Draw a Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="657"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="660"/>
         <source>Undo Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="663"/>
         <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/settings/shortcuts_settings.h" line="666"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <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/settings/shortcuts_settings.h" line="669"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="672"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="675"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="678"/>
         <source>Focus Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="681"/>
         <source>Clear Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="687"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="690"/>
         <source>Skip Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="693"/>
         <source>Skip Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="696"/>
         <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/settings/shortcuts_settings.h" line="699"/>
         <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/settings/shortcuts_settings.h" line="702"/>
         <source>Play/Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="705"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="712"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="716"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="720"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="722"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="723"/>
         <source>Administration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="727"/>
         <source>Logs</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/cockatrice/resources/backgrounds/card_triplet.svg b/cockatrice/resources/backgrounds/card_triplet.svg
deleted file mode 100644
index 91114d578..000000000
--- a/cockatrice/resources/backgrounds/card_triplet.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   width="250"
-   id="svg13"
-   height="231.66667"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg">
-  <defs
-     id="defs13" />
-  <g
-     transform="matrix(1.705559,0,0,1.705559,-18.310328,-4.2419088)"
-     id="g13">
-    <path
-       d="M 90.069854,3.479957 C 89.356513,1.2235709 86.980392,-0.01102897 84.723451,0.70218215 L 3.4767601,26.377781 C 1.2199188,27.090982 -0.01486587,29.46663 0.69839437,31.723116 L 33.512365,135.52112 c 0.713341,2.25639 3.089462,3.49099 5.346403,2.77777 l 81.246672,-25.6756 c 2.25684,-0.71319 3.49163,-3.08884 2.77837,-5.34533 L 90.074852,3.479957 Z"
-       style="display:none;fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path1" />
-    <path
-       d="m 110.61293,7.4983294 c -0.36657,-2.337853 -2.53055,-3.9150142 -4.86886,-3.5484627 L 21.563382,17.14452 c -2.338314,0.366502 -3.915784,2.529976 -3.549207,4.867929 L 34.876507,129.55893 c 0.366577,2.33786 2.530549,3.91502 4.868863,3.54847 l 84.18069,-13.19466 c 2.33831,-0.3665 3.91578,-2.52997 3.5492,-4.86793 L 110.61093,7.4983294 Z"
-       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path4" />
-    <path
-       d="m 130.53623,15.555064 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 41.067426 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 124.41102 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208344 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
-       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path7" />
-    <path
-       d="m 149.43988,26.480639 c 0.38018,-2.335754 -1.1846,-4.508374 -3.52082,-4.88852 L 61.817351,7.9076636 C 59.481136,7.5275576 57.308066,9.0920839 56.927894,11.427736 L 39.439773,118.87426 c -0.380182,2.33576 1.184602,4.50838 3.520816,4.88852 l 84.102711,13.68346 c 2.33622,0.38011 4.50929,-1.18442 4.88946,-3.52007 L 149.43688,26.479639 Z"
-       style="display:inline;fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path10" />
-  </g>
-</svg>
diff --git a/cockatrice/resources/backgrounds/placeholder_printing_selector.svg b/cockatrice/resources/backgrounds/placeholder_printing_selector.svg
deleted file mode 100644
index 73a0082ab..000000000
--- a/cockatrice/resources/backgrounds/placeholder_printing_selector.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com        License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.-->
-
-<svg
-   version="1.1"
-   width="172.65051"
-   id="svg13"
-   height="213.30714"
-   xml:space="preserve"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"><defs
-     id="defs13" /><g
-     transform="matrix(1.705559,0,0,1.705559,-97.653345,-68.741256)"
-     id="g13"><path
-       d="m 151.48519,45.063813 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 62.016385 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 153.91977 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208345 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
-       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path7" /><path
-       d="m 154.70135,48.441704 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 65.232545 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 157.29767 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208345 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
-       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path7-5" /><path
-       d="m 157.98403,51.75453 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 68.515228 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 v 108.85596 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208342 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
-       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path7-6" /></g><path
-     d="m 196.24576,207.42361 c 0,0.11213 0,0.22413 0,0.33621 -0.0498,4.54511 -4.18399,7.63329 -8.72909,7.63329 h -12.19086 c -3.29988,0 -5.97713,2.67727 -5.97713,5.97712 0,0.4234 0.0498,0.83433 0.12449,1.23279 0.26149,1.27014 0.80939,2.49046 1.34485,3.72325 0.75959,1.71843 1.50674,3.4244 1.50674,5.22998 0,3.95986 -2.68971,7.55859 -6.64956,7.72046 -0.43583,0.0128 -0.87166,0.025 -1.31995,0.025 -17.60761,0 -31.878,-14.27038 -31.878,-31.878 0,-17.60761 14.28284,-31.878 31.89046,-31.878 17.60762,0 31.87801,14.27039 31.87801,31.878 z m -47.81703,3.98475 c 0,-2.20407 -1.78067,-3.98475 -3.98473,-3.98475 -2.20407,0 -3.98477,1.78068 -3.98477,3.98475 0,2.20406 1.7807,3.98475 3.98477,3.98475 2.20406,0 3.98473,-1.78069 3.98473,-3.98475 z m 0,-11.95426 c 2.20407,0 3.98477,-1.78068 3.98477,-3.98475 0,-2.20407 -1.7807,-3.98475 -3.98477,-3.98475 -2.20405,0 -3.98473,1.78068 -3.98473,3.98475 0,2.20407 1.78068,3.98475 3.98473,3.98475 z m 19.92376,-11.95424 c 0,-2.20408 -1.78068,-3.98477 -3.98473,-3.98477 -2.20407,0 -3.98477,1.78069 -3.98477,3.98477 0,2.20405 1.7807,3.98474 3.98477,3.98474 2.20405,0 3.98473,-1.78069 3.98473,-3.98474 z m 11.95426,11.95424 c 2.20407,0 3.98475,-1.78068 3.98475,-3.98475 0,-2.20407 -1.78068,-3.98475 -3.98475,-3.98475 -2.20406,0 -3.98475,1.78068 -3.98475,3.98475 0,2.20407 1.78069,3.98475 3.98475,3.98475 z"
-     id="path1"
-     style="display:none;fill:#3b3b3b;fill-opacity:1;stroke:#000000;stroke-width:2.53798;stroke-dasharray:none;stroke-opacity:1" /><path
-     d="M 126.20915,54.574783 82.324247,83.8512 c -5.76807,3.845383 -9.435059,10.089163 -10.029703,16.90777 12.348823,2.53716 22.081191,12.26955 24.638191,24.63819 6.838435,-0.59465 13.062395,-4.26163 16.907775,-10.0297 l 29.2566,-43.904722 c 1.32804,-2.001984 2.04162,-4.340923 2.04162,-6.75915 0,-6.719506 -5.45092,-12.170428 -12.17043,-12.170428 -2.3984,0 -4.75718,0.713573 -6.75915,2.041623 z M 88.052677,131.81933 c 0,-12.26953 -9.930593,-22.20012 -22.200138,-22.20012 -12.269532,0 -22.200126,9.93059 -22.200126,22.20012 0,0.77305 0.03966,1.54609 0.118929,2.2993 0.356787,3.46877 -2.021792,7.21505 -5.510393,7.21505 h -0.951431 c -3.508409,0 -6.342895,2.83447 -6.342895,6.3429 0,3.5084 2.834486,6.34289 6.342895,6.34289 h 28.543021 c 12.269545,0 22.200138,-9.93059 22.200138,-22.20014 z"
-     id="path1-2"
-     style="fill:#989898;fill-opacity:1;stroke-width:0.198215" /></svg>
diff --git a/cockatrice/resources/config/qtlogging.ini b/cockatrice/resources/config/qtlogging.ini
index 20aa206ce..d5a96f6c3 100644
--- a/cockatrice/resources/config/qtlogging.ini
+++ b/cockatrice/resources/config/qtlogging.ini
@@ -1,10 +1,6 @@
 [Rules]
 # The default log level is info
 *.debug = false
-#*.info = true
-#*.warning = true
-#*.critical = true
-#*.fatal = true
 
 # Uncomment a rule to see debug level logs for that category,
 # or set <category> = false to disable logging
@@ -41,14 +37,12 @@
 #card_zone = true
 #view_zone = true
 
-#game_event_handler = true
-
 #user_info_connection = true
 
-#card_picture_loader = true
-#card_picture_loader.worker = true
-#card_picture_loader.card_back_cache_fail = true
-#card_picture_loader.picture_to_load = true
+#picture_loader = true
+#picture_loader.worker = true
+#picture_loader.card_back_cache_fail = true
+#picture_loader.picture_to_load = true
 #deck_loader = true
 #card_database = true
 #card_database.loading = true
diff --git a/cockatrice/resources/help/deck_search.md b/cockatrice/resources/help/deck_search.md
index 163137335..95c237b16 100644
--- a/cockatrice/resources/help/deck_search.md
+++ b/cockatrice/resources/help/deck_search.md
@@ -1,13 +1,9 @@
-@page deck_search_syntax_help Deck Search Syntax Help
-
 ## Deck Search Syntax Help
-
+-----
 The search bar recognizes a set of special commands.<br>
 In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all
 searches are case insensitive.
-
 <dl>
-
 <dt>Display Name (The deck name, or the filename if the deck name isn't set):</dt>
 <dd>[red deck wins](#red deck wins) <small>(Any deck with a display name containing the words red, deck, and wins)</small></dd>
 <dd>["red deck wins"](#%22red deck wins%22) <small>(Any deck with a display name containing the exact phrase "red deck wins")</small></dd>
@@ -17,23 +13,15 @@ searches are case insensitive.
 <dd>[n:red n:deck n:wins](#n:red n:deck n:wins) <small>(Any deck with a name containing the words red, deck, and wins)</small></dd>
 <dd>[n:"red deck wins"](#n:%22red deck wins%22) <small>(Any deck with a name containing the exact phrase "red deck wins")</small></dd>
 
-<dt><u>F</u>ile <u>N</u>ame:</dt>
-<dd>[fn:aggro](#fn:aggro) <small>(Any deck with a filename containing the word aggro)</small></dd>
-<dd>[fn:red fn:deck fn:wins](#fn:red fn:deck fn:wins) <small>(Any deck with a filename containing the words red, deck, and wins)</small></dd>
-<dd>[fn:"red deck wins"](#fn:%22red deck wins%22) <small>(Any deck with a filename containing the exact phrase "red deck wins")</small></dd>
+<dt><u>F</u>ile Name:</dt>
+<dd>[f:aggro](#f:aggro) <small>(Any deck with a filename containing the word aggro)</small></dd>
+<dd>[f:red f:deck f:wins](#f:red f:deck f:wins) <small>(Any deck with a filename containing the words red, deck, and wins)</small></dd>
+<dd>[f:"red deck wins"](#f:%22red deck wins%22) <small>(Any deck with a filename containing the exact phrase "red deck wins")</small></dd>
 
 <dt>Relative <u>P</u>ath (starting from the deck folder):</dt>
 <dd>[p:aggro](#p:aggro) <small>(Any deck that has "aggro" somewhere in its relative path)</small></dd>
 <dd>[p:edh/](#p:edh/) <small>(Any deck with "edh/" in its relative path, A.K.A. decks in the "edh" folder)</small></dd>
 
-<dt><u>F</u>ormat:</dt>
-<dd>[f:standard](#f:standard) <small>(Any deck with format set to standard)</small></dd>
-
-<dt><u>C</u>omments:</dt>
-<dd>[c:good](#c:good) <small>(Any deck with comments containing the word good)</small></dd>
-<dd>[c:good c:deck](#c:good c:deck) <small>(Any deck with comments containing the words good and deck)</small></dd>
-<dd>[c:"good deck"](#c:%22good deck%22) <small>(Any deck with comments containing the exact phrase "good deck")</small></dd>
-
 <dt>Deck Contents (Uses [card search expressions](#cardSearchSyntaxHelp)):</dt>
 <dd><a href="#[[plains]]">[[plains]]</a> <small>(Any deck that contains at least one card with "plains" in its name)</small></dd>
 <dd><a href="#[[t:legendary]]">[[t:legendary]]</a> <small>(Any deck that contains at least one legendary)</small></dd>
@@ -47,6 +35,6 @@ searches are case insensitive.
 <dd>[t:aggro OR o:control](#t:aggro OR o:control) <small>(Any deck filename that contains either aggro or control)</small></dd>
 
 <dt>Grouping:</dt>
-<dd><a href="#red -([[]]:100 OR aggro)">red -([[]]:100 OR aggro)</a> <small>(Any deck that has red in its filename but is not 100 cards or has aggro in its filename)</small></dd>
+<dd><a href="#red -([[]]:100 or aggro)">red -([[]]:100 or aggro)</a> <small>(Any deck that has red in its filename but is not 100 cards or has aggro in its filename)</small></dd>
 
-</dl>
\ No newline at end of file
+</dl>
diff --git a/cockatrice/resources/help/search.md b/cockatrice/resources/help/search.md
index 0c8bdb450..7d707b0d1 100644
--- a/cockatrice/resources/help/search.md
+++ b/cockatrice/resources/help/search.md
@@ -1,12 +1,8 @@
-@page search_syntax_help Search Syntax Help
-
 ## Search Syntax Help
-
+-----
 The search bar recognizes a set of special commands similar to some other card databases.<br>
 In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all searches are case insensitive.
-
 <dl>
-
 <dt>Name:</dt>
 <dd>[birds of paradise](#birds of paradise) <small>(Any card name containing the words birds, of, and paradise)</small></dd>
 <dd>["birds of paradise"](#%22birds of paradise%22) <small>(Any card name containing the exact phrase "birds of paradise")</small></dd>
@@ -51,20 +47,20 @@ In this list of examples below, each entry has an explanation and can be clicked
 
 <dt><u>E</u>dition:</dt>
 <dd>[set:lea](#set:lea) <small>(Cards that appear in Alpha, which has the set code LEA)</small></dd>
-<dd>[e:lea OR e:leb](#e:lea OR e:leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
+<dd>[e:lea or e:leb](#e:lea or e:leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
 
 <dt>Negate:</dt>
 <dd>[c:wu -c:m](#c:wu -c:m) <small>(Any card that is white or blue, but not multicolored)</small></dd>
 
 <dt>Branching:</dt>
-<dd>[t:sliver OR o:changeling](#t:sliver OR o:changeling) <small>(Any card that is either a sliver or has changeling)</small></dd>
+<dd>[t:sliver or o:changeling](#t:sliver or o:changeling) <small>(Any card that is either a sliver or has changeling)</small></dd>
 
 <dt>Grouping:</dt>
-<dd><a href="#t:angel -(angel OR c:w)">t:angel -(angel OR c:w)</a> <small>(Any angel that doesn't have angel in its name and isn't white)</small></dd>
+<dd><a href="#t:angel -(angel or c:w)">t:angel -(angel or c:w)</a> <small>(Any angel that doesn't have angel in its name and isn't white)</small></dd>
 
 <dt>Regular Expression:</dt>
 <dd>[/^fell/](#/^fell/) <small>(Any card name that begins with "fell")</small></dd>
 <dd>[o:/counter target .* spell/](#o:/counter target .* spell/) <small>(Any card text with "counter target *something* spell")</small></dd>
 <dd>[o:/for each .* and\/or .*/](#o:/for each .* and\/or .*/) <small>(/'s can be escaped with a \)</small></dd>
 
-</dl>
\ No newline at end of file
+</dl>
diff --git a/cockatrice/resources/icons/arrow_history.svg b/cockatrice/resources/icons/arrow_history.svg
deleted file mode 100644
index d130758e6..000000000
--- a/cockatrice/resources/icons/arrow_history.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-    <title>
-        history
-    </title>
-    <path d="M9 6v5h.06l2.48 2.47 1.41-1.41L11 10.11V6H9z"/>
-    <path d="M10 1a9 9 0 0 0-7.85 13.35L.5 16H6v-5.5l-2.38 2.38A7 7 0 1 1 10 17v2a9 9 0 0 0 0-18z"/>
-</svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/arrow_redo.svg b/cockatrice/resources/icons/arrow_redo.svg
deleted file mode 100644
index dd89e3314..000000000
--- a/cockatrice/resources/icons/arrow_redo.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px"
-     y="0px" width="485.212px" height="485.212px" viewBox="0 0 485.212 485.212"
-     style="enable-background:new 0 0 485.212 485.212;" xml:space="preserve">
-<g>
-	<path d="M242.607,424.559c-75.252,0-136.468-61.209-136.468-136.465c0-75.252,61.216-136.466,136.468-136.466v90.978   l151.629-121.302L242.607,0v90.978c-108.687,0-197.117,88.432-197.117,197.117c0,108.691,88.43,197.118,197.117,197.118   c108.687,0,197.114-88.427,197.114-197.118h-60.645C379.077,363.35,317.859,424.559,242.607,424.559z"/>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-</svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/arrow_undo.svg b/cockatrice/resources/icons/arrow_undo.svg
deleted file mode 100644
index 2e182ffb2..000000000
--- a/cockatrice/resources/icons/arrow_undo.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px"
-     y="0px" width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;"
-     xml:space="preserve">
-<g>
-	<path d="M256,448c79.406,0,144-64.594,144-144s-64.594-144-144-144v96L96,128L256,0v96c114.688,0,208,93.313,208,208   c0,114.688-93.312,208-208,208c-114.687,0-208-93.312-208-208h64C112,383.406,176.594,448,256,448z"/>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-</svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/circle_half_stroke.svg b/cockatrice/resources/icons/circle_half_stroke.svg
deleted file mode 100644
index 42e4dbca2..000000000
--- a/cockatrice/resources/icons/circle_half_stroke.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M512 320C512 214 426 128 320 128L320 512C426 512 512 426 512 320zM64 320C64 178.6 178.6 64 320 64C461.4 64 576 178.6 576 320C576 461.4 461.4 576 320 576C178.6 576 64 461.4 64 320z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/dragon.svg b/cockatrice/resources/icons/dragon.svg
deleted file mode 100644
index f45af39ef..000000000
--- a/cockatrice/resources/icons/dragon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M352 188.5L300.1 175.5C293.6 173.9 288.8 168.4 288.1 161.7C287.4 155 290.9 148.6 296.8 145.6L337.6 125.2L294.3 92.7C288.8 88.6 286.5 81.4 288.7 74.8C290.9 68.2 297.1 64 304 64L464 64C494.2 64 522.7 78.2 540.8 102.4L598.4 179.2C604.6 187.5 608 197.6 608 208C608 234.5 586.5 256 560 256L538.5 256C521.5 256 505.2 249.3 493.2 237.3L479.9 224L447.9 224L447.9 245.5C447.9 270.3 460.7 293.4 481.7 306.6L588.3 373.2C620.4 393.3 639.9 428.4 639.9 466.3C639.9 526.9 590.8 576.1 530.1 576.1L32.3 576C29 576 25.7 575.6 22.7 574.6C13.5 571.8 6 565 2.3 556C1 552.7 .1 549.1 0 545.3C-.2 541.6 .3 538 1.3 534.6C4.1 525.4 10.9 517.9 19.9 514.2C22.9 513 26.1 512.2 29.4 512L433.3 476C441.6 475.3 448 468.3 448 459.9C448 455.6 446.3 451.5 443.3 448.5L398.9 404.1C368.9 374.1 352 333.4 352 291L352 188.5zM512 136.3C512 136.2 512 136.1 512 136C512 135.9 512 135.8 512 135.7L512 136.3zM510.7 143.7L464.3 132.1C464.1 133.4 464 134.7 464 136C464 149.3 474.7 160 488 160C498.6 160 507.5 153.2 510.7 143.7zM130.9 180.5C147.2 166 171.3 164.3 189.4 176.4L320 263.4L320 290.9C320 323.7 328.4 355.7 344 383.9L112 383.9C105.3 383.9 99.3 379.7 97 373.5C94.7 367.3 96.5 360.2 101.6 355.8L171 296.3L18.4 319.8C11.4 320.9 4.5 317.2 1.5 310.8C-1.5 304.4 .1 296.8 5.4 292L130.9 180.5z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/filter.svg b/cockatrice/resources/icons/filter.svg
deleted file mode 100644
index d53d9ba29..000000000
--- a/cockatrice/resources/icons/filter.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg fill="#000000" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg"
-     width="800px" height="800px" viewBox="0 0 971.986 971.986"
-     xml:space="preserve">
-<g>
-	<path d="M370.216,459.3c10.2,11.1,15.8,25.6,15.8,40.6v442c0,26.601,32.1,40.101,51.1,21.4l123.3-141.3
-		c16.5-19.8,25.6-29.601,25.6-49.2V500c0-15,5.7-29.5,15.8-40.601L955.615,75.5c26.5-28.8,6.101-75.5-33.1-75.5h-873
-		c-39.2,0-59.7,46.6-33.1,75.5L370.216,459.3z"/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/floppy_disk.svg b/cockatrice/resources/icons/floppy_disk.svg
deleted file mode 100644
index 3c5b5054d..000000000
--- a/cockatrice/resources/icons/floppy_disk.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M160 96C124.7 96 96 124.7 96 160L96 480C96 515.3 124.7 544 160 544L480 544C515.3 544 544 515.3 544 480L544 237.3C544 220.3 537.3 204 525.3 192L448 114.7C436 102.7 419.7 96 402.7 96L160 96zM192 192C192 174.3 206.3 160 224 160L384 160C401.7 160 416 174.3 416 192L416 256C416 273.7 401.7 288 384 288L224 288C206.3 288 192 273.7 192 256L192 192zM320 352C355.3 352 384 380.7 384 416C384 451.3 355.3 480 320 480C284.7 480 256 451.3 256 416C256 380.7 284.7 352 320 352z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/gear.svg b/cockatrice/resources/icons/gear.svg
deleted file mode 100644
index fdee3a297..000000000
--- a/cockatrice/resources/icons/gear.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M259.1 73.5C262.1 58.7 275.2 48 290.4 48L350.2 48C365.4 48 378.5 58.7 381.5 73.5L396 143.5C410.1 149.5 423.3 157.2 435.3 166.3L503.1 143.8C517.5 139 533.3 145 540.9 158.2L570.8 210C578.4 223.2 575.7 239.8 564.3 249.9L511 297.3C511.9 304.7 512.3 312.3 512.3 320C512.3 327.7 511.8 335.3 511 342.7L564.4 390.2C575.8 400.3 578.4 417 570.9 430.1L541 481.9C533.4 495 517.6 501.1 503.2 496.3L435.4 473.8C423.3 482.9 410.1 490.5 396.1 496.6L381.7 566.5C378.6 581.4 365.5 592 350.4 592L290.6 592C275.4 592 262.3 581.3 259.3 566.5L244.9 496.6C230.8 490.6 217.7 482.9 205.6 473.8L137.5 496.3C123.1 501.1 107.3 495.1 99.7 481.9L69.8 430.1C62.2 416.9 64.9 400.3 76.3 390.2L129.7 342.7C128.8 335.3 128.4 327.7 128.4 320C128.4 312.3 128.9 304.7 129.7 297.3L76.3 249.8C64.9 239.7 62.3 223 69.8 209.9L99.7 158.1C107.3 144.9 123.1 138.9 137.5 143.7L205.3 166.2C217.4 157.1 230.6 149.5 244.6 143.4L259.1 73.5zM320.3 400C364.5 399.8 400.2 363.9 400 319.7C399.8 275.5 363.9 239.8 319.7 240C275.5 240.2 239.8 276.1 240 320.3C240.2 364.5 276.1 400.2 320.3 400z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/pen_to_square.svg b/cockatrice/resources/icons/pen_to_square.svg
deleted file mode 100644
index 60ff1d9c4..000000000
--- a/cockatrice/resources/icons/pen_to_square.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M535.6 85.7C513.7 63.8 478.3 63.8 456.4 85.7L432 110.1L529.9 208L554.3 183.6C576.2 161.7 576.2 126.3 554.3 104.4L535.6 85.7zM236.4 305.7C230.3 311.8 225.6 319.3 222.9 327.6L193.3 416.4C190.4 425 192.7 434.5 199.1 441C205.5 447.5 215 449.7 223.7 446.8L312.5 417.2C320.7 414.5 328.2 409.8 334.4 403.7L496 241.9L398.1 144L236.4 305.7zM160 128C107 128 64 171 64 224L64 480C64 533 107 576 160 576L416 576C469 576 512 533 512 480L512 384C512 366.3 497.7 352 480 352C462.3 352 448 366.3 448 384L448 480C448 497.7 433.7 512 416 512L160 512C142.3 512 128 497.7 128 480L128 224C128 206.3 142.3 192 160 192L256 192C273.7 192 288 177.7 288 160C288 142.3 273.7 128 256 128L160 128z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/pin.svg b/cockatrice/resources/icons/pin.svg
deleted file mode 100644
index 71d4c9c9c..000000000
--- a/cockatrice/resources/icons/pin.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="64" height="64">
-  <g transform="matrix(0 1 -1 0 99.465813 0)" opacity="0.7">
-    <path fill="#000000" fill-rule="evenodd" clip-rule="evenodd"
-    stroke="#ffffff"
-          stroke-width="4"
-          stroke-linejoin="round"
-          stroke-linecap="round"
-          d="M65.5 62
-             L78 49
-             C73.5 44.5 69.5 42 63 44
-             L45 31 C47 25 46 22 41.5 18
-             L19 41.5
-             C23 45.5 25 46.5 31 45
-             L44 62.5
-             C42.3 69 45 73.5 49 78
-             L61.5 65.5
-             L84 87
-             L87 87
-             L87.5 86.5
-             L87.5 83.5 Z" />
-  </g>
-</svg>
-
diff --git a/cockatrice/resources/icons/scale_balanced.svg b/cockatrice/resources/icons/scale_balanced.svg
deleted file mode 100644
index fae468d38..000000000
--- a/cockatrice/resources/icons/scale_balanced.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M384 96L512 96C529.7 96 544 110.3 544 128C544 145.7 529.7 160 512 160L398.4 160C393.2 185.8 375.5 207.1 352 217.3L352 512L512 512C529.7 512 544 526.3 544 544C544 561.7 529.7 576 512 576L128 576C110.3 576 96 561.7 96 544C96 526.3 110.3 512 128 512L288 512L288 217.3C264.5 207 246.8 185.7 241.6 160L128 160C110.3 160 96 145.7 96 128C96 110.3 110.3 96 128 96L256 96C270.6 76.6 293.8 64 320 64C346.2 64 369.4 76.6 384 96zM439.6 384L584.4 384L512 259.8L439.6 384zM512 480C449.1 480 396.8 446 386 401.1C383.4 390.1 387 378.8 392.7 369L487.9 205.8C492.9 197.2 502.1 192 512 192C521.9 192 531.1 197.3 536.1 205.8L631.3 369C637 378.8 640.6 390.1 638 401.1C627.2 445.9 574.9 480 512 480zM126.8 259.8L54.4 384L199.3 384L126.8 259.8zM.9 401.1C-1.7 390.1 1.9 378.8 7.6 369L102.8 205.8C107.8 197.2 117 192 126.9 192C136.8 192 146 197.3 151 205.8L246.2 369C251.9 378.8 255.5 390.1 252.9 401.1C242.1 445.9 189.8 480 126.9 480C64 480 11.7 446 .9 401.1z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/scroll.svg b/cockatrice/resources/icons/scroll.svg
deleted file mode 100644
index f4828e679..000000000
--- a/cockatrice/resources/icons/scroll.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M32 176C32 134.5 63.6 100.4 104 96.4L104 96L384 96C437 96 480 139 480 192L480 368L304 368C264.2 368 232 400.2 232 440L232 500C232 524.3 212.3 544 188 544C163.7 544 144 524.3 144 500L144 272L80 272C53.5 272 32 250.5 32 224L32 176zM268.8 544C275.9 530.9 280 515.9 280 500L280 440C280 426.7 290.7 416 304 416L552 416C565.3 416 576 426.7 576 440L576 464C576 508.2 540.2 544 496 544L268.8 544zM112 144C94.3 144 80 158.3 80 176L80 224L144 224L144 176C144 158.3 129.7 144 112 144z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/sort_arrow_down.svg b/cockatrice/resources/icons/sort_arrow_down.svg
deleted file mode 100644
index adf10f9f0..000000000
--- a/cockatrice/resources/icons/sort_arrow_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M278.6 438.6L182.6 534.6C170.1 547.1 149.8 547.1 137.3 534.6L41.3 438.6C28.8 426.1 28.8 405.8 41.3 393.3C53.8 380.8 74.1 380.8 86.6 393.3L128 434.7L128 128C128 110.3 142.3 96 160 96C177.7 96 192 110.3 192 128L192 434.7L233.4 393.3C245.9 380.8 266.2 380.8 278.7 393.3C291.2 405.8 291.2 426.1 278.7 438.6zM352 544C334.3 544 320 529.7 320 512C320 494.3 334.3 480 352 480L384 480C401.7 480 416 494.3 416 512C416 529.7 401.7 544 384 544L352 544zM352 416C334.3 416 320 401.7 320 384C320 366.3 334.3 352 352 352L448 352C465.7 352 480 366.3 480 384C480 401.7 465.7 416 448 416L352 416zM352 288C334.3 288 320 273.7 320 256C320 238.3 334.3 224 352 224L512 224C529.7 224 544 238.3 544 256C544 273.7 529.7 288 512 288L352 288zM352 160C334.3 160 320 145.7 320 128C320 110.3 334.3 96 352 96L576 96C593.7 96 608 110.3 608 128C608 145.7 593.7 160 576 160L352 160z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/usericons/pawn_donator_double.svg b/cockatrice/resources/usericons/pawn_donator_double.svg
index 30b353652..f0dba08b2 100644
--- a/cockatrice/resources/usericons/pawn_donator_double.svg
+++ b/cockatrice/resources/usericons/pawn_donator_double.svg
@@ -350,11 +350,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        style="display:inline;fill:url(#linearGradient3);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.77952756;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
diff --git a/cockatrice/resources/usericons/pawn_judge_double.svg b/cockatrice/resources/usericons/pawn_judge_double.svg
index 97c31f73c..e929f6490 100644
--- a/cockatrice/resources/usericons/pawn_judge_double.svg
+++ b/cockatrice/resources/usericons/pawn_judge_double.svg
@@ -321,11 +321,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        d="m 46.656521,12.167234 18.055171,18.054184 a 6.6081919,6.6078288 0 0 1 -0.126303,9.352065 6.6804126,6.6800456 0 0 1 -8.233169,1.011048 l -7.944268,7.943843 6.463762,6.445343 a 6.9331851,6.9328042 0 0 1 5.741536,2.022073 l 28.057729,28.092294 a 6.9962797,6.9958953 0 0 1 -9.894222,9.893685 L 50.719018,66.907526 A 7.0595711,7.0591833 0 0 1 49.18433,59.270613 l -5.741527,-5.741238 -7.944298,7.943843 A 6.716523,6.7161541 0 0 1 25.134866,69.832263 L 7.079684,51.778091 a 6.716523,6.7161541 0 0 1 8.39566,-10.345064 L 36.31101,20.59853 a 6.716523,6.7161541 0 0 1 10.345612,-8.431329 z"
diff --git a/cockatrice/resources/usericons/pawn_vip_double.svg b/cockatrice/resources/usericons/pawn_vip_double.svg
index 89cf0026b..0d002a791 100644
--- a/cockatrice/resources/usericons/pawn_vip_double.svg
+++ b/cockatrice/resources/usericons/pawn_vip_double.svg
@@ -340,11 +340,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"
@@ -363,6 +363,6 @@
        d="m 38.011063,984.77381 -10.143601,-5.23583 -10.063711,5.38779 1.845023,-11.2651 -8.233948,-7.90624 11.283888,-1.72639 4.974851,-10.27411 5.128803,10.19813 11.308575,1.55649 -8.114112,8.02918 z"
        inkscape:transform-center-x="0.094945927"
        inkscape:transform-center-y="-3.9764964"
-       transform="matrix(-2.3768784,0,0,2.4799382,115.920285,-1400.1716)" />
+       transform="matrix(2.3768784,0,0,2.4799382,-15.920285,-1400.1716)" />
   </g>
 </svg>
diff --git a/cockatrice/src/card/card_info.cpp b/cockatrice/src/card/card_info.cpp
new file mode 100644
index 000000000..e516a2dca
--- /dev/null
+++ b/cockatrice/src/card/card_info.cpp
@@ -0,0 +1,426 @@
+#include "card_info.h"
+
+#include "../picture_loader/picture_loader.h"
+#include "../settings/cache_settings.h"
+#include "game_specific_terms.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QMessageBox>
+#include <QRegularExpression>
+#include <algorithm>
+#include <utility>
+
+const char *CardSet::TOKENS_SETNAME = "TK";
+
+CardSet::CardSet(const QString &_shortName,
+                 const QString &_longName,
+                 const QString &_setType,
+                 const QDate &_releaseDate,
+                 const CardSet::Priority _priority)
+    : shortName(_shortName), longName(_longName), releaseDate(_releaseDate), setType(_setType), priority(_priority)
+{
+    loadSetOptions();
+}
+
+CardSetPtr CardSet::newInstance(const QString &_shortName,
+                                const QString &_longName,
+                                const QString &_setType,
+                                const QDate &_releaseDate,
+                                const Priority _priority)
+{
+    CardSetPtr ptr(new CardSet(_shortName, _longName, _setType, _releaseDate, _priority));
+    // ptr->setSmartPointer(ptr);
+    return ptr;
+}
+
+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";
+
+    return invalidFileNames.contains(shortName) ? shortName + "_" : shortName;
+}
+
+void CardSet::loadSetOptions()
+{
+    sortKey = SettingsCache::instance().cardDatabase().getSortKey(shortName);
+    enabled = SettingsCache::instance().cardDatabase().isEnabled(shortName);
+    isknown = SettingsCache::instance().cardDatabase().isKnown(shortName);
+}
+
+void CardSet::setSortKey(unsigned int _sortKey)
+{
+    sortKey = _sortKey;
+    SettingsCache::instance().cardDatabase().setSortKey(shortName, _sortKey);
+}
+
+void CardSet::setEnabled(bool _enabled)
+{
+    enabled = _enabled;
+    SettingsCache::instance().cardDatabase().setEnabled(shortName, _enabled);
+}
+
+void CardSet::setIsKnown(bool _isknown)
+{
+    isknown = _isknown;
+    SettingsCache::instance().cardDatabase().setIsKnown(shortName, _isknown);
+}
+
+class SetList::KeyCompareFunctor
+{
+public:
+    inline bool operator()(const CardSetPtr &a, const CardSetPtr &b) const
+    {
+        if (a.isNull() || b.isNull()) {
+            qCWarning(CardInfoLog) << "SetList::KeyCompareFunctor a or b is null";
+            return false;
+        }
+
+        return a->getSortKey() < b->getSortKey();
+    }
+};
+
+void SetList::sortByKey()
+{
+    std::sort(begin(), end(), KeyCompareFunctor());
+}
+
+int SetList::getEnabledSetsNum()
+{
+    int num = 0;
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set && set->getEnabled()) {
+            ++num;
+        }
+    }
+    return num;
+}
+
+int SetList::getUnknownSetsNum()
+{
+    int num = 0;
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
+            ++num;
+        }
+    }
+    return num;
+}
+
+QStringList SetList::getUnknownSetsNames()
+{
+    QStringList sets = QStringList();
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
+            sets << set->getShortName();
+        }
+    }
+    return sets;
+}
+
+void SetList::enableAllUnknown()
+{
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
+            set->setIsKnown(true);
+            set->setEnabled(true);
+        } else if (set && set->getIsKnownIgnored() && !set->getEnabled()) {
+            set->setEnabled(true);
+        }
+    }
+}
+
+void SetList::enableAll()
+{
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+
+        if (set == nullptr) {
+            qCWarning(CardInfoLog) << "enabledAll has null";
+            continue;
+        }
+
+        if (!set->getIsKnownIgnored()) {
+            set->setIsKnown(true);
+        }
+
+        set->setEnabled(true);
+    }
+}
+
+void SetList::markAllAsKnown()
+{
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
+            set->setIsKnown(true);
+            set->setEnabled(false);
+        } else if (set && set->getIsKnownIgnored() && !set->getEnabled()) {
+            set->setEnabled(true);
+        }
+    }
+}
+
+void SetList::guessSortKeys()
+{
+    defaultSort();
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set.isNull()) {
+            qCWarning(CardInfoLog) << "guessSortKeys set is null";
+            continue;
+        }
+        set->setSortKey(i);
+    }
+}
+
+void SetList::defaultSort()
+{
+    std::sort(begin(), end(), [](const CardSetPtr &a, const CardSetPtr &b) {
+        // Sort by priority, then by release date, then by short name
+        if (a->getPriority() != b->getPriority()) {
+            return a->getPriority() < b->getPriority(); // lowest first
+        } else if (a->getReleaseDate() != b->getReleaseDate()) {
+            return a->getReleaseDate() > b->getReleaseDate(); // most recent first
+        } else {
+            return a->getShortName() < b->getShortName(); // alphabetically
+        }
+    });
+}
+
+PrintingInfo::PrintingInfo(const CardSetPtr &_set) : set(_set)
+{
+}
+
+/**
+ * Gets the uuid property of the printing, or an empty string if the property isn't present
+ */
+QString PrintingInfo::getUuid() const
+{
+    return properties.value("uuid").toString();
+}
+
+CardInfo::CardInfo(const QString &_name,
+                   const QString &_text,
+                   bool _isToken,
+                   QVariantHash _properties,
+                   const QList<CardRelation *> &_relatedCards,
+                   const QList<CardRelation *> &_reverseRelatedCards,
+                   SetToPrintingsMap _sets,
+                   bool _cipt,
+                   bool _landscapeOrientation,
+                   int _tableRow,
+                   bool _upsideDownArt)
+    : name(_name), text(_text), isToken(_isToken), properties(std::move(_properties)), relatedCards(_relatedCards),
+      reverseRelatedCards(_reverseRelatedCards), setsToPrintings(std::move(_sets)), cipt(_cipt),
+      landscapeOrientation(_landscapeOrientation), tableRow(_tableRow), upsideDownArt(_upsideDownArt)
+{
+    simpleName = CardInfo::simplifyName(name);
+
+    refreshCachedSetNames();
+}
+
+CardInfoPtr CardInfo::newInstance(const QString &_name)
+{
+    return newInstance(_name, QString(), false, QVariantHash(), QList<CardRelation *>(), QList<CardRelation *>(),
+                       SetToPrintingsMap(), false, false, 0, false);
+}
+
+CardInfoPtr CardInfo::newInstance(const QString &_name,
+                                  const QString &_text,
+                                  bool _isToken,
+                                  QVariantHash _properties,
+                                  const QList<CardRelation *> &_relatedCards,
+                                  const QList<CardRelation *> &_reverseRelatedCards,
+                                  SetToPrintingsMap _sets,
+                                  bool _cipt,
+                                  bool _landscapeOrientation,
+                                  int _tableRow,
+                                  bool _upsideDownArt)
+{
+    CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, std::move(_properties), _relatedCards, _reverseRelatedCards,
+                                 _sets, _cipt, _landscapeOrientation, _tableRow, _upsideDownArt));
+    ptr->setSmartPointer(ptr);
+
+    for (const auto &printings : _sets) {
+        for (const PrintingInfo &printing : printings) {
+            printing.getSet()->append(ptr);
+            break;
+        }
+    }
+
+    return ptr;
+}
+
+QString CardInfo::getCorrectedName() const
+{
+    // remove all the characters reserved in windows file paths,
+    // other oses only disallow a subset of these so it covers all
+    static const QRegularExpression rmrx(R"(( // |[*<>:"\\?\x00-\x08\x10-\x1f]))");
+    static const QRegularExpression spacerx(R"([/\x09-\x0f])");
+    static const QString space(' ');
+    QString result = name;
+    // Fire // Ice, Circle of Protection: Red, "Ach! Hans, Run!", Who/What/When/Where/Why, Question Elemental?
+    return result.remove(rmrx).replace(spacerx, space);
+}
+
+void CardInfo::addToSet(const CardSetPtr &_set, const PrintingInfo _info)
+{
+    if (!_set->contains(smartThis)) {
+        _set->append(smartThis);
+    }
+    if (!setsToPrintings[_set->getShortName()].contains(_info)) {
+        setsToPrintings[_set->getShortName()].append(_info);
+    }
+
+    refreshCachedSetNames();
+}
+
+void CardInfo::combineLegalities(const QVariantHash &props)
+{
+    QHashIterator<QString, QVariant> it(props);
+    while (it.hasNext()) {
+        it.next();
+        if (it.key().startsWith("format-")) {
+            smartThis->setProperty(it.key(), it.value().toString());
+        }
+    }
+}
+
+void CardInfo::refreshCachedSetNames()
+{
+    QStringList setList;
+    // update the cached list of set names
+    for (const auto &printings : setsToPrintings) {
+        for (const auto &printing : printings) {
+            if (printing.getSet()->getEnabled()) {
+                setList << printing.getSet()->getShortName();
+            }
+            break;
+        }
+    }
+    setsNames = setList.join(", ");
+}
+
+QString CardInfo::simplifyName(const QString &name)
+{
+    static const QRegularExpression spaceOrSplit("(\\s+|\\/\\/.*)");
+    static const QRegularExpression nonAlnum("[^a-z0-9]");
+
+    QString simpleName = name.toLower();
+
+    // remove spaces and right halves of split cards
+    simpleName.remove(spaceOrSplit);
+
+    // So Aetherling would work, but not Ætherling since 'Æ' would get replaced
+    // with nothing.
+    simpleName.replace("æ", "ae");
+
+    // Replace Jötun Grunt with Jotun Grunt.
+    simpleName = simpleName.normalized(QString::NormalizationForm_KD);
+
+    // remove all non alphanumeric characters from the name
+    simpleName.remove(nonAlnum);
+    return simpleName;
+}
+
+const QChar CardInfo::getColorChar() const
+{
+    QString colors = getColors();
+    switch (colors.size()) {
+        case 0:
+            return QChar();
+        case 1:
+            return colors.at(0);
+        default:
+            return QChar('m');
+    }
+}
+
+CardRelation::CardRelation(const QString &_name,
+                           AttachType _attachType,
+                           bool _isCreateAllExclusion,
+                           bool _isVariableCount,
+                           int _defaultCount,
+                           bool _isPersistent)
+    : name(_name), attachType(_attachType), isCreateAllExclusion(_isCreateAllExclusion),
+      isVariableCount(_isVariableCount), defaultCount(_defaultCount), isPersistent(_isPersistent)
+{
+}
+
+void CardInfo::resetReverseRelatedCards2Me()
+{
+    for (CardRelation *cardRelation : this->getReverseRelatedCards2Me()) {
+        cardRelation->deleteLater();
+    }
+    reverseRelatedCardsToMe = QList<CardRelation *>();
+}
+
+// Back-compatibility methods. Remove ASAP
+const QString CardInfo::getCardType() const
+{
+    return getProperty(Mtg::CardType);
+}
+void CardInfo::setCardType(const QString &value)
+{
+    setProperty(Mtg::CardType, value);
+}
+const QString CardInfo::getCmc() const
+{
+    return getProperty(Mtg::ConvertedManaCost);
+}
+const QString CardInfo::getColors() const
+{
+    return getProperty(Mtg::Colors);
+}
+void CardInfo::setColors(const QString &value)
+{
+    setProperty(Mtg::Colors, value);
+}
+const QString CardInfo::getLoyalty() const
+{
+    return getProperty(Mtg::Loyalty);
+}
+const QString CardInfo::getMainCardType() const
+{
+    return getProperty(Mtg::MainCardType);
+}
+const QString CardInfo::getManaCost() const
+{
+    return getProperty(Mtg::ManaCost);
+}
+const QString CardInfo::getPowTough() const
+{
+    return getProperty(Mtg::PowTough);
+}
+void CardInfo::setPowTough(const QString &value)
+{
+    setProperty(Mtg::PowTough, value);
+}
diff --git a/cockatrice/src/card/card_info.h b/cockatrice/src/card/card_info.h
new file mode 100644
index 000000000..33ed569d5
--- /dev/null
+++ b/cockatrice/src/card/card_info.h
@@ -0,0 +1,470 @@
+#ifndef CARD_INFO_H
+#define CARD_INFO_H
+
+#include <QDate>
+#include <QHash>
+#include <QList>
+#include <QLoggingCategory>
+#include <QMap>
+#include <QMetaType>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QVariant>
+#include <utility>
+
+inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info");
+
+class CardInfo;
+class PrintingInfo;
+class CardSet;
+class CardRelation;
+class ICardDatabaseParser;
+
+typedef QSharedPointer<CardInfo> CardInfoPtr;
+typedef QSharedPointer<CardSet> CardSetPtr;
+typedef QMap<QString, QList<PrintingInfo>> SetToPrintingsMap;
+
+typedef QHash<QString, CardInfoPtr> CardNameMap;
+typedef QHash<QString, CardSetPtr> SetNameMap;
+
+Q_DECLARE_METATYPE(CardInfoPtr)
+
+class CardSet : public QList<CardInfoPtr>
+{
+public:
+    enum Priority
+    {
+        PriorityFallback = 0,
+        PriorityPrimary = 10,
+        PrioritySecondary = 20,
+        PriorityReprint = 30,
+        PriorityOther = 40,
+        PriorityLowest = 100,
+    };
+
+    static const char *TOKENS_SETNAME;
+
+private:
+    QString shortName, longName;
+    unsigned int sortKey;
+    QDate releaseDate;
+    QString setType;
+    Priority priority;
+    bool enabled, isknown;
+
+public:
+    explicit CardSet(const QString &_shortName = QString(),
+                     const QString &_longName = QString(),
+                     const QString &_setType = QString(),
+                     const QDate &_releaseDate = QDate(),
+                     const Priority _priority = PriorityFallback);
+    static CardSetPtr newInstance(const QString &_shortName = QString(),
+                                  const QString &_longName = QString(),
+                                  const QString &_setType = QString(),
+                                  const QDate &_releaseDate = QDate(),
+                                  const Priority _priority = PriorityFallback);
+    QString getCorrectedShortName() const;
+    QString getShortName() const
+    {
+        return shortName;
+    }
+    QString getLongName() const
+    {
+        return longName;
+    }
+    QString getSetType() const
+    {
+        return setType;
+    }
+    QDate getReleaseDate() const
+    {
+        return releaseDate;
+    }
+    Priority getPriority() const
+    {
+        return priority;
+    }
+    void setLongName(const QString &_longName)
+    {
+        longName = _longName;
+    }
+    void setSetType(const QString &_setType)
+    {
+        setType = _setType;
+    }
+    void setReleaseDate(const QDate &_releaseDate)
+    {
+        releaseDate = _releaseDate;
+    }
+    void setPriority(const Priority _priority)
+    {
+        priority = _priority;
+    }
+
+    void loadSetOptions();
+    int getSortKey() const
+    {
+        return sortKey;
+    }
+    void setSortKey(unsigned int _sortKey);
+    bool getEnabled() const
+    {
+        return enabled;
+    }
+    void setEnabled(bool _enabled);
+    bool getIsKnown() const
+    {
+        return isknown;
+    }
+    void setIsKnown(bool _isknown);
+
+    // Determine incomplete sets.
+    bool getIsKnownIgnored() const
+    {
+        return longName.length() + setType.length() + releaseDate.toString().length() == 0;
+    }
+};
+
+class SetList : public QList<CardSetPtr>
+{
+private:
+    class KeyCompareFunctor;
+
+public:
+    void sortByKey();
+    void guessSortKeys();
+    void enableAllUnknown();
+    void enableAll();
+    void markAllAsKnown();
+    int getEnabledSetsNum();
+    int getUnknownSetsNum();
+    QStringList getUnknownSetsNames();
+    void defaultSort();
+};
+
+/**
+ * Info relating to a specific printing for a card.
+ */
+class PrintingInfo
+{
+public:
+    explicit PrintingInfo(const CardSetPtr &_set = nullptr);
+    ~PrintingInfo() = default;
+
+    bool operator==(const PrintingInfo &other) const
+    {
+        return this->set == other.set && this->properties == other.properties;
+    }
+
+private:
+    CardSetPtr set;
+    // per-printing card properties;
+    QVariantHash properties;
+
+public:
+    CardSetPtr getSet() const
+    {
+        return set;
+    }
+    QStringList getProperties() const
+    {
+        return properties.keys();
+    }
+    QString getProperty(const QString &propertyName) const
+    {
+        return properties.value(propertyName).toString();
+    }
+    void setProperty(const QString &_name, const QString &_value)
+    {
+        properties.insert(_name, _value);
+    }
+
+    QString getUuid() const;
+};
+
+class CardInfo : public QObject
+{
+    Q_OBJECT
+private:
+    CardInfoPtr smartThis;
+    // The card name
+    QString name;
+    // The name without punctuation or capitalization, for better card name recognition.
+    QString simpleName;
+    // card text
+    QString text;
+    // whether this is not a "real" card but a token
+    bool isToken;
+    // basic card properties; common for all the sets
+    QVariantHash properties;
+    // the cards i'm related to
+    QList<CardRelation *> relatedCards;
+    // the card i'm reverse-related to
+    QList<CardRelation *> reverseRelatedCards;
+    // the cards thare are reverse-related to me
+    QList<CardRelation *> reverseRelatedCardsToMe;
+    // card sets
+    SetToPrintingsMap setsToPrintings;
+    // cached set names
+    QString setsNames;
+    // positioning properties; used by UI
+    bool cipt;
+    bool landscapeOrientation;
+    int tableRow;
+    bool upsideDownArt;
+
+public:
+    explicit CardInfo(const QString &_name,
+                      const QString &_text,
+                      bool _isToken,
+                      QVariantHash _properties,
+                      const QList<CardRelation *> &_relatedCards,
+                      const QList<CardRelation *> &_reverseRelatedCards,
+                      SetToPrintingsMap _sets,
+                      bool _cipt,
+                      bool _landscapeOrientation,
+                      int _tableRow,
+                      bool _upsideDownArt);
+    CardInfo(const CardInfo &other)
+        : QObject(other.parent()), name(other.name), simpleName(other.simpleName), text(other.text),
+          isToken(other.isToken), properties(other.properties), relatedCards(other.relatedCards),
+          reverseRelatedCards(other.reverseRelatedCards), reverseRelatedCardsToMe(other.reverseRelatedCardsToMe),
+          setsToPrintings(other.setsToPrintings), setsNames(other.setsNames), cipt(other.cipt),
+          landscapeOrientation(other.landscapeOrientation), tableRow(other.tableRow), upsideDownArt(other.upsideDownArt)
+    {
+    }
+
+    static CardInfoPtr newInstance(const QString &_name);
+
+    static CardInfoPtr newInstance(const QString &_name,
+                                   const QString &_text,
+                                   bool _isToken,
+                                   QVariantHash _properties,
+                                   const QList<CardRelation *> &_relatedCards,
+                                   const QList<CardRelation *> &_reverseRelatedCards,
+                                   SetToPrintingsMap _sets,
+                                   bool _cipt,
+                                   bool _landscapeOrientation,
+                                   int _tableRow,
+                                   bool _upsideDownArt);
+
+    CardInfoPtr clone() const
+    {
+        // Use the copy constructor to create a new instance
+        CardInfoPtr newCardInfo = CardInfoPtr(new CardInfo(*this));
+        newCardInfo->setSmartPointer(newCardInfo); // Set the smart pointer for the new instance
+        return newCardInfo;
+    }
+
+    void setSmartPointer(CardInfoPtr _ptr)
+    {
+        smartThis = std::move(_ptr);
+    }
+
+    // basic properties
+    inline const QString &getName() const
+    {
+        return name;
+    }
+    const QString &getSimpleName() const
+    {
+        return simpleName;
+    }
+
+    const QString &getText() const
+    {
+        return text;
+    }
+    void setText(const QString &_text)
+    {
+        text = _text;
+        emit cardInfoChanged(smartThis);
+    }
+
+    bool getIsToken() const
+    {
+        return isToken;
+    }
+    QStringList getProperties() const
+    {
+        return properties.keys();
+    }
+    QString getProperty(const QString &propertyName) const
+    {
+        return properties.value(propertyName).toString();
+    }
+    void setProperty(const QString &_name, const QString &_value)
+    {
+        properties.insert(_name, _value);
+        emit cardInfoChanged(smartThis);
+    }
+    bool hasProperty(const QString &propertyName) const
+    {
+        return properties.contains(propertyName);
+    }
+    const SetToPrintingsMap &getSets() const
+    {
+        return setsToPrintings;
+    }
+    const QString &getSetsNames() const
+    {
+        return setsNames;
+    }
+
+    // related cards
+    const QList<CardRelation *> &getRelatedCards() const
+    {
+        return relatedCards;
+    }
+    const QList<CardRelation *> &getReverseRelatedCards() const
+    {
+        return reverseRelatedCards;
+    }
+    const QList<CardRelation *> &getReverseRelatedCards2Me() const
+    {
+        return reverseRelatedCardsToMe;
+    }
+    QList<CardRelation *> getAllRelatedCards() const
+    {
+        QList<CardRelation *> result;
+        result.append(getRelatedCards());
+        result.append(getReverseRelatedCards2Me());
+        return result;
+    }
+    void resetReverseRelatedCards2Me();
+    void addReverseRelatedCards2Me(CardRelation *cardRelation)
+    {
+        reverseRelatedCardsToMe.append(cardRelation);
+    }
+
+    // positioning
+    bool getCipt() const
+    {
+        return cipt;
+    }
+    bool getLandscapeOrientation() const
+    {
+        return landscapeOrientation;
+    }
+    int getTableRow() const
+    {
+        return tableRow;
+    }
+    void setTableRow(int _tableRow)
+    {
+        tableRow = _tableRow;
+    }
+    bool getUpsideDownArt() const
+    {
+        return upsideDownArt;
+    }
+    const QChar getColorChar() const;
+
+    // Back-compatibility methods. Remove ASAP
+    const QString getCardType() const;
+    void setCardType(const QString &value);
+    const QString getCmc() const;
+    const QString getColors() const;
+    void setColors(const QString &value);
+    const QString getLoyalty() const;
+    const QString getMainCardType() const;
+    const QString getManaCost() const;
+    const QString getPowTough() const;
+    void setPowTough(const QString &value);
+
+    QString getCorrectedName() const;
+    void addToSet(const CardSetPtr &_set, PrintingInfo _info = PrintingInfo());
+    void combineLegalities(const QVariantHash &props);
+    void refreshCachedSetNames();
+
+    /**
+     * Simplify a name to have no punctuation and lowercase all letters, for
+     * less strict name-matching.
+     */
+    static QString simplifyName(const QString &name);
+
+signals:
+    /**
+     * Emit this when a pixmap for this card finishes loading.
+     * @param printing The specific printing the pixmap is for.
+     */
+    void pixmapUpdated(const PrintingInfo &printing);
+    void cardInfoChanged(CardInfoPtr card);
+};
+
+class CardRelation : public QObject
+{
+    Q_OBJECT
+public:
+    enum AttachType
+    {
+        DoesNotAttach = 0,
+        AttachTo = 1,
+        TransformInto = 2,
+    };
+
+private:
+    QString name;
+    AttachType attachType;
+    bool isCreateAllExclusion;
+    bool isVariableCount;
+    int defaultCount;
+    bool isPersistent;
+
+public:
+    explicit CardRelation(const QString &_name = QString(),
+                          AttachType _attachType = DoesNotAttach,
+                          bool _isCreateAllExclusion = false,
+                          bool _isVariableCount = false,
+                          int _defaultCount = 1,
+                          bool _isPersistent = false);
+
+    inline const QString &getName() const
+    {
+        return name;
+    }
+    AttachType getAttachType() const
+    {
+        return attachType;
+    }
+    bool getDoesAttach() const
+    {
+        return attachType != DoesNotAttach;
+    }
+    bool getDoesTransform() const
+    {
+        return attachType == TransformInto;
+    }
+    QString getAttachTypeAsString() const
+    {
+        switch (attachType) {
+            case AttachTo:
+                return "attach";
+            case TransformInto:
+                return "transform";
+            default:
+                return "";
+        }
+    }
+    bool getCanCreateAnother() const
+    {
+        return !getDoesAttach();
+    }
+    bool getIsCreateAllExclusion() const
+    {
+        return isCreateAllExclusion;
+    }
+    bool getIsVariable() const
+    {
+        return isVariableCount;
+    }
+    int getDefaultCount() const
+    {
+        return defaultCount;
+    }
+    bool getIsPersistent() const
+    {
+        return isPersistent;
+    }
+};
+#endif
diff --git a/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp b/cockatrice/src/card/exact_card.cpp
similarity index 96%
rename from libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
rename to cockatrice/src/card/exact_card.cpp
index 993b5b96e..fbd60071e 100644
--- a/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
+++ b/cockatrice/src/card/exact_card.cpp
@@ -1,8 +1,5 @@
 #include "exact_card.h"
 
-#include "../card_info.h"
-#include "printing_info.h"
-
 /**
  * Default constructor.
  * This will set the CardInfoPtr to null.
diff --git a/cockatrice/src/card/exact_card.h b/cockatrice/src/card/exact_card.h
new file mode 100644
index 000000000..a962ea076
--- /dev/null
+++ b/cockatrice/src/card/exact_card.h
@@ -0,0 +1,46 @@
+#ifndef EXACT_CARD_H
+#define EXACT_CARD_H
+
+#include "card_info.h"
+
+/**
+ * Identifies the card along with its exact printing
+ */
+class ExactCard
+{
+    CardInfoPtr card;
+    PrintingInfo printing;
+
+public:
+    ExactCard();
+    explicit ExactCard(const CardInfoPtr &_card, const PrintingInfo &_printing = PrintingInfo());
+
+    /**
+     * Gets the CardInfoPtr. Can be null.
+     */
+    CardInfoPtr getCardPtr() const
+    {
+        return card;
+    }
+
+    /**
+     * Gets the PrintingInfo. Can be empty.
+     */
+    PrintingInfo getPrinting() const
+    {
+        return printing;
+    }
+
+    bool operator==(const ExactCard &other) const;
+
+    QString getName() const;
+    const CardInfo &getInfo() const;
+    QString getPixmapCacheKey() const;
+
+    bool isEmpty() const;
+    explicit operator bool() const;
+
+    void emitPixmapUpdated() const;
+};
+
+#endif // EXACT_CARD_H
diff --git a/libcockatrice_card/libcockatrice/card/game_specific_terms.h b/cockatrice/src/card/game_specific_terms.h
similarity index 93%
rename from libcockatrice_card/libcockatrice/card/game_specific_terms.h
rename to cockatrice/src/card/game_specific_terms.h
index 2931365ad..cbf3e3ef9 100644
--- a/libcockatrice_card/libcockatrice/card/game_specific_terms.h
+++ b/cockatrice/src/card/game_specific_terms.h
@@ -1,9 +1,3 @@
-/**
- * @file game_specific_terms.h
- * @ingroup Cards
- * @brief TODO: Document this.
- */
-
 #ifndef GAME_SPECIFIC_TERMS_H
 #define GAME_SPECIFIC_TERMS_H
 
@@ -53,6 +47,6 @@ inline static const QString getNicePropertyName(QString key)
         return QCoreApplication::translate("Mtg", "Color Identity");
     return key;
 }
-} // namespace Mtg
+}; // namespace Mtg
 
 #endif
diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp b/cockatrice/src/client/deck_editor_menu.cpp
similarity index 97%
rename from cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
rename to cockatrice/src/client/deck_editor_menu.cpp
index 23d19abbb..b3c46d003 100644
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
+++ b/cockatrice/src/client/deck_editor_menu.cpp
@@ -1,8 +1,7 @@
-#include "../../../interface/widgets/menus/deck_editor_menu.h"
+#include "deck_editor_menu.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../../client/settings/shortcuts_settings.h"
-#include "../tabs/abstract_tab_deck_editor.h"
+#include "../settings/cache_settings.h"
+#include "../settings/shortcuts_settings.h"
 
 DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent)
 {
diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h b/cockatrice/src/client/deck_editor_menu.h
similarity index 91%
rename from cockatrice/src/interface/widgets/menus/deck_editor_menu.h
rename to cockatrice/src/client/deck_editor_menu.h
index ac8f3b787..af3dc65d5 100644
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
+++ b/cockatrice/src/client/deck_editor_menu.h
@@ -1,12 +1,8 @@
-/**
- * @file deck_editor_menu.h
- * @ingroup DeckEditors
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_EDITOR_MENU_H
 #define DECK_EDITOR_MENU_H
 
+#include "../tabs/abstract_tab_deck_editor.h"
+
 #include <QMenu>
 
 class AbstractTabDeckEditor;
diff --git a/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp b/cockatrice/src/client/get_text_with_max.cpp
similarity index 97%
rename from cockatrice/src/interface/widgets/utility/get_text_with_max.cpp
rename to cockatrice/src/client/get_text_with_max.cpp
index 134352eb3..73745be02 100644
--- a/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp
+++ b/cockatrice/src/client/get_text_with_max.cpp
@@ -1,7 +1,5 @@
 #include "get_text_with_max.h"
 
-#include <QInputDialog>
-
 QString getTextWithMax(QWidget *parent,
                        const QString &title,
                        const QString &label,
diff --git a/cockatrice/src/interface/widgets/utility/get_text_with_max.h b/cockatrice/src/client/get_text_with_max.h
similarity index 76%
rename from cockatrice/src/interface/widgets/utility/get_text_with_max.h
rename to cockatrice/src/client/get_text_with_max.h
index 923d6f427..b6a9304ed 100644
--- a/cockatrice/src/interface/widgets/utility/get_text_with_max.h
+++ b/cockatrice/src/client/get_text_with_max.h
@@ -1,15 +1,10 @@
-/**
- * @file get_text_with_max.h
- * @ingroup UI
- * @brief Custom QInputDialog::getText implementation that allows configuration of the max length
- */
-
+// custom QInputDialog::getText implementation that allows configuration of the max length
 #ifndef GETTEXTWITHMAX_H
 #define GETTEXTWITHMAX_H
 
-#include <QLineEdit>
-#include <QWidget>
-#include <libcockatrice/utility/trice_limits.h>
+#include "trice_limits.h"
+
+#include <QInputDialog>
 
 QString getTextWithMax(QWidget *parent,
                        const QString &title,
diff --git a/cockatrice/src/client/network/update/client/client_update_checker.cpp b/cockatrice/src/client/network/client_update_checker.cpp
similarity index 95%
rename from cockatrice/src/client/network/update/client/client_update_checker.cpp
rename to cockatrice/src/client/network/client_update_checker.cpp
index 64709113a..23c52d08d 100644
--- a/cockatrice/src/client/network/update/client/client_update_checker.cpp
+++ b/cockatrice/src/client/network/client_update_checker.cpp
@@ -1,6 +1,6 @@
 #include "client_update_checker.h"
 
-#include "../../../settings/cache_settings.h"
+#include "../../settings/cache_settings.h"
 #include "release_channel.h"
 
 ClientUpdateChecker::ClientUpdateChecker(QObject *parent) : QObject(parent)
diff --git a/cockatrice/src/client/network/update/client/client_update_checker.h b/cockatrice/src/client/network/client_update_checker.h
similarity index 93%
rename from cockatrice/src/client/network/update/client/client_update_checker.h
rename to cockatrice/src/client/network/client_update_checker.h
index 4e6f279c3..96a7213b1 100644
--- a/cockatrice/src/client/network/update/client/client_update_checker.h
+++ b/cockatrice/src/client/network/client_update_checker.h
@@ -1,9 +1,3 @@
-/**
- * @file client_update_checker.h
- * @ingroup ClientUpdate
- * @brief TODO: Document this.
- */
-
 #ifndef CLIENT_UPDATE_CHECKER_H
 #define CLIENT_UPDATE_CHECKER_H
 #include <QObject>
diff --git a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h
index 1e2372fd1..dd1f4ac35 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,9 +1,3 @@
-/**
- * @file deck_link_to_api_transformer.h
- * @ingroup ApiInterfaces
- * @brief TODO: Document this.
- */
-
 #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 1818aa35c..5de25dec0 100644
--- a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h
+++ b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h
@@ -1,39 +1,30 @@
-/**
- * @file interface_json_deck_parser.h
- * @ingroup ApiInterfaces
- * @brief TODO: Document this.
- */
-
 #ifndef INTERFACE_JSON_DECK_PARSER_H
 #define INTERFACE_JSON_DECK_PARSER_H
-
-#include "../../../interface/deck_loader/card_node_function.h"
+#include "../../../deck/deck_loader.h"
 
 #include <QJsonArray>
 #include <QJsonObject>
-#include <libcockatrice/card/import/card_name_normalizer.h>
-#include <libcockatrice/deck_list/deck_list.h>
 
 class IJsonDeckParser
 {
 public:
     virtual ~IJsonDeckParser() = default;
 
-    virtual DeckList parse(const QJsonObject &obj) = 0;
+    virtual DeckLoader *parse(const QJsonObject &obj) = 0;
 };
 
 class ArchidektJsonParser : public IJsonDeckParser
 {
 public:
-    DeckList parse(const QJsonObject &obj) override
+    DeckLoader *parse(const QJsonObject &obj) override
     {
-        DeckList deckList;
+        DeckLoader *list = new DeckLoader();
 
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        deckList.setName(deckName);
-        deckList.setComments(deckDescription);
+        list->setName(deckName);
+        list->setComments(deckDescription);
 
         QString outputText;
         QTextStream outStream(&outputText);
@@ -50,25 +41,25 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
-        deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer());
-        deckList.forEachCard(CardNodeFunction::ResolveProviderId());
+        list->loadFromStream_Plain(outStream, false);
+        list->resolveSetNameAndNumberToProviderID();
 
-        return deckList;
+        return list;
     }
 };
 
 class MoxfieldJsonParser : public IJsonDeckParser
 {
 public:
-    DeckList parse(const QJsonObject &obj) override
+    DeckLoader *parse(const QJsonObject &obj) override
     {
-        DeckList deckList;
+        DeckLoader *list = new DeckLoader();
 
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        deckList.setName(deckName);
-        deckList.setComments(deckDescription);
+        list->setName(deckName);
+        list->setComments(deckDescription);
 
         QString outputText;
         QTextStream outStream(&outputText);
@@ -97,8 +88,8 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
-        deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer());
-        deckList.forEachCard(CardNodeFunction::ResolveProviderId());
+        list->loadFromStream_Plain(outStream, false);
+        list->resolveSetNameAndNumberToProviderID();
 
         QJsonObject commandersObj = obj.value("commanders").toObject();
         if (!commandersObj.isEmpty()) {
@@ -109,12 +100,12 @@ public:
                 QString collectorNumber = cardData.value("cn").toString();
                 QString providerId = cardData.value("scryfall_id").toString();
 
-                deckList.setBannerCard({commanderName, providerId});
-                deckList.addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId);
+                list->setBannerCard({commanderName, providerId});
+                list->addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId);
             }
         }
 
-        return deckList;
+        return list;
     }
 };
 
diff --git a/cockatrice/src/client/network/update/client/release_channel.cpp b/cockatrice/src/client/network/release_channel.cpp
similarity index 100%
rename from cockatrice/src/client/network/update/client/release_channel.cpp
rename to cockatrice/src/client/network/release_channel.cpp
diff --git a/cockatrice/src/client/network/update/client/release_channel.h b/cockatrice/src/client/network/release_channel.h
similarity index 73%
rename from cockatrice/src/client/network/update/client/release_channel.h
rename to cockatrice/src/client/network/release_channel.h
index 93e6b985d..0fb459969 100644
--- a/cockatrice/src/client/network/update/client/release_channel.h
+++ b/cockatrice/src/client/network/release_channel.h
@@ -1,9 +1,3 @@
-/**
- * @file release_channel.h
- * @ingroup ClientUpdate
- * @brief TODO: Document this.
- */
-
 #ifndef RELEASECHANNEL_H
 #define RELEASECHANNEL_H
 
@@ -57,27 +51,27 @@ protected:
     }
 
 public:
-    [[nodiscard]] QString getName() const
+    QString getName() const
     {
         return name;
     }
-    [[nodiscard]] QString getDescriptionUrl() const
+    QString getDescriptionUrl() const
     {
         return descriptionUrl;
     }
-    [[nodiscard]] QString getDownloadUrl() const
+    QString getDownloadUrl() const
     {
         return downloadUrl;
     }
-    [[nodiscard]] QString getCommitHash() const
+    QString getCommitHash() const
     {
         return commitHash;
     }
-    [[nodiscard]] QDate getPublishDate() const
+    QDate getPublishDate() const
     {
         return publishDate;
     }
-    [[nodiscard]] bool isCompatibleVersionFound() const
+    bool isCompatibleVersionFound() const
     {
         return compatibleVersionFound;
     }
@@ -97,15 +91,15 @@ protected:
 
 protected:
     static bool downloadMatchesCurrentOS(const QString &fileName);
-    [[nodiscard]] virtual QString getReleaseChannelUrl() const = 0;
+    virtual QString getReleaseChannelUrl() const = 0;
 
 public:
     Release *getLastRelease()
     {
         return lastRelease;
     }
-    [[nodiscard]] virtual QString getManualDownloadUrl() const = 0;
-    [[nodiscard]] virtual QString getName() const = 0;
+    virtual QString getManualDownloadUrl() const = 0;
+    virtual QString getName() const = 0;
     void checkForUpdates();
 signals:
     void finishedCheck(bool needToUpdate, bool isCompatible, Release *release);
@@ -122,12 +116,12 @@ public:
     explicit StableReleaseChannel() = default;
     ~StableReleaseChannel() override = default;
 
-    [[nodiscard]] QString getManualDownloadUrl() const override;
+    QString getManualDownloadUrl() const override;
 
-    [[nodiscard]] QString getName() const override;
+    QString getName() const override;
 
 protected:
-    [[nodiscard]] QString getReleaseChannelUrl() const override;
+    QString getReleaseChannelUrl() const override;
 protected slots:
 
     void releaseListFinished() override;
@@ -143,12 +137,12 @@ public:
     BetaReleaseChannel() = default;
     ~BetaReleaseChannel() override = default;
 
-    [[nodiscard]] QString getManualDownloadUrl() const override;
+    QString getManualDownloadUrl() const override;
 
-    [[nodiscard]] QString getName() const override;
+    QString getName() const override;
 
 protected:
-    [[nodiscard]] QString getReleaseChannelUrl() const override;
+    QString getReleaseChannelUrl() const override;
 protected slots:
 
     void releaseListFinished() override;
diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp b/cockatrice/src/client/network/replay_timeline_widget.cpp
similarity index 98%
rename from cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
rename to cockatrice/src/client/network/replay_timeline_widget.cpp
index 25ee58b67..1f258bf68 100644
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
+++ b/cockatrice/src/client/network/replay_timeline_widget.cpp
@@ -1,9 +1,10 @@
 #include "replay_timeline_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../settings/cache_settings.h"
 
 #include <QPainter>
 #include <QPainterPath>
+#include <QPalette>
 #include <QTimer>
 
 ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent)
diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h b/cockatrice/src/client/network/replay_timeline_widget.h
similarity index 85%
rename from cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
rename to cockatrice/src/client/network/replay_timeline_widget.h
index 07a0c0b4c..1ff995826 100644
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
+++ b/cockatrice/src/client/network/replay_timeline_widget.h
@@ -1,14 +1,9 @@
-/**
- * @file replay_timeline_widget.h
- * @ingroup Replay
- * @brief TODO: Document this.
- */
-
 #ifndef REPLAY_TIMELINE_WIDGET
 #define REPLAY_TIMELINE_WIDGET
 
-#include "../../../game/player/event_processing_options.h"
+#include "../../game/player/event_processing_options.h"
 
+#include <QList>
 #include <QMouseEvent>
 #include <QWidget>
 
@@ -59,10 +54,10 @@ public:
 
     explicit ReplayTimelineWidget(QWidget *parent = nullptr);
     void setTimeline(const QList<int> &_replayTimeline);
-    [[nodiscard]] QSize sizeHint() const override;
-    [[nodiscard]] QSize minimumSizeHint() const override;
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
     void setTimeScaleFactor(qreal _timeScaleFactor);
-    [[nodiscard]] int getCurrentEvent() const
+    int getCurrentEvent() const
     {
         return currentEvent;
     }
diff --git a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp b/cockatrice/src/client/network/sets_model.cpp
similarity index 97%
rename from libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp
rename to cockatrice/src/client/network/sets_model.cpp
index f6dc4f9cf..a86b710b5 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp
+++ b/cockatrice/src/client/network/sets_model.cpp
@@ -1,4 +1,4 @@
-#include "card_sets_model.h"
+#include "sets_model.h"
 
 #include <QSortFilterProxyModel>
 
@@ -45,7 +45,7 @@ QVariant SetsModel::data(const QModelIndex &index, int role) const
 
     switch (index.column()) {
         case SortKeyCol:
-            return QString("%1").arg(index.row(), 8, 10, QChar('0'));
+            return QString("%1").arg(set->getSortKey(), 8, 10, QChar('0'));
         case IsKnownCol:
             return set->getIsKnown();
         case SetTypeCol:
@@ -283,7 +283,11 @@ bool SetsDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex &source
     auto nameIndex = sourceModel()->index(sourceRow, SetsModel::LongNameCol, sourceParent);
     auto shortNameIndex = sourceModel()->index(sourceRow, SetsModel::ShortNameCol, sourceParent);
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
     const auto filter = filterRegularExpression();
+#else
+    const auto filter = filterRegExp();
+#endif
 
     return (sourceModel()->data(typeIndex).toString().contains(filter) ||
             sourceModel()->data(nameIndex).toString().contains(filter) ||
diff --git a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h b/cockatrice/src/client/network/sets_model.h
similarity index 60%
rename from libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h
rename to cockatrice/src/client/network/sets_model.h
index 0ffc5a847..70dea842e 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h
+++ b/cockatrice/src/client/network/sets_model.h
@@ -1,17 +1,12 @@
-/**
- * @file sets_model.h
- * @ingroup CardDatabaseModels
- * @brief TODO: Document this.
- */
-
 #ifndef SETSMODEL_H
 #define SETSMODEL_H
 
+#include "../../database/card_database.h"
+
 #include <QAbstractTableModel>
 #include <QMimeData>
 #include <QSet>
 #include <QSortFilterProxyModel>
-#include <libcockatrice/card/database/card_database.h>
 
 class SetsProxyModel;
 
@@ -25,11 +20,11 @@ public:
     SetsMimeData(int _oldRow) : oldRow(_oldRow)
     {
     }
-    [[nodiscard]] int getOldRow() const
+    int getOldRow() const
     {
         return oldRow;
     }
-    [[nodiscard]] QStringList formats() const
+    QStringList formats() const
     {
         return QStringList() << "application/x-cockatricecardset";
     }
@@ -42,7 +37,7 @@ class SetsModel : public QAbstractTableModel
 
 private:
     static const int NUM_COLS = 7;
-    CardSetList sets;
+    SetList sets;
     QSet<CardSetPtr> enabledSets;
 
 public:
@@ -64,23 +59,22 @@ public:
 
     explicit SetsModel(CardDatabase *_db, QObject *parent = nullptr);
     ~SetsModel() override;
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] int columnCount(const QModelIndex &parent = QModelIndex()) const override
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override
     {
         Q_UNUSED(parent);
         return NUM_COLS;
     }
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role) override;
-    [[nodiscard]] QVariant
-    headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-    [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override;
-    [[nodiscard]] Qt::DropActions supportedDropActions() const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    Qt::DropActions supportedDropActions() const override;
 
-    [[nodiscard]] QMimeData *mimeData(const QModelIndexList &indexes) const override;
+    QMimeData *mimeData(const QModelIndexList &indexes) const override;
     bool
     dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
-    [[nodiscard]] QStringList mimeTypes() const override;
+    QStringList mimeTypes() const override;
     void swapRows(int oldRow, int newRow);
     void toggleRow(int row, bool enable);
     void toggleRow(int row);
@@ -98,8 +92,8 @@ public:
     explicit SetsDisplayModel(QObject *parent = nullptr);
 
 protected:
-    [[nodiscard]] bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
-    [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
     void fetchMore(const QModelIndex &index) override;
 };
 
diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp b/cockatrice/src/client/network/spoiler_background_updater.cpp
similarity index 94%
rename from cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
rename to cockatrice/src/client/network/spoiler_background_updater.cpp
index 7194c46e5..68fdc4c4c 100644
--- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
+++ b/cockatrice/src/client/network/spoiler_background_updater.cpp
@@ -1,20 +1,21 @@
 #include "spoiler_background_updater.h"
 
-#include "../../../../interface/window_main.h"
-#include "../../../../main.h"
-#include "../../../settings/cache_settings.h"
+#include "../../database/card_database.h"
+#include "../../database/card_database_manager.h"
+#include "../../interface/window_main.h"
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
 
+#include <QApplication>
 #include <QCryptographicHash>
 #include <QDateTime>
 #include <QDebug>
 #include <QFile>
 #include <QLocale>
+#include <QMessageBox>
 #include <QNetworkReply>
 #include <QUrl>
 #include <QtConcurrent>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <version_string.h>
 
 #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
 #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"
@@ -40,9 +41,7 @@ void SpoilerBackgroundUpdater::startSpoilerDownloadProcess(QString url, bool sav
 void SpoilerBackgroundUpdater::downloadFromURL(QUrl url, bool saveResults)
 {
     auto *nam = new QNetworkAccessManager(this);
-    auto request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    QNetworkReply *reply = nam->get(request);
+    QNetworkReply *reply = nam->get(QNetworkRequest(url));
 
     if (saveResults) {
         // This will write out to the file (used for spoiler.xml)
diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h b/cockatrice/src/client/network/spoiler_background_updater.h
similarity index 88%
rename from cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h
rename to cockatrice/src/client/network/spoiler_background_updater.h
index a2feb5ccf..a29488bf2 100644
--- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h
+++ b/cockatrice/src/client/network/spoiler_background_updater.h
@@ -1,9 +1,3 @@
-/**
- * @file spoiler_background_updater.h
- * @ingroup Client
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_SPOILER_DOWNLOADER_H
 #define COCKATRICE_SPOILER_DOWNLOADER_H
 
@@ -22,7 +16,7 @@ public:
     inline QString getCardUpdaterBinaryName()
     {
         return "oracle";
-    }
+    };
     QByteArray getHash(const QString fileName);
     QByteArray getHash(QByteArray data);
     static bool deleteSpoilerFile();
diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.cpp b/cockatrice/src/client/replay_manager.cpp
similarity index 99%
rename from cockatrice/src/interface/widgets/replay/replay_manager.cpp
rename to cockatrice/src/client/replay_manager.cpp
index fac3576f2..843632c99 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.cpp
+++ b/cockatrice/src/client/replay_manager.cpp
@@ -1,6 +1,6 @@
 #include "replay_manager.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
+#include "../tabs/tab_game.h"
 
 #include <QHBoxLayout>
 #include <QToolButton>
diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.h b/cockatrice/src/client/replay_manager.h
similarity index 82%
rename from cockatrice/src/interface/widgets/replay/replay_manager.h
rename to cockatrice/src/client/replay_manager.h
index 9469adcd4..4dc7869b9 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.h
+++ b/cockatrice/src/client/replay_manager.h
@@ -1,18 +1,11 @@
-/**
- * @file replay_manager.h
- * @ingroup Core
- * @ingroup Replay
- * @brief TODO: Document this.
- */
-
 #ifndef REPLAY_MANAGER_H
 #define REPLAY_MANAGER_H
 
-#include "replay_timeline_widget.h"
+#include "network/replay_timeline_widget.h"
+#include "pb/game_replay.pb.h"
 
 #include <QToolButton>
 #include <QWidget>
-#include <libcockatrice/protocol/pb/game_replay.pb.h>
 
 class TabGame;
 
diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp
index 31cb2a35e..fef2df093 100644
--- a/cockatrice/src/client/sound_engine.cpp
+++ b/cockatrice/src/client/sound_engine.cpp
@@ -1,6 +1,6 @@
 #include "sound_engine.h"
 
-#include "settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 
 #include <QDir>
 #include <QMediaPlayer>
diff --git a/cockatrice/src/client/sound_engine.h b/cockatrice/src/client/sound_engine.h
index f45cccf7d..851ca3928 100644
--- a/cockatrice/src/client/sound_engine.h
+++ b/cockatrice/src/client/sound_engine.h
@@ -1,9 +1,3 @@
-/**
- * @file sound_engine.h
- * @ingroup Core
- * @brief TODO: Document this.
- */
-
 #ifndef SOUNDENGINE_H
 #define SOUNDENGINE_H
 
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp b/cockatrice/src/client/tapped_out_interface.cpp
similarity index 80%
rename from cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
rename to cockatrice/src/client/tapped_out_interface.cpp
index af377d176..43ceb6cdd 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
+++ b/cockatrice/src/client/tapped_out_interface.cpp
@@ -1,14 +1,15 @@
 #include "tapped_out_interface.h"
 
+#include "deck_list.h"
+#include "deck_list_card_node.h"
+
 #include <QDesktopServices>
 #include <QMessageBox>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <version_string.h>
 
 TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)
@@ -67,35 +68,32 @@ void TappedOutInterface::queryFinished(QNetworkReply *reply)
     deleteLater();
 }
 
-void TappedOutInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray &data)
+void TappedOutInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data)
 {
     DeckList mainboard, sideboard;
-    copyDeckSplitMainAndSide(deck, mainboard, sideboard);
+    copyDeckSplitMainAndSide(*deck, mainboard, sideboard);
 
     QUrl params;
     QUrlQuery urlQuery;
-    urlQuery.addQueryItem("name", deck.getName());
+    urlQuery.addQueryItem("name", deck->getName());
     urlQuery.addQueryItem("mainboard", mainboard.writeToString_Plain(false, true));
     urlQuery.addQueryItem("sideboard", sideboard.writeToString_Plain(false, true));
     params.setQuery(urlQuery);
-    data.append(params.query(QUrl::EncodeReserved).toUtf8());
+    data->append(params.query(QUrl::EncodeReserved).toUtf8());
 }
 
-void TappedOutInterface::analyzeDeck(const DeckList &deck)
+void TappedOutInterface::analyzeDeck(DeckList *deck)
 {
     QByteArray data;
-    getAnalyzeRequestData(deck, data);
+    getAnalyzeRequestData(deck, &data);
 
     QNetworkRequest request(QUrl("https://tappedout.net/mtg-decks/paste/"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    // we interpret the redirect and open it in the browser instead, do not follow redirects
-    request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::ManualRedirectPolicy);
 
     manager->post(request, data);
 }
 
-void TappedOutInterface::copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard)
+void TappedOutInterface::copyDeckSplitMainAndSide(DeckList &source, DeckList &mainboard, DeckList &sideboard)
 {
     auto copyMainOrSide = [this, &mainboard, &sideboard](const auto node, const auto card) {
         CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName());
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.h b/cockatrice/src/client/tapped_out_interface.h
similarity index 64%
rename from cockatrice/src/client/network/interfaces/tapped_out_interface.h
rename to cockatrice/src/client/tapped_out_interface.h
index 0ea9c8358..b9eaddb23 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.h
+++ b/cockatrice/src/client/tapped_out_interface.h
@@ -1,14 +1,11 @@
-/**
- * @file tapped_out_interface.h
- * @ingroup ApiInterfaces
- * @brief TODO: Document this.
- */
-
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/deck_list/deck_list.h>
+#include "../database/card_database.h"
+#include "deck_list.h"
+
+#include <QLoggingCategory>
+#include <QObject>
 
 inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
 
@@ -30,14 +27,14 @@ private:
     QNetworkAccessManager *manager;
 
     CardDatabase &cardDatabase;
-    void copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard);
+    void copyDeckSplitMainAndSide(DeckList &source, DeckList &mainboard, DeckList &sideboard);
 private slots:
     void queryFinished(QNetworkReply *reply);
-    void getAnalyzeRequestData(const DeckList &deck, QByteArray &data);
+    void getAnalyzeRequestData(DeckList *deck, QByteArray *data);
 
 public:
     explicit TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
-    void analyzeDeck(const DeckList &deck);
+    void analyzeDeck(DeckList *deck);
 };
 
 #endif
diff --git a/cockatrice/src/client/network/update/client/update_downloader.cpp b/cockatrice/src/client/update_downloader.cpp
similarity index 99%
rename from cockatrice/src/client/network/update/client/update_downloader.cpp
rename to cockatrice/src/client/update_downloader.cpp
index c0f3e945c..40186bec4 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.cpp
+++ b/cockatrice/src/client/update_downloader.cpp
@@ -1,5 +1,6 @@
 #include "update_downloader.h"
 
+#include <QDebug>
 #include <QUrl>
 
 UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent), response(nullptr)
diff --git a/cockatrice/src/client/network/update/client/update_downloader.h b/cockatrice/src/client/update_downloader.h
similarity index 88%
rename from cockatrice/src/client/network/update/client/update_downloader.h
rename to cockatrice/src/client/update_downloader.h
index d70759038..cafed0377 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.h
+++ b/cockatrice/src/client/update_downloader.h
@@ -1,13 +1,13 @@
-/**
- * @file update_downloader.h
- * @ingroup ClientUpdate
- * @brief TODO: Document this.
- */
+//
+// Created by miguel on 28/12/15.
+//
 
 #ifndef COCKATRICE_UPDATEDOWNLOADER_H
 #define COCKATRICE_UPDATEDOWNLOADER_H
 
+#include <QDate>
 #include <QObject>
+#include <QUrl>
 #include <QtNetwork>
 
 class UpdateDownloader : public QObject
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.cpp b/cockatrice/src/database/card_database.cpp
similarity index 84%
rename from libcockatrice_card/libcockatrice/card/database/card_database.cpp
rename to cockatrice/src/database/card_database.cpp
index 5c4b408b3..a26445005 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.cpp
+++ b/cockatrice/src/database/card_database.cpp
@@ -1,34 +1,34 @@
 #include "card_database.h"
 
-#include "../relation/card_relation.h"
+#include "../picture_loader/picture_loader.h"
+#include "../settings/cache_settings.h"
+#include "parser/cockatrice_xml_3.h"
 #include "parser/cockatrice_xml_4.h"
 
 #include <QCryptographicHash>
 #include <QDebug>
+#include <QDir>
 #include <QDirIterator>
 #include <QFile>
+#include <QMessageBox>
 #include <QRegularExpression>
 #include <algorithm>
 #include <utility>
 
-CardDatabase::CardDatabase(QObject *parent,
-                           ICardPreferenceProvider *prefs,
-                           ICardDatabasePathProvider *pathProvider,
-                           ICardSetPriorityController *_setPriorityController)
-    : QObject(parent), setPriorityController(_setPriorityController), loadStatus(NotLoaded)
+CardDatabase::CardDatabase(QObject *parent) : QObject(parent), loadStatus(NotLoaded)
 {
     qRegisterMetaType<CardInfoPtr>("CardInfoPtr");
     qRegisterMetaType<CardInfoPtr>("CardSetPtr");
 
     // create loader and wire it up
-    loader = new CardDatabaseLoader(this, this, pathProvider, prefs, setPriorityController);
+    loader = new CardDatabaseLoader(this, this);
     // re-emit loader signals (so other code doesn't need to know about internals)
     connect(loader, &CardDatabaseLoader::loadingFinished, this, &CardDatabase::cardDatabaseLoadingFinished);
     connect(loader, &CardDatabaseLoader::loadingFailed, this, &CardDatabase::cardDatabaseLoadingFailed);
     connect(loader, &CardDatabaseLoader::newSetsFound, this, &CardDatabase::cardDatabaseNewSetsFound);
     connect(loader, &CardDatabaseLoader::allNewSetsEnabled, this, &CardDatabase::cardDatabaseAllNewSetsEnabled);
 
-    querier = new CardDatabaseQuerier(this, this, prefs);
+    querier = new CardDatabaseQuerier(this, this);
 }
 
 CardDatabase::~CardDatabase()
@@ -138,15 +138,15 @@ CardSetPtr CardDatabase::getSet(const QString &setName)
     if (sets.contains(setName)) {
         return sets.value(setName);
     } else {
-        CardSetPtr newSet = CardSet::newInstance(setPriorityController, setName);
+        CardSetPtr newSet = CardSet::newInstance(setName);
         sets.insert(setName, newSet);
         return newSet;
     }
 }
 
-CardSetList CardDatabase::getSetList() const
+SetList CardDatabase::getSetList() const
 {
-    CardSetList result;
+    SetList result;
     for (auto set : sets.values()) {
         result << set;
     }
@@ -192,15 +192,9 @@ void CardDatabase::markAllSetsAsKnown()
 void CardDatabase::notifyEnabledSetsChanged()
 {
     // refresh the list of cached set names
-    for (const CardInfoPtr &card : cards) {
-        card->refreshCachedSets();
-    }
+    for (const CardInfoPtr &card : cards)
+        card->refreshCachedSetNames();
 
     // inform the carddatabasemodels that they need to re-check their list of cards
     emit cardDatabaseEnabledSetsChanged();
 }
-
-void CardDatabase::addFormat(FormatRulesPtr format)
-{
-    formats.insert(format->formatName.toLower(), format);
-}
\ No newline at end of file
diff --git a/cockatrice/src/database/card_database.h b/cockatrice/src/database/card_database.h
new file mode 100644
index 000000000..a6941ee5b
--- /dev/null
+++ b/cockatrice/src/database/card_database.h
@@ -0,0 +1,96 @@
+#ifndef CARDDATABASE_H
+#define CARDDATABASE_H
+
+#include "../card/exact_card.h"
+#include "../common/card_ref.h"
+#include "card_database_loader.h"
+#include "card_database_querier.h"
+
+#include <QBasicMutex>
+#include <QDate>
+#include <QHash>
+#include <QList>
+#include <QLoggingCategory>
+#include <QStringList>
+#include <QVector>
+#include <utility>
+
+inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database");
+
+class CardDatabase : public QObject
+{
+    Q_OBJECT
+protected:
+    /*
+     * The cards, indexed by name.
+     */
+    CardNameMap cards;
+
+    /**
+     * The cards, indexed by their simple name.
+     */
+    CardNameMap simpleNameCards;
+
+    /*
+     * The sets, indexed by short name.
+     */
+    SetNameMap sets;
+
+    // loader responsible for file discovery & parsing
+    CardDatabaseLoader *loader;
+
+    LoadStatus loadStatus;
+
+    CardDatabaseQuerier *querier;
+
+private:
+    void checkUnknownSets();
+    void refreshCachedReverseRelatedCards();
+
+    QBasicMutex *clearDatabaseMutex = new QBasicMutex(), *addCardMutex = new QBasicMutex(),
+                *removeCardMutex = new QBasicMutex();
+
+public:
+    explicit CardDatabase(QObject *parent = nullptr);
+    ~CardDatabase() override;
+
+    void removeCard(CardInfoPtr card);
+    void clear();
+
+    const CardNameMap &getCardList() const
+    {
+        return cards;
+    }
+    CardSetPtr getSet(const QString &setName);
+    SetList getSetList() const;
+    LoadStatus getLoadStatus() const
+    {
+        return loadStatus;
+    }
+    CardDatabaseQuerier *query() const
+    {
+        return querier;
+    }
+    void enableAllUnknownSets();
+    void markAllSetsAsKnown();
+    void notifyEnabledSetsChanged();
+
+public slots:
+    void addCard(CardInfoPtr card);
+    void addSet(CardSetPtr set);
+    void loadCardDatabases();
+    bool saveCustomTokensToFile();
+signals:
+    void cardDatabaseLoadingFinished();
+    void cardDatabaseLoadingFailed();
+    void cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknownSetsNames);
+    void cardDatabaseAllNewSetsEnabled();
+    void cardDatabaseEnabledSetsChanged();
+    void cardAdded(CardInfoPtr card);
+    void cardRemoved(CardInfoPtr card);
+
+    friend class CardDatabaseLoader;
+    friend class CardDatabaseQuerier;
+};
+
+#endif
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp b/cockatrice/src/database/card_database_loader.cpp
similarity index 73%
rename from libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
rename to cockatrice/src/database/card_database_loader.cpp
index 716477a59..fbb3e6b67 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
+++ b/cockatrice/src/database/card_database_loader.cpp
@@ -1,5 +1,6 @@
 #include "card_database_loader.h"
 
+#include "../settings/cache_settings.h"
 #include "card_database.h"
 #include "parser/cockatrice_xml_3.h"
 #include "parser/cockatrice_xml_4.h"
@@ -9,26 +10,20 @@
 #include <QFile>
 #include <QTime>
 
-CardDatabaseLoader::CardDatabaseLoader(QObject *parent,
-                                       CardDatabase *db,
-                                       ICardDatabasePathProvider *_pathProvider,
-                                       ICardPreferenceProvider *_preferenceProvider,
-                                       ICardSetPriorityController *_priorityController)
-    : QObject(parent), database(db), pathProvider(_pathProvider)
+CardDatabaseLoader::CardDatabaseLoader(QObject *parent, CardDatabase *db) : QObject(parent), database(db)
 {
     // instantiate available parsers here and connect them to the database
-    availableParsers << new CockatriceXml4Parser(_preferenceProvider, _priorityController);
-    availableParsers << new CockatriceXml3Parser(_priorityController);
+    availableParsers << new CockatriceXml4Parser;
+    availableParsers << new CockatriceXml3Parser;
 
     for (auto *p : availableParsers) {
         // connect parser outputs to the database adders
         connect(p, &ICardDatabaseParser::addCard, database, &CardDatabase::addCard, Qt::DirectConnection);
         connect(p, &ICardDatabaseParser::addSet, database, &CardDatabase::addSet, Qt::DirectConnection);
-        connect(p, &ICardDatabaseParser::addFormat, database, &CardDatabase::addFormat, Qt::DirectConnection);
     }
 
     // when SettingsCache's path changes, trigger reloads
-    connect(pathProvider, &ICardDatabasePathProvider::cardDatabasePathChanged, this,
+    connect(&SettingsCache::instance(), &SettingsCache::cardDatabasePathChanged, this,
             &CardDatabaseLoader::loadCardDatabases);
 }
 
@@ -41,7 +36,8 @@ CardDatabaseLoader::~CardDatabaseLoader()
 LoadStatus CardDatabaseLoader::loadFromFile(const QString &fileName)
 {
     QFile file(fileName);
-    if (!file.open(QIODevice::ReadOnly)) {
+    file.open(QIODevice::ReadOnly);
+    if (!file.isOpen()) {
         return FileError;
     }
 
@@ -88,9 +84,10 @@ LoadStatus CardDatabaseLoader::loadCardDatabases()
 
     database->clear(); // remove old db
 
-    LoadStatus loadStatus = loadCardDatabase(pathProvider->getCardDatabasePath()); // load main card database
-    loadCardDatabase(pathProvider->getTokenDatabasePath());                        // load tokens database
-    loadCardDatabase(pathProvider->getSpoilerCardDatabasePath());                  // load spoilers database
+    LoadStatus loadStatus =
+        loadCardDatabase(SettingsCache::instance().getCardDatabasePath());    // load main card database
+    loadCardDatabase(SettingsCache::instance().getTokenDatabasePath());       // load tokens database
+    loadCardDatabase(SettingsCache::instance().getSpoilerCardDatabasePath()); // load spoilers database
 
     // find all custom card databases, recursively & following symlinks
     // then load them alphabetically
@@ -121,7 +118,7 @@ LoadStatus CardDatabaseLoader::loadCardDatabases()
 
 QStringList CardDatabaseLoader::collectCustomDatabasePaths() const
 {
-    QDirIterator it(pathProvider->getCustomCardDatabasePath(), {"*.xml"}, QDir::Files,
+    QDirIterator it(SettingsCache::instance().getCustomCardDatabasePath(), {"*.xml"}, QDir::Files,
                     QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
 
     QStringList paths;
@@ -138,7 +135,7 @@ bool CardDatabaseLoader::saveCustomTokensToFile()
         return false;
     }
 
-    QString fileName = pathProvider->getCustomCardDatabasePath() + "/" + CardSet::TOKENS_SETNAME + ".xml";
+    QString fileName = SettingsCache::instance().getCustomCardDatabasePath() + "/" + CardSet::TOKENS_SETNAME + ".xml";
 
     SetNameMap tmpSets;
     CardSetPtr customTokensSet = database->getSet(CardSet::TOKENS_SETNAME);
@@ -151,6 +148,6 @@ bool CardDatabaseLoader::saveCustomTokensToFile()
         }
     }
 
-    availableParsers.first()->saveToFile(FormatRulesNameMap(), tmpSets, tmpCards, fileName);
+    availableParsers.first()->saveToFile(tmpSets, tmpCards, fileName);
     return true;
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/database/card_database_loader.h b/cockatrice/src/database/card_database_loader.h
new file mode 100644
index 000000000..37d3c4d75
--- /dev/null
+++ b/cockatrice/src/database/card_database_loader.h
@@ -0,0 +1,57 @@
+#ifndef COCKATRICE_CARD_DATABASE_LOADER_H
+#define COCKATRICE_CARD_DATABASE_LOADER_H
+
+#include <QBasicMutex>
+#include <QList>
+#include <QLoggingCategory>
+#include <QObject>
+
+inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.loading");
+inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.loading.success_or_failure");
+
+class CardDatabase;
+class ICardDatabaseParser;
+
+enum LoadStatus
+{
+    Ok,
+    VersionTooOld,
+    Invalid,
+    NotLoaded,
+    FileError,
+    NoCards
+};
+
+class CardDatabaseLoader : public QObject
+{
+    Q_OBJECT
+public:
+    explicit CardDatabaseLoader(QObject *parent, CardDatabase *db);
+    ~CardDatabaseLoader() override;
+
+public slots:
+    LoadStatus loadCardDatabases();                   // discover & load the configured databases
+    LoadStatus loadCardDatabase(const QString &path); // load a single file
+    bool saveCustomTokensToFile();                    // write tokens to custom DB path
+
+signals:
+    void loadingStarted();
+    void loadingFinished();
+    void loadingFailed();
+    void newSetsFound(int numSets, const QStringList &setNames);
+    void allNewSetsEnabled();
+
+private:
+    LoadStatus loadFromFile(const QString &fileName); // internal helper
+    QStringList collectCustomDatabasePaths() const;
+
+    CardDatabase *database; // non-owning pointer to the container
+
+    // parsers
+    QList<ICardDatabaseParser *> availableParsers;
+
+    QBasicMutex *loadFromFileMutex = new QBasicMutex();
+    QBasicMutex *reloadDatabaseMutex = new QBasicMutex();
+};
+
+#endif // COCKATRICE_CARD_DATABASE_LOADER_H
diff --git a/cockatrice/src/database/card_database_manager.cpp b/cockatrice/src/database/card_database_manager.cpp
new file mode 100644
index 000000000..4ffe0cc70
--- /dev/null
+++ b/cockatrice/src/database/card_database_manager.cpp
@@ -0,0 +1,12 @@
+#include "card_database_manager.h"
+
+CardDatabase *CardDatabaseManager::getInstance()
+{
+    static CardDatabase instance; // Created only once, on first access
+    return &instance;
+}
+
+CardDatabaseQuerier *CardDatabaseManager::query()
+{
+    return getInstance()->query();
+}
\ No newline at end of file
diff --git a/cockatrice/src/database/card_database_manager.h b/cockatrice/src/database/card_database_manager.h
new file mode 100644
index 000000000..c87e04888
--- /dev/null
+++ b/cockatrice/src/database/card_database_manager.h
@@ -0,0 +1,23 @@
+#ifndef CARD_DATABASE_ACCESSOR_H
+#define CARD_DATABASE_ACCESSOR_H
+
+#pragma once
+#include "card_database.h"
+
+class CardDatabaseManager
+{
+public:
+    // Delete copy constructor and assignment operator to enforce singleton
+    CardDatabaseManager(const CardDatabaseManager &) = delete;
+    CardDatabaseManager &operator=(const CardDatabaseManager &) = delete;
+
+    // Static method to access the singleton instance
+    static CardDatabase *getInstance();
+    static CardDatabaseQuerier *query();
+
+private:
+    CardDatabaseManager() = default; // Private constructor
+    ~CardDatabaseManager() = default;
+};
+
+#endif // CARD_DATABASE_ACCESSOR_H
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp b/cockatrice/src/database/card_database_querier.cpp
similarity index 86%
rename from libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
rename to cockatrice/src/database/card_database_querier.cpp
index 021e8d12d..68cc39c9d 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
+++ b/cockatrice/src/database/card_database_querier.cpp
@@ -1,16 +1,11 @@
 #include "card_database_querier.h"
 
-#include "../card_info.h"
-#include "../printing/exact_card.h"
-#include "../set/card_set_comparator.h"
+#include "../utility/card_set_comparator.h"
 #include "card_database.h"
 
 #include <qrandom.h>
 
-CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent,
-                                         const CardDatabase *_db,
-                                         const ICardPreferenceProvider *prefs)
-    : QObject(_parent), db(_db), prefs(prefs)
+CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent, const CardDatabase *_db) : QObject(_parent), db(_db)
 {
 }
 
@@ -133,7 +128,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});
     }
 
@@ -207,17 +202,6 @@ PrintingInfo CardDatabaseQuerier::getSpecificPrinting(const QString &cardName,
     return PrintingInfo(nullptr);
 }
 
-/**
- * Gets the card representing the preferred printing of the cardInfo
- *
- * @param cardName The cardName to find the preferred card and printing for
- * @return A specific printing of a card
- */
-ExactCard CardDatabaseQuerier::getPreferredCard(const QString &cardName) const
-{
-    return getPreferredCard(getCardInfo(cardName));
-}
-
 /**
  * Gets the card representing the preferred printing of the cardInfo
  *
@@ -250,12 +234,6 @@ PrintingInfo CardDatabaseQuerier::getPreferredPrinting(const CardInfoPtr &cardIn
         return PrintingInfo(nullptr);
     }
 
-    const auto &pinnedPrintingProviderId = prefs->getCardPreferenceOverride(cardInfo->getName());
-
-    if (!pinnedPrintingProviderId.isEmpty()) {
-        return getSpecificPrinting({cardInfo->getName(), pinnedPrintingProviderId});
-    }
-
     SetToPrintingsMap setMap = cardInfo->getSets();
     if (setMap.empty()) {
         return PrintingInfo(nullptr);
@@ -328,7 +306,11 @@ QMap<QString, int> CardDatabaseQuerier::getAllSubCardTypesWithCount() const
         QStringList parts = type.split(" — ");
 
         if (parts.size() > 1) { // Ensure there are subtypes
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
             QStringList subtypes = parts[1].split(" ", Qt::SkipEmptyParts);
+#else
+            QStringList subtypes = parts[1].split(" ", QString::SkipEmptyParts);
+#endif
 
             for (const QString &subtype : subtypes) {
                 typeCounts[subtype]++;
@@ -337,27 +319,4 @@ QMap<QString, int> CardDatabaseQuerier::getAllSubCardTypesWithCount() const
     }
 
     return typeCounts;
-}
-
-FormatRulesPtr CardDatabaseQuerier::getFormat(const QString &formatName) const
-{
-    return db->formats.value(formatName.toLower());
-}
-
-QMap<QString, int> CardDatabaseQuerier::getAllFormatsWithCount() const
-{
-    QMap<QString, int> formatCounts;
-
-    for (const auto &card : db->cards.values()) {
-        QStringList allProps = card->getProperties();
-
-        for (const QString &prop : allProps) {
-            if (prop.startsWith("format-")) {
-                QString formatName = prop.mid(QStringLiteral("format-").size());
-                formatCounts[formatName]++;
-            }
-        }
-    }
-
-    return formatCounts;
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/database/card_database_querier.h b/cockatrice/src/database/card_database_querier.h
new file mode 100644
index 000000000..26c601333
--- /dev/null
+++ b/cockatrice/src/database/card_database_querier.h
@@ -0,0 +1,54 @@
+#ifndef COCKATRICE_CARD_DATABASE_QUERIER_H
+#define COCKATRICE_CARD_DATABASE_QUERIER_H
+
+#include "../card/exact_card.h"
+#include "../common/card_ref.h"
+
+#include <QObject>
+
+class CardDatabase;
+class CardDatabaseQuerier : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit CardDatabaseQuerier(QObject *parent, const CardDatabase *db);
+
+    [[nodiscard]] CardInfoPtr getCardInfo(const QString &cardName) const;
+    [[nodiscard]] QList<CardInfoPtr> getCardInfos(const QStringList &cardNames) const;
+
+    /*
+     * Get a card by its simple name. The name will be simplified in this
+     * function, so you don't need to simplify it beforehand.
+     */
+    [[nodiscard]] CardInfoPtr getCardBySimpleName(const QString &cardName) const;
+
+    [[nodiscard]] ExactCard guessCard(const CardRef &cardRef) const;
+    [[nodiscard]] ExactCard getCard(const CardRef &cardRef) const;
+    [[nodiscard]] QList<ExactCard> getCards(const QList<CardRef> &cardRefs) const;
+
+    [[nodiscard]] ExactCard getRandomCard() const;
+    [[nodiscard]] ExactCard getCardFromSameSet(const QString &cardName, const PrintingInfo &otherPrinting) const;
+
+    [[nodiscard]] ExactCard getPreferredCard(const CardInfoPtr &card) const;
+    [[nodiscard]] bool isPreferredPrinting(const CardRef &cardRef) const;
+    [[nodiscard]] PrintingInfo getPreferredPrinting(const CardInfoPtr &card) const;
+    [[nodiscard]] PrintingInfo getPreferredPrinting(const QString &cardName) const;
+    [[nodiscard]] QString getPreferredPrintingProviderId(const QString &cardName) const;
+
+    [[nodiscard]] PrintingInfo getSpecificPrinting(const CardRef &cardRef) const;
+    [[nodiscard]] PrintingInfo
+    getSpecificPrinting(const QString &cardName, const QString &setCode, const QString &collectorNumber) const;
+    [[nodiscard]] PrintingInfo findPrintingWithId(const CardInfoPtr &card, const QString &providerId) const;
+
+    [[nodiscard]] QStringList getAllMainCardTypes() const;
+    [[nodiscard]] QMap<QString, int> getAllMainCardTypesWithCount() const;
+    [[nodiscard]] QMap<QString, int> getAllSubCardTypesWithCount() const;
+
+private:
+    const CardDatabase *db;
+
+    CardInfoPtr lookupCardByName(const QString &name) const;
+};
+
+#endif // COCKATRICE_CARD_DATABASE_QUERIER_H
diff --git a/cockatrice/src/database/interface/settings_card_preference_provider.h b/cockatrice/src/database/interface/settings_card_preference_provider.h
deleted file mode 100644
index 6c31b9d6d..000000000
--- a/cockatrice/src/database/interface/settings_card_preference_provider.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H
-#define COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H
-#include "../../client/settings/cache_settings.h"
-
-#include <libcockatrice/interfaces/interface_card_preference_provider.h>
-
-class SettingsCardPreferenceProvider : public ICardPreferenceProvider
-{
-public:
-    [[nodiscard]] QString getCardPreferenceOverride(const QString &cardName) const override
-    {
-        return SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
-    }
-
-    [[nodiscard]] bool getIncludeRebalancedCards() const override
-    {
-        return SettingsCache::instance().getIncludeRebalancedCards();
-    }
-};
-
-#endif // COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp b/cockatrice/src/database/model/card/card_completer_proxy_model.cpp
similarity index 100%
rename from libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp
rename to cockatrice/src/database/model/card/card_completer_proxy_model.cpp
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h b/cockatrice/src/database/model/card/card_completer_proxy_model.h
similarity index 59%
rename from libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h
rename to cockatrice/src/database/model/card/card_completer_proxy_model.h
index afb6f1fcf..73cf223ed 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h
+++ b/cockatrice/src/database/model/card/card_completer_proxy_model.h
@@ -1,9 +1,3 @@
-/**
- * @file card_completer_proxy_model.h
- * @ingroup CardDatabaseModels
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_COMPLETER_PROXY_MODEL_H
 #define CARD_COMPLETER_PROXY_MODEL_H
 
@@ -16,7 +10,7 @@ public:
     explicit CardCompleterProxyModel(QObject *parent = nullptr);
 
 protected:
-    [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 };
 
 #endif // CARD_COMPLETER_PROXY_MODEL_H
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp b/cockatrice/src/database/model/card/card_search_model.cpp
similarity index 95%
rename from libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
rename to cockatrice/src/database/model/card/card_search_model.cpp
index 6a930c1da..d39a2207d 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
+++ b/cockatrice/src/database/model/card/card_search_model.cpp
@@ -1,10 +1,9 @@
 #include "card_search_model.h"
 
-#include "../card_database_display_model.h"
+#include "../../../utility/levenshtein.h"
 #include "../card_database_model.h"
 
 #include <algorithm>
-#include <libcockatrice/utility/levenshtein.h>
 
 CardSearchModel::CardSearchModel(CardDatabaseDisplayModel *sourceModel, QObject *parent)
     : QAbstractListModel(parent), sourceModel(sourceModel)
diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h b/cockatrice/src/database/model/card/card_search_model.h
similarity index 67%
rename from libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
rename to cockatrice/src/database/model/card/card_search_model.h
index 18be2c55a..aa9939662 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
+++ b/cockatrice/src/database/model/card/card_search_model.h
@@ -1,9 +1,3 @@
-/**
- * @file card_search_model.h
- * @ingroup CardDatabaseModels
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_SEARCH_MODEL_H
 #define CARD_SEARCH_MODEL_H
 
@@ -17,8 +11,8 @@ class CardSearchModel : public QAbstractListModel
 public:
     explicit CardSearchModel(CardDatabaseDisplayModel *sourceModel, QObject *parent = nullptr);
 
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
     void updateSearchResults(const QString &query); // Update results based on input
 
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp b/cockatrice/src/database/model/card_database_display_model.cpp
similarity index 97%
rename from libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
rename to cockatrice/src/database/model/card_database_display_model.cpp
index 5ce63a939..fc1b20cf6 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
+++ b/cockatrice/src/database/model/card_database_display_model.cpp
@@ -184,20 +184,13 @@ bool CardDatabaseDisplayModel::rowMatchesCardName(CardInfoPtr info) const
 
 void CardDatabaseDisplayModel::clearFilterAll()
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0))
-    beginFilterChange();
-#endif
     cardName.clear();
     cardText.clear();
     cardTypes.clear();
     cardColors.clear();
     if (filterTree != nullptr)
         filterTree->clear();
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
-    endFilterChange(QSortFilterProxyModel::Direction::Rows);
-#else
     invalidateFilter();
-#endif
 }
 
 void CardDatabaseDisplayModel::setFilterTree(FilterTree *_filterTree)
@@ -224,4 +217,4 @@ const QString CardDatabaseDisplayModel::sanitizeCardName(const QString &dirtyNam
         }
     }
     return QString::fromStdWString(toReturn);
-}
+}
\ No newline at end of file
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h b/cockatrice/src/database/model/card_database_display_model.h
similarity index 75%
rename from libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
rename to cockatrice/src/database/model/card_database_display_model.h
index 0c5994a3a..0515c7624 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
+++ b/cockatrice/src/database/model/card_database_display_model.h
@@ -1,16 +1,12 @@
-/**
- * @file card_database_display_model.h
- * @ingroup CardDatabaseModels
- * @brief The CardDatabaseDisplayModel is a QSortFilterProxyModel that allows applying filters and sorting to a
- * CardDatabaseModel.
- */
-
 #ifndef COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
 #define COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
 
+#include "../../filters/filter_string.h"
+
+#include <QList>
+#include <QSet>
 #include <QSortFilterProxyModel>
 #include <QTimer>
-#include <libcockatrice/filters/filter_string.h>
 
 class FilterTree;
 class CardDatabaseDisplayModel : public QSortFilterProxyModel
@@ -75,17 +71,17 @@ public:
         dirtyTimer.start(20);
     }
     void clearFilterAll();
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] bool canFetchMore(const QModelIndex &parent) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    bool canFetchMore(const QModelIndex &parent) const override;
     void fetchMore(const QModelIndex &parent) override;
 signals:
     void modelDirty();
 
 protected:
-    [[nodiscard]] bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
     static int lessThanNumerically(const QString &left, const QString &right);
-    [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
-    [[nodiscard]] bool rowMatchesCardName(CardInfoPtr info) const;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool rowMatchesCardName(CardInfoPtr info) const;
 
 private slots:
     void filterTreeChanged();
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp b/cockatrice/src/database/model/card_database_model.cpp
similarity index 98%
rename from libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
rename to cockatrice/src/database/model/card_database_model.cpp
index e33156329..02175081b 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
+++ b/cockatrice/src/database/model/card_database_model.cpp
@@ -1,7 +1,6 @@
 #include "card_database_model.h"
 
 #include <QMap>
-#include <libcockatrice/card/database/card_database.h>
 
 #define CARDDBMODEL_COLUMNS 6
 
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.h b/cockatrice/src/database/model/card_database_model.h
similarity index 59%
rename from libcockatrice_models/libcockatrice/models/database/card_database_model.h
rename to cockatrice/src/database/model/card_database_model.h
index 218cfff92..fac099f5a 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_model.h
+++ b/cockatrice/src/database/model/card_database_model.h
@@ -1,16 +1,11 @@
-/**
- * @file card_database_model.h
- * @ingroup CardDatabaseModels
- * @brief The CardDatabaseModel maps the cardList contained in the CardDatabase as a QAbstractListModel.
- */
-
 #ifndef CARDDATABASEMODEL_H
 #define CARDDATABASEMODEL_H
 
+#include "../card_database.h"
+
 #include <QAbstractListModel>
 #include <QList>
 #include <QSet>
-#include <libcockatrice/card/database/card_database.h>
 
 class CardDatabaseModel : public QAbstractListModel
 {
@@ -31,16 +26,15 @@ public:
     };
     CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromEnabledSets, QObject *parent = nullptr);
     ~CardDatabaseModel() override;
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] int columnCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-    [[nodiscard]] QVariant
-    headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-    [[nodiscard]] CardDatabase *getDatabase() const
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    CardDatabase *getDatabase() const
     {
         return db;
     }
-    [[nodiscard]] CardInfoPtr getCard(int index) const
+    CardInfoPtr getCard(int index) const
     {
         return cardList[index];
     }
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp b/cockatrice/src/database/model/token/token_display_model.cpp
similarity index 100%
rename from libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp
rename to cockatrice/src/database/model/token/token_display_model.cpp
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h b/cockatrice/src/database/model/token/token_display_model.h
similarity index 52%
rename from libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
rename to cockatrice/src/database/model/token/token_display_model.h
index f6b2fdfbb..50d351653 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
+++ b/cockatrice/src/database/model/token/token_display_model.h
@@ -1,9 +1,3 @@
-/**
- * @file token_display_model.h
- * @ingroup CardDatabaseModels
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_TOKEN_DISPLAY_MODEL_H
 #define COCKATRICE_TOKEN_DISPLAY_MODEL_H
 
@@ -14,10 +8,10 @@ class TokenDisplayModel : public CardDatabaseDisplayModel
     Q_OBJECT
 public:
     explicit TokenDisplayModel(QObject *parent = nullptr);
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
 protected:
-    [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 };
 
 #endif // COCKATRICE_TOKEN_DISPLAY_MODEL_H
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp b/cockatrice/src/database/model/token/token_edit_model.cpp
similarity index 87%
rename from libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp
rename to cockatrice/src/database/model/token/token_edit_model.cpp
index 89a1f71b1..ad6891d2e 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp
+++ b/cockatrice/src/database/model/token/token_edit_model.cpp
@@ -1,10 +1,7 @@
 #include "token_edit_model.h"
 
-#include "../card_database_display_model.h"
 #include "../card_database_model.h"
 
-#include <libcockatrice/card/card_info.h>
-
 TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent)
 {
 }
diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h b/cockatrice/src/database/model/token/token_edit_model.h
similarity index 51%
rename from libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
rename to cockatrice/src/database/model/token/token_edit_model.h
index 5e5843761..3ae2278cf 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
+++ b/cockatrice/src/database/model/token/token_edit_model.h
@@ -1,9 +1,3 @@
-/**
- * @file token_edit_model.h
- * @ingroup CardDatabaseModels
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_TOKEN_EDIT_MODEL_H
 #define COCKATRICE_TOKEN_EDIT_MODEL_H
 
@@ -14,10 +8,10 @@ class TokenEditModel : public CardDatabaseDisplayModel
     Q_OBJECT
 public:
     explicit TokenEditModel(QObject *parent = nullptr);
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
 protected:
-    [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 };
 
 #endif // COCKATRICE_TOKEN_EDIT_MODEL_H
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp b/cockatrice/src/database/parser/card_database_parser.cpp
similarity index 71%
rename from libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
rename to cockatrice/src/database/parser/card_database_parser.cpp
index f7e6bbfcf..ac1372f7f 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
+++ b/cockatrice/src/database/parser/card_database_parser.cpp
@@ -1,13 +1,7 @@
 #include "card_database_parser.h"
 
-#include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
-
 SetNameMap ICardDatabaseParser::sets;
 
-ICardDatabaseParser::ICardDatabaseParser(ICardSetPriorityController *_cardSetPriorityController)
-    : cardSetPriorityController(_cardSetPriorityController)
-{
-}
 void ICardDatabaseParser::clearSetlist()
 {
     sets.clear();
@@ -23,7 +17,7 @@ CardSetPtr ICardDatabaseParser::internalAddSet(const QString &setName,
         return sets.value(setName);
     }
 
-    CardSetPtr newSet = CardSet::newInstance(cardSetPriorityController, setName);
+    CardSetPtr newSet = CardSet::newInstance(setName);
     newSet->setLongName(longName);
     newSet->setSetType(setType);
     newSet->setReleaseDate(releaseDate);
diff --git a/cockatrice/src/database/parser/card_database_parser.h b/cockatrice/src/database/parser/card_database_parser.h
new file mode 100644
index 000000000..9b3950427
--- /dev/null
+++ b/cockatrice/src/database/parser/card_database_parser.h
@@ -0,0 +1,45 @@
+#ifndef CARDDATABASE_PARSER_H
+#define CARDDATABASE_PARSER_H
+
+#include "../../card/card_info.h"
+
+#include <QIODevice>
+#include <QString>
+
+#define COCKATRICE_XML_XSI_NAMESPACE "http://www.w3.org/2001/XMLSchema-instance"
+
+class ICardDatabaseParser : public QObject
+{
+    Q_OBJECT
+public:
+    ~ICardDatabaseParser() override = default;
+
+    virtual bool getCanParseFile(const QString &name, QIODevice &device) = 0;
+    virtual void parseFile(QIODevice &device) = 0;
+    virtual bool saveToFile(SetNameMap sets,
+                            CardNameMap cards,
+                            const QString &fileName,
+                            const QString &sourceUrl = "unknown",
+                            const QString &sourceVersion = "unknown") = 0;
+    static void clearSetlist();
+
+protected:
+    /*
+     * A cached list of the available sets, needed to cross-reference sets from cards.
+     * Shared between all parsers
+     */
+    static SetNameMap sets;
+
+    CardSetPtr internalAddSet(const QString &setName,
+                              const QString &longName = "",
+                              const QString &setType = "",
+                              const QDate &releaseDate = QDate(),
+                              const CardSet::Priority priority = CardSet::PriorityFallback);
+signals:
+    void addCard(CardInfoPtr card);
+    void addSet(CardSetPtr set);
+};
+
+Q_DECLARE_INTERFACE(ICardDatabaseParser, "ICardDatabaseParser")
+
+#endif
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp b/cockatrice/src/database/parser/cockatrice_xml_3.cpp
similarity index 93%
rename from libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
rename to cockatrice/src/database/parser/cockatrice_xml_3.cpp
index ba27d63c4..1f69079cd 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
+++ b/cockatrice/src/database/parser/cockatrice_xml_3.cpp
@@ -1,8 +1,5 @@
 #include "cockatrice_xml_3.h"
 
-#include "../../relation/card_relation.h"
-#include "../../relation/card_relation_type.h"
-
 #include <QCoreApplication>
 #include <QDebug>
 #include <QFile>
@@ -14,11 +11,6 @@
 #define COCKATRICE_XML3_SCHEMALOCATION                                                                                 \
     "https://raw.githubusercontent.com/Cockatrice/Cockatrice/master/doc/carddatabase_v3/cards.xsd"
 
-CockatriceXml3Parser::CockatriceXml3Parser(ICardSetPriorityController *_cardSetPriorityController)
-    : ICardDatabaseParser(_cardSetPriorityController)
-{
-}
-
 bool CockatriceXml3Parser::getCanParseFile(const QString &fileName, QIODevice &device)
 {
     qCInfo(CockatriceXml3Log) << "Trying to parse: " << fileName;
@@ -240,7 +232,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     _sets[setName].append(setInfo);
                     // related cards
                 } else if (xmlName == "related" || xmlName == "reverse-related") {
-                    CardRelationType attach = CardRelationType::DoesNotAttach;
+                    CardRelation::AttachType attach = CardRelation::DoesNotAttach;
                     bool exclude = false;
                     bool variable = false;
                     int count = 1;
@@ -262,7 +254,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     }
 
                     if (attrs.hasAttribute("attach")) {
-                        attach = CardRelationType::AttachTo;
+                        attach = CardRelation::AttachTo;
                     }
 
                     if (attrs.hasAttribute("exclude")) {
@@ -287,13 +279,9 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
             }
 
             properties.insert("colors", colors);
-
-            CardInfo::UiAttributes attributes = {.cipt = cipt,
-                                                 .landscapeOrientation = landscapeOrientation,
-                                                 .tableRow = tableRow,
-                                                 .upsideDownArt = upsideDown};
-            CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards,
-                                                        reverseRelatedCards, _sets, attributes);
+            CardInfoPtr newCard =
+                CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets, cipt,
+                                      landscapeOrientation, tableRow, upsideDown);
             emit addCard(newCard);
         }
     }
@@ -426,15 +414,14 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     }
 
     // positioning
-    const CardInfo::UiAttributes &attributes = info->getUiAttributes();
-    xml.writeTextElement("tablerow", QString::number(attributes.tableRow));
-    if (attributes.cipt) {
+    xml.writeTextElement("tablerow", QString::number(info->getTableRow()));
+    if (info->getCipt()) {
         xml.writeTextElement("cipt", "1");
     }
-    if (attributes.landscapeOrientation) {
+    if (info->getLandscapeOrientation()) {
         xml.writeTextElement("landscapeOrientation", "1");
     }
-    if (attributes.upsideDownArt) {
+    if (info->getUpsideDownArt()) {
         xml.writeTextElement("upsidedown", "1");
     }
 
@@ -443,15 +430,12 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     return xml;
 }
 
-bool CockatriceXml3Parser::saveToFile(FormatRulesNameMap _formats,
-                                      SetNameMap _sets,
+bool CockatriceXml3Parser::saveToFile(SetNameMap _sets,
                                       CardNameMap cards,
                                       const QString &fileName,
                                       const QString &sourceUrl,
                                       const QString &sourceVersion)
 {
-    Q_UNUSED(_formats);
-
     QFile file(fileName);
     if (!file.open(QIODevice::WriteOnly)) {
         return false;
diff --git a/cockatrice/src/database/parser/cockatrice_xml_3.h b/cockatrice/src/database/parser/cockatrice_xml_3.h
new file mode 100644
index 000000000..f8c060774
--- /dev/null
+++ b/cockatrice/src/database/parser/cockatrice_xml_3.h
@@ -0,0 +1,32 @@
+#ifndef COCKATRICE_XML3_H
+#define COCKATRICE_XML3_H
+
+#include "card_database_parser.h"
+
+#include <QLoggingCategory>
+#include <QXmlStreamReader>
+
+inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser");
+
+class CockatriceXml3Parser : public ICardDatabaseParser
+{
+    Q_OBJECT
+    Q_INTERFACES(ICardDatabaseParser)
+public:
+    CockatriceXml3Parser() = default;
+    ~CockatriceXml3Parser() override = default;
+    bool getCanParseFile(const QString &name, QIODevice &device) override;
+    void parseFile(QIODevice &device) override;
+    bool saveToFile(SetNameMap _sets,
+                    CardNameMap cards,
+                    const QString &fileName,
+                    const QString &sourceUrl = "unknown",
+                    const QString &sourceVersion = "unknown") override;
+
+private:
+    void loadCardsFromXml(QXmlStreamReader &xml);
+    void loadSetsFromXml(QXmlStreamReader &xml);
+    QString getMainCardType(QString &type);
+};
+
+#endif
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp b/cockatrice/src/database/parser/cockatrice_xml_4.cpp
similarity index 67%
rename from libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
rename to cockatrice/src/database/parser/cockatrice_xml_4.cpp
index cc0220526..a623c1253 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
+++ b/cockatrice/src/database/parser/cockatrice_xml_4.cpp
@@ -1,12 +1,11 @@
 #include "cockatrice_xml_4.h"
 
-#include "../../relation/card_relation.h"
+#include "../../settings/cache_settings.h"
 
 #include <QCoreApplication>
 #include <QDebug>
 #include <QFile>
 #include <QXmlStreamReader>
-#include <libcockatrice/card/format/format_legality_rules.h>
 #include <version_string.h>
 
 #define COCKATRICE_XML4_TAGNAME "cockatrice_carddatabase"
@@ -14,12 +13,6 @@
 #define COCKATRICE_XML4_SCHEMALOCATION                                                                                 \
     "https://raw.githubusercontent.com/Cockatrice/Cockatrice/master/doc/carddatabase_v4/cards.xsd"
 
-CockatriceXml4Parser::CockatriceXml4Parser(ICardPreferenceProvider *_cardPreferenceProvider,
-                                           ICardSetPriorityController *_cardSetPriorityController)
-    : ICardDatabaseParser(_cardSetPriorityController), cardPreferenceProvider(_cardPreferenceProvider)
-{
-}
-
 bool CockatriceXml4Parser::getCanParseFile(const QString &fileName, QIODevice &device)
 {
     qCInfo(CockatriceXml4Log) << "Trying to parse: " << fileName;
@@ -62,9 +55,7 @@ void CockatriceXml4Parser::parseFile(QIODevice &device)
                 }
 
                 auto xmlName = xml.name().toString();
-                if (xmlName == "formats") {
-                    loadFormats(xml);
-                } else if (xmlName == "sets") {
+                if (xmlName == "sets") {
                     loadSetsFromXml(xml);
                 } else if (xmlName == "cards") {
                     loadCardsFromXml(xml);
@@ -82,116 +73,6 @@ void CockatriceXml4Parser::parseFile(QIODevice &device)
     }
 }
 
-static QSharedPointer<FormatRules> parseFormat(QXmlStreamReader &xml)
-{
-    auto rulesPtr = FormatRulesPtr(new FormatRules());
-
-    if (xml.attributes().hasAttribute("formatName")) {
-        rulesPtr->formatName = xml.attributes().value("formatName").toString();
-    }
-
-    while (!xml.atEnd()) {
-        auto token = xml.readNext();
-
-        if (token == QXmlStreamReader::EndElement && xml.name().toString() == "format") {
-            break;
-        }
-
-        if (token != QXmlStreamReader::StartElement) {
-            continue;
-        }
-
-        QString xmlName = xml.name().toString();
-
-        if (xmlName == "minDeckSize") {
-            rulesPtr->minDeckSize = xml.readElementText().toInt();
-        } else if (xmlName == "maxDeckSize") {
-            QString text = xml.readElementText();
-            rulesPtr->maxDeckSize = text.toInt();
-        } else if (xmlName == "maxSideboardSize") {
-            rulesPtr->maxSideboardSize = xml.readElementText().toInt();
-        } else if (xmlName == "allowedCounts") {
-            while (!xml.atEnd()) {
-                token = xml.readNext();
-
-                if (token == QXmlStreamReader::EndElement && xml.name().toString() == "allowedCounts") {
-                    break;
-                }
-
-                if (token == QXmlStreamReader::StartElement && xml.name().toString() == "count") {
-
-                    AllowedCount c;
-
-                    QString maxAttr = xml.attributes().value("max").toString();
-                    c.max = (maxAttr == "unlimited") ? -1 : maxAttr.toInt();
-
-                    c.label = xml.readElementText().trimmed();
-
-                    rulesPtr->allowedCounts.append(c);
-                }
-            }
-        } else if (xmlName == "exceptions") {
-            while (!xml.atEnd()) {
-                token = xml.readNext();
-
-                if (token == QXmlStreamReader::EndElement && xml.name().toString() == "exceptions") {
-                    break;
-                }
-
-                if (token == QXmlStreamReader::StartElement && xml.name().toString() == "exception") {
-                    ExceptionRule ex;
-
-                    while (!xml.atEnd()) {
-                        token = xml.readNext();
-
-                        if (token == QXmlStreamReader::EndElement && xml.name().toString() == "exception") {
-                            break;
-                        }
-
-                        if (token == QXmlStreamReader::StartElement) {
-                            QString ename = xml.name().toString();
-
-                            if (ename == "maxCopies") {
-                                QString text = xml.readElementText();
-                                ex.maxCopies = (text == "unlimited") ? -1 : text.toInt();
-                            } else if (ename == "cardCondition") {
-                                CardCondition cond;
-                                cond.field = xml.attributes().value("field").toString();
-                                cond.matchType = xml.attributes().value("match").toString();
-                                cond.value = xml.attributes().value("value").toString();
-                                ex.conditions.append(cond);
-                                xml.skipCurrentElement();
-                            } else {
-                                xml.skipCurrentElement();
-                            }
-                        }
-                    }
-
-                    rulesPtr->exceptions.append(ex);
-                }
-            }
-        } else {
-            xml.skipCurrentElement();
-        }
-    }
-
-    return rulesPtr;
-}
-
-void CockatriceXml4Parser::loadFormats(QXmlStreamReader &xml)
-{
-    while (!xml.atEnd()) {
-        if (xml.readNext() == QXmlStreamReader::EndElement) {
-            break;
-        }
-
-        if (xml.name().toString() == "format") {
-            auto rulesPtr = parseFormat(xml);
-            emit addFormat(rulesPtr);
-        }
-    }
-}
-
 void CockatriceXml4Parser::loadSetsFromXml(QXmlStreamReader &xml)
 {
     while (!xml.atEnd()) {
@@ -250,7 +131,7 @@ QVariantHash CockatriceXml4Parser::loadCardPropertiesFromXml(QXmlStreamReader &x
 
 void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
 {
-    bool includeRebalancedCards = cardPreferenceProvider->getIncludeRebalancedCards();
+    bool includeRebalancedCards = SettingsCache::instance().getIncludeRebalancedCards();
     while (!xml.atEnd()) {
         if (xml.readNext() == QXmlStreamReader::EndElement) {
             break;
@@ -324,7 +205,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     }
                     // related cards
                 } else if (xmlName == "related" || xmlName == "reverse-related") {
-                    CardRelationType attachType = CardRelationType::DoesNotAttach;
+                    CardRelation::AttachType attachType = CardRelation::DoesNotAttach;
                     bool exclude = false;
                     bool variable = false;
                     bool persistent = false;
@@ -347,8 +228,8 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     }
 
                     if (attrs.hasAttribute("attach")) {
-                        attachType = attrs.value("attach").toString() == "transform" ? CardRelationType::TransformInto
-                                                                                     : CardRelationType::AttachTo;
+                        attachType = attrs.value("attach").toString() == "transform" ? CardRelation::TransformInto
+                                                                                     : CardRelation::AttachTo;
                     }
 
                     if (attrs.hasAttribute("exclude")) {
@@ -376,70 +257,14 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                 continue;
             }
 
-            CardInfo::UiAttributes attributes = {.cipt = cipt,
-                                                 .landscapeOrientation = landscapeOrientation,
-                                                 .tableRow = tableRow,
-                                                 .upsideDownArt = upsideDown};
-            CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards,
-                                                        reverseRelatedCards, _sets, attributes);
+            CardInfoPtr newCard =
+                CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets, cipt,
+                                      landscapeOrientation, tableRow, upsideDown);
             emit addCard(newCard);
         }
     }
 }
 
-static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const QSharedPointer<FormatRules> &rulesPtr)
-{
-    if (rulesPtr.isNull()) {
-        qCWarning(CockatriceXml4Log) << "&operator<< FormatRules is nullptr";
-        return xml;
-    }
-
-    const FormatRules &rules = *rulesPtr;
-
-    xml.writeStartElement("format");
-    if (!rules.formatName.isEmpty()) {
-        xml.writeAttribute("formatName", rules.formatName);
-    }
-
-    xml.writeTextElement("minDeckSize", QString::number(rules.minDeckSize));
-    xml.writeTextElement("maxDeckSize", rules.maxDeckSize >= 0 ? QString::number(rules.maxDeckSize) : "0");
-    xml.writeTextElement("maxSideboardSize", QString::number(rules.maxSideboardSize));
-    if (!rules.allowedCounts.isEmpty()) {
-        xml.writeStartElement("allowedCounts");
-
-        for (const AllowedCount &c : rules.allowedCounts) {
-            xml.writeStartElement("count");
-            xml.writeAttribute("max", c.max == -1 ? "unlimited" : QString::number(c.max));
-            xml.writeCharacters(c.label);
-            xml.writeEndElement(); // count
-        }
-
-        xml.writeEndElement(); // allowedCounts
-    }
-
-    if (!rules.exceptions.isEmpty()) {
-        xml.writeStartElement("exceptions");
-        for (const ExceptionRule &ex : rules.exceptions) {
-            xml.writeStartElement("exception");
-            xml.writeTextElement("maxCopies", ex.maxCopies == -1 ? "unlimited" : QString::number(ex.maxCopies));
-
-            for (const CardCondition &cond : ex.conditions) {
-                xml.writeStartElement("cardCondition");
-                xml.writeAttribute("field", cond.field);
-                xml.writeAttribute("match", cond.matchType);
-                xml.writeAttribute("value", cond.value);
-                xml.writeEndElement(); // cardCondition
-            }
-
-            xml.writeEndElement(); // exception
-        }
-        xml.writeEndElement(); // exceptions
-    }
-
-    xml.writeEndElement(); // format
-    return xml;
-}
-
 static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set)
 {
     if (set.isNull()) {
@@ -549,15 +374,14 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     }
 
     // positioning
-    const CardInfo::UiAttributes &attributes = info->getUiAttributes();
-    xml.writeTextElement("tablerow", QString::number(attributes.tableRow));
-    if (attributes.cipt) {
+    xml.writeTextElement("tablerow", QString::number(info->getTableRow()));
+    if (info->getCipt()) {
         xml.writeTextElement("cipt", "1");
     }
-    if (attributes.landscapeOrientation) {
+    if (info->getLandscapeOrientation()) {
         xml.writeTextElement("landscapeOrientation", "1");
     }
-    if (attributes.upsideDownArt) {
+    if (info->getUpsideDownArt()) {
         xml.writeTextElement("upsidedown", "1");
     }
 
@@ -566,8 +390,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     return xml;
 }
 
-bool CockatriceXml4Parser::saveToFile(FormatRulesNameMap _formats,
-                                      SetNameMap _sets,
+bool CockatriceXml4Parser::saveToFile(SetNameMap _sets,
                                       CardNameMap cards,
                                       const QString &fileName,
                                       const QString &sourceUrl,
@@ -594,14 +417,6 @@ bool CockatriceXml4Parser::saveToFile(FormatRulesNameMap _formats,
     xml.writeTextElement("sourceVersion", sourceVersion);
     xml.writeEndElement();
 
-    if (_formats.count() > 0) {
-        xml.writeStartElement("formats");
-        for (FormatRulesPtr format : _formats) {
-            xml << format;
-        }
-        xml.writeEndElement();
-    }
-
     if (_sets.count() > 0) {
         xml.writeStartElement("sets");
         for (CardSetPtr set : _sets) {
diff --git a/cockatrice/src/database/parser/cockatrice_xml_4.h b/cockatrice/src/database/parser/cockatrice_xml_4.h
new file mode 100644
index 000000000..9cd200441
--- /dev/null
+++ b/cockatrice/src/database/parser/cockatrice_xml_4.h
@@ -0,0 +1,32 @@
+#ifndef COCKATRICE_XML4_H
+#define COCKATRICE_XML4_H
+
+#include "card_database_parser.h"
+
+#include <QLoggingCategory>
+#include <QXmlStreamReader>
+
+inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
+
+class CockatriceXml4Parser : public ICardDatabaseParser
+{
+    Q_OBJECT
+    Q_INTERFACES(ICardDatabaseParser)
+public:
+    CockatriceXml4Parser() = default;
+    ~CockatriceXml4Parser() override = default;
+    bool getCanParseFile(const QString &name, QIODevice &device) override;
+    void parseFile(QIODevice &device) override;
+    bool saveToFile(SetNameMap _sets,
+                    CardNameMap cards,
+                    const QString &fileName,
+                    const QString &sourceUrl = "unknown",
+                    const QString &sourceVersion = "unknown") override;
+
+private:
+    QVariantHash loadCardPropertiesFromXml(QXmlStreamReader &xml);
+    void loadCardsFromXml(QXmlStreamReader &xml);
+    void loadSetsFromXml(QXmlStreamReader &xml);
+};
+
+#endif
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp b/cockatrice/src/deck/custom_line_edit.cpp
similarity index 95%
rename from cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
rename to cockatrice/src/deck/custom_line_edit.cpp
index c137b4f35..ba521c0fd 100644
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
+++ b/cockatrice/src/deck/custom_line_edit.cpp
@@ -1,7 +1,7 @@
 #include "custom_line_edit.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../../client/settings/shortcuts_settings.h"
+#include "../settings/cache_settings.h"
+#include "../settings/shortcuts_settings.h"
 
 #include <QKeyEvent>
 #include <QLineEdit>
diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.h b/cockatrice/src/deck/custom_line_edit.h
similarity index 92%
rename from cockatrice/src/interface/widgets/utility/custom_line_edit.h
rename to cockatrice/src/deck/custom_line_edit.h
index 2026c1c1c..075ec012e 100644
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.h
+++ b/cockatrice/src/deck/custom_line_edit.h
@@ -1,8 +1,3 @@
-/**
- * @file custom_line_edit.h
- * @ingroup UI
- * @brief TODO: Document this.
- */
 
 #ifndef CUSTOMLINEEDIT_H
 #define CUSTOMLINEEDIT_H
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp b/cockatrice/src/deck/deck_list_model.cpp
similarity index 54%
rename from libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
rename to cockatrice/src/deck/deck_list_model.cpp
index e43c612f0..4ff16378c 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
+++ b/cockatrice/src/deck/deck_list_model.cpp
@@ -1,46 +1,41 @@
 #include "deck_list_model.h"
 
-#include <libcockatrice/card/database/card_database_manager.h>
+#include "../database/card_database_manager.h"
+#include "../main.h"
+#include "../settings/cache_settings.h"
+#include "deck_loader.h"
+
+#include <QBrush>
+#include <QFont>
+#include <QPrinter>
+#include <QProgressDialog>
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QTextStream>
+#include <QTextTable>
 
 DeckListModel::DeckListModel(QObject *parent)
     : QAbstractItemModel(parent), lastKnownColumn(1), lastKnownOrder(Qt::AscendingOrder)
 {
-    deckList = QSharedPointer<DeckList>(new DeckList());
+    deckList = new DeckLoader;
+    deckList->setParent(this);
+    connect(deckList, &DeckLoader::deckLoaded, this, &DeckListModel::rebuildTree);
+    connect(deckList, &DeckLoader::deckHashChanged, this, &DeckListModel::deckHashChanged);
     root = new InnerDecklistNode;
 }
 
-DeckListModel::DeckListModel(QObject *parent, const QSharedPointer<DeckList> &deckList) : DeckListModel(parent)
-{
-    setDeckList(deckList);
-
-    // forward change signals
-    connect(this, &DeckListModel::cardAddedAt, this, &DeckListModel::cardsChanged);
-    connect(this, &DeckListModel::cardRemoved, this, &DeckListModel::cardsChanged);
-    connect(this, &DeckListModel::deckReplaced, this, &DeckListModel::cardsChanged);
-
-    connect(this, &DeckListModel::cardNodeAddedAt, this, &DeckListModel::cardNodesChanged);
-    connect(this, &DeckListModel::cardNodeRemoved, this, &DeckListModel::cardNodesChanged);
-    connect(this, &DeckListModel::deckReplaced, this, &DeckListModel::cardNodesChanged);
-}
-
 DeckListModel::~DeckListModel()
 {
     delete root;
 }
 
-/**
- * @brief Extract the value from the card that is used for the group criteria.
- * @param info Pointer to card information.
- * @param criteria The group criteria
- * @return String representing the value of the criteria.
- */
-static QString extractGroupCriteriaValue(const CardInfoPtr &info, DeckListModelGroupCriteria::Type criteria)
+QString DeckListModel::getGroupCriteriaForCard(CardInfoPtr info) const
 {
     if (!info) {
         return "unknown";
     }
 
-    switch (criteria) {
+    switch (activeGroupCriteria) {
         case DeckListModelGroupCriteria::MAIN_TYPE:
             return info->getMainCardType();
         case DeckListModelGroupCriteria::MANA_COST:
@@ -57,7 +52,7 @@ void DeckListModel::rebuildTree()
     beginResetModel();
     root->clearTree();
 
-    InnerDecklistNode *listRoot = deckList->getTree()->getRoot();
+    InnerDecklistNode *listRoot = deckList->getRoot();
 
     for (int i = 0; i < listRoot->size(); i++) {
         auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
@@ -72,7 +67,7 @@ void DeckListModel::rebuildTree()
             }
 
             CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
-            QString groupCriteria = extractGroupCriteriaValue(info, activeGroupCriteria);
+            QString groupCriteria = getGroupCriteriaForCard(info);
 
             auto *groupNode = dynamic_cast<InnerDecklistNode *>(node->findChild(groupCriteria));
 
@@ -85,8 +80,6 @@ void DeckListModel::rebuildTree()
     }
 
     endResetModel();
-
-    refreshCardFormatLegalities();
 }
 
 int DeckListModel::rowCount(const QModelIndex &parent) const
@@ -116,82 +109,81 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
         return {};
     }
 
-    auto *node = static_cast<AbstractDecklistNode *>(index.internalPointer());
-    auto *card = dynamic_cast<DecklistModelCardNode *>(node);
-
-    // Group node
-    if (!card) {
-        const auto *group = dynamic_cast<InnerDecklistNode *>(node);
-
+    auto *temp = static_cast<AbstractDecklistNode *>(index.internalPointer());
+    auto *card = dynamic_cast<DecklistModelCardNode *>(temp);
+    if (card == nullptr) {
+        const auto *node = dynamic_cast<InnerDecklistNode *>(temp);
         switch (role) {
+            case Qt::FontRole: {
+                QFont f;
+                f.setBold(true);
+                return f;
+            }
             case Qt::DisplayRole:
             case Qt::EditRole: {
                 switch (index.column()) {
-                    case DeckListModelColumns::CARD_AMOUNT:
-                        return group->recursiveCount(true);
-                    case DeckListModelColumns::CARD_NAME:
-                        if (role == Qt::DisplayRole) {
-                            return group->getVisibleName();
-                        }
-                        return group->getName();
-                    case DeckListModelColumns::CARD_SET:
-                        return group->getCardSetShortName();
-                    case DeckListModelColumns::CARD_COLLECTOR_NUMBER:
-                        return group->getCardCollectorNumber();
-                    case DeckListModelColumns::CARD_PROVIDER_ID:
-                        return group->getCardProviderId();
+                    case 0:
+                        return node->recursiveCount(true);
+                    case 1: {
+                        if (role == Qt::DisplayRole)
+                            return node->getVisibleName();
+                        return node->getName();
+                    }
+                    case 2: {
+                        return node->getCardSetShortName();
+                    }
+                    case 3: {
+                        return node->getCardCollectorNumber();
+                    }
+                    case 4: {
+                        return node->getCardProviderId();
+                    }
                     default:
                         return {};
                 }
             }
-            case DeckRoles::IsCardRole:
+            case Qt::UserRole + 1:
                 return false;
-
-            case DeckRoles::DepthRole:
-                return group->depth();
-
-                // legality does not apply to group nodes
-            case DeckRoles::IsLegalRole:
-                return true;
-
+            case Qt::BackgroundRole: {
+                int color = 90 + 60 * node->depth();
+                return QBrush(QColor(color, 255, color));
+            }
+            case Qt::ForegroundRole: {
+                return QBrush(QColor(0, 0, 0));
+            }
             default:
                 return {};
         }
-    }
-
-    // Card node
-    switch (role) {
-        case Qt::DisplayRole:
-        case Qt::EditRole:
-            switch (index.column()) {
-                case DeckListModelColumns::CARD_AMOUNT:
-                    return card->getNumber();
-                case DeckListModelColumns::CARD_NAME:
-                    return card->getName();
-                case DeckListModelColumns::CARD_SET:
-                    return card->getCardSetShortName();
-                case DeckListModelColumns::CARD_COLLECTOR_NUMBER:
-                    return card->getCardCollectorNumber();
-                case DeckListModelColumns::CARD_PROVIDER_ID:
-                    return card->getCardProviderId();
-                default:
-                    return {};
+    } else {
+        switch (role) {
+            case Qt::DisplayRole:
+            case Qt::EditRole: {
+                switch (index.column()) {
+                    case 0:
+                        return card->getNumber();
+                    case 1:
+                        return card->getName();
+                    case 2:
+                        return card->getCardSetShortName();
+                    case 3:
+                        return card->getCardCollectorNumber();
+                    case 4:
+                        return card->getCardProviderId();
+                    default:
+                        return {};
+                }
             }
-
-        case DeckRoles::IsCardRole: {
-            return true;
-        }
-
-        case DeckRoles::DepthRole: {
-            return card->depth();
-        }
-
-        case DeckRoles::IsLegalRole: {
-            return card->getFormatLegality();
-        }
-
-        default: {
-            return {};
+            case Qt::UserRole + 1:
+                return true;
+            case Qt::BackgroundRole: {
+                int color = 255 - (index.row() % 2) * 30;
+                return QBrush(QColor(color, color, color));
+            }
+            case Qt::ForegroundRole: {
+                return QBrush(QColor(0, 0, 0));
+            }
+            default:
+                return {};
         }
     }
 }
@@ -207,15 +199,15 @@ QVariant DeckListModel::headerData(const int section, const Qt::Orientation orie
     }
 
     switch (section) {
-        case DeckListModelColumns::CARD_AMOUNT:
+        case 0:
             return tr("Count");
-        case DeckListModelColumns::CARD_NAME:
+        case 1:
             return tr("Card");
-        case DeckListModelColumns::CARD_SET:
+        case 2:
             return tr("Set");
-        case DeckListModelColumns::CARD_COLLECTOR_NUMBER:
+        case 3:
             return tr("Number");
-        case DeckListModelColumns::CARD_PROVIDER_ID:
+        case 4:
             return tr("Provider ID");
         default:
             return {};
@@ -254,22 +246,6 @@ Qt::ItemFlags DeckListModel::flags(const QModelIndex &index) const
     return result;
 }
 
-void DeckListModel::emitBackgroundUpdates(const QModelIndex &parent)
-{
-    int rows = rowCount(parent);
-    if (rows == 0)
-        return;
-
-    QModelIndex topLeft = index(0, 0, parent);
-    QModelIndex bottomRight = index(rows - 1, columnCount() - 1, parent);
-    emit dataChanged(topLeft, bottomRight, {Qt::BackgroundRole});
-
-    for (int r = 0; r < rows; ++r) {
-        QModelIndex child = index(r, 0, parent);
-        emitBackgroundUpdates(child);
-    }
-}
-
 void DeckListModel::emitRecursiveUpdates(const QModelIndex &index)
 {
     if (!index.isValid()) {
@@ -288,20 +264,19 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, con
     }
 
     switch (index.column()) {
-        case DeckListModelColumns::CARD_AMOUNT:
+        case 0:
             node->setNumber(value.toInt());
-            refreshCardFormatLegalities();
             break;
-        case DeckListModelColumns::CARD_NAME:
+        case 1:
             node->setName(value.toString());
             break;
-        case DeckListModelColumns::CARD_SET:
+        case 2:
             node->setCardSetShortName(value.toString());
             break;
-        case DeckListModelColumns::CARD_COLLECTOR_NUMBER:
+        case 3:
             node->setCardCollectorNumber(value.toString());
             break;
-        case DeckListModelColumns::CARD_PROVIDER_ID:
+        case 4:
             node->setCardProviderId(value.toString());
             break;
         default:
@@ -310,8 +285,8 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, con
 
     emitRecursiveUpdates(index);
     deckList->refreshDeckHash();
-    emit deckHashChanged();
 
+    emit dataChanged(index, index);
     return true;
 }
 
@@ -330,7 +305,7 @@ bool DeckListModel::removeRows(int row, int count, const QModelIndex &parent)
     for (int i = 0; i < count; i++) {
         AbstractDecklistNode *toDelete = node->takeAt(row);
         if (auto *temp = dynamic_cast<DecklistModelCardNode *>(toDelete)) {
-            deckList->getTree()->deleteNode(temp->getDataNode());
+            deckList->deleteNode(temp->getDataNode());
         }
         delete toDelete;
     }
@@ -342,9 +317,6 @@ bool DeckListModel::removeRows(int row, int count, const QModelIndex &parent)
         emitRecursiveUpdates(parent);
     }
 
-    deckList->refreshDeckHash();
-    emit deckHashChanged();
-
     return true;
 }
 
@@ -374,7 +346,7 @@ DecklistModelCardNode *DeckListModel::findCardNode(const QString &cardName,
         return nullptr;
     }
 
-    QString groupCriteria = extractGroupCriteriaValue(info, activeGroupCriteria);
+    QString groupCriteria = getGroupCriteriaForCard(info);
     InnerDecklistNode *groupNode = dynamic_cast<InnerDecklistNode *>(zoneNode->findChild(groupCriteria));
     if (!groupNode) {
         return nullptr;
@@ -427,7 +399,7 @@ QModelIndex DeckListModel::addCard(const ExactCard &card, const QString &zoneNam
     CardInfoPtr cardInfo = card.getCardPtr();
     PrintingInfo printingInfo = card.getPrinting();
 
-    QString groupCriteria = extractGroupCriteriaValue(cardInfo, activeGroupCriteria);
+    QString groupCriteria = getGroupCriteriaForCard(cardInfo);
     InnerDecklistNode *groupNode = createNodeIfNeeded(groupCriteria, zoneNode);
 
     const QModelIndex parentIndex = nodeToIndex(groupNode);
@@ -435,7 +407,6 @@ QModelIndex DeckListModel::addCard(const ExactCard &card, const QString &zoneNam
         card.getName(), printingInfo.getUuid(), printingInfo.getProperty("num")));
     const auto cardSetName = printingInfo.getSet().isNull() ? "" : printingInfo.getSet()->getCorrectedShortName();
 
-    bool cardNodeAdded = false;
     if (!cardNode) {
         // Determine the correct index
         int insertRow = findSortedInsertRow(groupNode, cardInfo);
@@ -446,92 +417,19 @@ QModelIndex DeckListModel::addCard(const ExactCard &card, const QString &zoneNam
         beginInsertRows(parentIndex, insertRow, insertRow);
         cardNode = new DecklistModelCardNode(decklistCard, groupNode, insertRow);
         endInsertRows();
-
-        cardNodeAdded = true;
     } else {
         cardNode->setNumber(cardNode->getNumber() + 1);
         cardNode->setCardSetShortName(cardSetName);
         cardNode->setCardCollectorNumber(printingInfo.getProperty("num"));
         cardNode->setCardProviderId(printingInfo.getProperty("uuid"));
-        // Emit dataChanged for the amount column since we modified it
-        QModelIndex cardIndex = nodeToIndex(cardNode);
-        QModelIndex amountIndex = cardIndex.sibling(cardIndex.row(), DeckListModelColumns::CARD_AMOUNT);
-        emit dataChanged(amountIndex, amountIndex, {Qt::EditRole});
+        deckList->refreshDeckHash();
     }
     sort(lastKnownColumn, lastKnownOrder);
-    refreshCardFormatLegalities();
     emitRecursiveUpdates(parentIndex);
-
-    deckList->refreshDeckHash();
-    emit deckHashChanged();
-
-    auto index = nodeToIndex(cardNode);
-
-    if (cardNodeAdded) {
-        emit cardNodeAddedAt(index);
-    }
-
-    emit cardAddedAt(index);
-
-    return index;
+    return nodeToIndex(cardNode);
 }
 
-bool DeckListModel::offsetCountAtIndex(const QModelIndex &idx, int offset)
-{
-    if (!idx.isValid()) {
-        return false;
-    }
-
-    auto *node = static_cast<AbstractDecklistNode *>(idx.internalPointer());
-    auto *card = dynamic_cast<DecklistModelCardNode *>(node);
-
-    if (!card) {
-        return false;
-    }
-
-    const QModelIndex numberIndex = idx.siblingAtColumn(DeckListModelColumns::CARD_AMOUNT);
-    const int count = numberIndex.data(Qt::EditRole).toInt();
-    const int newCount = count + offset;
-
-    if (newCount <= 0) {
-        removeRow(idx.row(), idx.parent());
-        emit cardNodeRemoved();
-    } else {
-        setData(numberIndex, newCount, Qt::EditRole);
-    }
-
-    if (offset > 0) {
-        emit cardAddedAt(idx);
-    } else if (offset < 0) {
-        emit cardRemoved();
-    }
-
-    return true;
-}
-
-bool DeckListModel::removeCardAtIndex(const QModelIndex &idx)
-{
-    if (!idx.isValid()) {
-        return false;
-    }
-
-    auto *node = static_cast<AbstractDecklistNode *>(idx.internalPointer());
-    auto *card = dynamic_cast<DecklistModelCardNode *>(node);
-
-    if (!card) {
-        return false;
-    }
-
-    bool success = removeRow(idx.row(), idx.parent());
-
-    if (success) {
-        emit cardRemoved();
-    }
-
-    return success;
-}
-
-int DeckListModel::findSortedInsertRow(const InnerDecklistNode *parent, const CardInfoPtr &cardInfo) const
+int DeckListModel::findSortedInsertRow(InnerDecklistNode *parent, CardInfoPtr cardInfo) const
 {
     if (!cardInfo) {
         return parent->size(); // fallback: append at end
@@ -624,153 +522,206 @@ void DeckListModel::sort(int column, Qt::SortOrder order)
     emit layoutChanged();
 }
 
-void DeckListModel::setActiveGroupCriteria(DeckListModelGroupCriteria::Type newCriteria)
+void DeckListModel::setActiveGroupCriteria(DeckListModelGroupCriteria newCriteria)
 {
     activeGroupCriteria = newCriteria;
     rebuildTree();
 }
 
-void DeckListModel::setActiveFormat(const QString &_format)
-{
-    deckList->setGameFormat(_format);
-    refreshCardFormatLegalities();
-    emitBackgroundUpdates(QModelIndex()); // start from root
-}
-
 void DeckListModel::cleanList()
 {
-    setDeckList(QSharedPointer<DeckList>(new DeckList()));
+    setDeckList(new DeckLoader);
 }
 
 /**
- * @param _deck The deck.
+ * @param _deck The deck. Takes ownership of the object
  */
-void DeckListModel::setDeckList(const QSharedPointer<DeckList> &_deck)
+void DeckListModel::setDeckList(DeckLoader *_deck)
 {
-    if (deckList != _deck) {
-        deckList = _deck;
-    }
+    deckList->deleteLater();
+    deckList = _deck;
+    deckList->setParent(this);
+    connect(deckList, &DeckLoader::deckLoaded, this, &DeckListModel::rebuildTree);
+    connect(deckList, &DeckLoader::deckHashChanged, this, &DeckListModel::deckHashChanged);
     rebuildTree();
-    emit deckReplaced();
 }
 
-void DeckListModel::forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func)
+QList<ExactCard> DeckListModel::getCards() const
 {
-    deckList->forEachCard(func);
+    QList<ExactCard> cards;
+    DeckList *decklist = getDeckList();
+    if (!decklist) {
+        return cards;
+    }
+    InnerDecklistNode *listRoot = decklist->getRoot();
+    if (!listRoot)
+        return cards;
+
+    for (int i = 0; i < listRoot->size(); i++) {
+        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+        if (!currentZone)
+            continue;
+        for (int j = 0; j < currentZone->size(); j++) {
+            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+            if (!currentCard)
+                continue;
+            for (int k = 0; k < currentCard->getNumber(); ++k) {
+                ExactCard card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
+                if (card) {
+                    cards.append(card);
+                } else {
+                    qDebug() << "Card not found in database!";
+                }
+            }
+        }
+    }
+    return cards;
 }
 
-QList<const DecklistCardNode *> DeckListModel::getCardNodes() const
+QList<ExactCard> DeckListModel::getCardsForZone(const QString &zoneName) const
 {
-    return deckList->getCardNodes();
+    QList<ExactCard> cards;
+    DeckList *decklist = getDeckList();
+    if (!decklist) {
+        return cards;
+    }
+    InnerDecklistNode *listRoot = decklist->getRoot();
+    if (!listRoot)
+        return cards;
+
+    for (int i = 0; i < listRoot->size(); i++) {
+        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+        if (!currentZone)
+            continue;
+        if (currentZone->getName() == zoneName) {
+            for (int j = 0; j < currentZone->size(); j++) {
+                DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+                if (!currentCard)
+                    continue;
+                for (int k = 0; k < currentCard->getNumber(); ++k) {
+                    ExactCard card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
+                    if (card) {
+                        cards.append(card);
+                    } else {
+                        qDebug() << "Card not found in database!";
+                    }
+                }
+            }
+        }
+    }
+    return cards;
 }
 
-QList<const DecklistCardNode *> DeckListModel::getCardNodesForZone(const QString &zoneName) const
+QList<QString> *DeckListModel::getZones() const
 {
-    return deckList->getCardNodes({zoneName});
-}
-
-QList<QString> DeckListModel::getCardNames() const
-{
-    auto nodes = deckList->getCardNodes();
-
-    QList<QString> names;
-    std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(names), [](auto node) { return node->getName(); });
-
-    return names;
-}
-
-QList<CardRef> DeckListModel::getCardRefs() const
-{
-    auto nodes = deckList->getCardNodes();
-
-    QList<CardRef> cardRefs;
-    std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(cardRefs),
-                   [](auto node) { return node->toCardRef(); });
-
-    return cardRefs;
-}
-
-QList<QString> DeckListModel::getZones() const
-{
-    auto zoneNodes = deckList->getZoneNodes();
-
-    QList<QString> zones;
-    std::transform(zoneNodes.cbegin(), zoneNodes.cend(), std::back_inserter(zones),
-                   [](auto zoneNode) { return zoneNode->getName(); });
+    QList<QString> *zones = new QList<QString>();
+    DeckList *decklist = getDeckList();
+    if (!decklist) {
+        return zones;
+    }
+    InnerDecklistNode *listRoot = decklist->getRoot();
+    if (!listRoot)
+        return zones;
 
+    for (int i = 0; i < listRoot->size(); i++) {
+        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+        if (!currentZone)
+            continue;
+        zones->append(currentZone->getName());
+    }
     return zones;
 }
 
-static int maxAllowedForLegality(const FormatRules &format, const QString &legality)
+void DeckListModel::printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node)
 {
-    for (const AllowedCount &c : format.allowedCounts) {
-        if (c.label == legality) {
-            return c.max;
+    const int totalColumns = 2;
+
+    if (node->height() == 1) {
+        QTextBlockFormat blockFormat;
+        QTextCharFormat charFormat;
+        charFormat.setFontPointSize(11);
+        charFormat.setFontWeight(QFont::Bold);
+        cursor->insertBlock(blockFormat, charFormat);
+
+        QTextTableFormat tableFormat;
+        tableFormat.setCellPadding(0);
+        tableFormat.setCellSpacing(0);
+        tableFormat.setBorder(0);
+        QTextTable *table = cursor->insertTable(node->size() + 1, totalColumns, tableFormat);
+        for (int i = 0; i < node->size(); i++) {
+            auto *card = dynamic_cast<AbstractDecklistCardNode *>(node->at(i));
+
+            QTextCharFormat cellCharFormat;
+            cellCharFormat.setFontPointSize(9);
+
+            QTextTableCell cell = table->cellAt(i, 0);
+            cell.setFormat(cellCharFormat);
+            QTextCursor cellCursor = cell.firstCursorPosition();
+            cellCursor.insertText(QString("%1 ").arg(card->getNumber()));
+
+            cell = table->cellAt(i, 1);
+            cell.setFormat(cellCharFormat);
+            cellCursor = cell.firstCursorPosition();
+            cellCursor.insertText(card->getName());
+        }
+    } else if (node->height() == 2) {
+        QTextBlockFormat blockFormat;
+        QTextCharFormat charFormat;
+        charFormat.setFontPointSize(14);
+        charFormat.setFontWeight(QFont::Bold);
+
+        cursor->insertBlock(blockFormat, charFormat);
+
+        QTextTableFormat tableFormat;
+        tableFormat.setCellPadding(10);
+        tableFormat.setCellSpacing(0);
+        tableFormat.setBorder(0);
+        QVector<QTextLength> constraints;
+        for (int i = 0; i < totalColumns; i++) {
+            constraints << QTextLength(QTextLength::PercentageLength, 100.0 / totalColumns);
+        }
+        tableFormat.setColumnWidthConstraints(constraints);
+
+        QTextTable *table = cursor->insertTable(1, totalColumns, tableFormat);
+        for (int i = 0; i < node->size(); i++) {
+            QTextCursor cellCursor = table->cellAt(0, (i * totalColumns) / node->size()).lastCursorPosition();
+            printDeckListNode(&cellCursor, dynamic_cast<InnerDecklistNode *>(node->at(i)));
         }
     }
-    return -1; // unknown legality → treat as illegal
+
+    cursor->movePosition(QTextCursor::End);
 }
 
-static bool isCardQuantityLegalForFormat(const QString &format, const CardInfo &cardInfo, int quantity)
+void DeckListModel::printDeckList(QPrinter *printer)
 {
-    if (format.isEmpty()) {
-        return true;
+    QTextDocument doc;
+
+    QFont font("Serif");
+    font.setStyleHint(QFont::Serif);
+    doc.setDefaultFont(font);
+
+    QTextCursor cursor(&doc);
+
+    QTextBlockFormat headerBlockFormat;
+    QTextCharFormat headerCharFormat;
+    headerCharFormat.setFontPointSize(16);
+    headerCharFormat.setFontWeight(QFont::Bold);
+
+    cursor.insertBlock(headerBlockFormat, headerCharFormat);
+    cursor.insertText(deckList->getName());
+
+    headerCharFormat.setFontPointSize(12);
+    cursor.insertBlock(headerBlockFormat, headerCharFormat);
+    cursor.insertText(deckList->getComments());
+    cursor.insertBlock(headerBlockFormat, headerCharFormat);
+
+    for (int i = 0; i < root->size(); i++) {
+        cursor.insertHtml("<br><img src=theme:hr.jpg>");
+        // cursor.insertHtml("<hr>");
+        cursor.insertBlock(headerBlockFormat, headerCharFormat);
+
+        printDeckListNode(&cursor, dynamic_cast<InnerDecklistNode *>(root->at(i)));
     }
 
-    auto formatRules = CardDatabaseManager::query()->getFormat(format);
-
-    // if format has no custom rules, then just do the default check
-    if (!formatRules) {
-        return cardInfo.isLegalInFormat(format);
-    }
-
-    // Exceptions always win
-    if (cardHasAnyException(cardInfo, *formatRules)) {
-        return true;
-    }
-
-    // check legality prop
-    const QString legality = cardInfo.getLegalityProp(format);
-    if (legality.isEmpty()) {
-        return false;
-    }
-
-    int maxAllowed = maxAllowedForLegality(*formatRules, legality);
-
-    if (maxAllowed == -1) {
-        return false;
-    }
-
-    if (maxAllowed < 0) { // unlimited
-        return true;
-    }
-
-    return quantity <= maxAllowed;
-}
-
-static bool isCardNodeLegalForFormat(const QString &format, const InnerDecklistNode *zone, const DecklistCardNode *card)
-{
-    // Don't check legality for tokens
-    if (zone->getName() == DECK_ZONE_TOKENS) {
-        return true;
-    }
-
-    // unknown cards are not legal
-    ExactCard exactCard = CardDatabaseManager::query()->getCard(card->toCardRef());
-    if (!exactCard) {
-        return false;
-    }
-
-    // actual check
-    return isCardQuantityLegalForFormat(format, exactCard.getInfo(), card->getNumber());
-}
-
-void DeckListModel::refreshCardFormatLegalities()
-{
-    QString format = deckList->getGameFormat();
-
-    deckList->forEachCard([&format](const InnerDecklistNode *zone, DecklistCardNode *card) {
-        bool legal = isCardNodeLegalForFormat(format, zone, card);
-        card->setFormatLegality(legal);
-    });
+    doc.print(printer);
 }
diff --git a/cockatrice/src/deck/deck_list_model.h b/cockatrice/src/deck/deck_list_model.h
new file mode 100644
index 000000000..de9790c61
--- /dev/null
+++ b/cockatrice/src/deck/deck_list_model.h
@@ -0,0 +1,264 @@
+#ifndef DECKLISTMODEL_H
+#define DECKLISTMODEL_H
+
+#include "../card/exact_card.h"
+#include "abstract_deck_list_card_node.h"
+#include "deck_list.h"
+#include "deck_list_card_node.h"
+
+#include <QAbstractItemModel>
+#include <QList>
+
+class DeckLoader;
+class CardDatabase;
+class QPrinter;
+class QTextCursor;
+
+/**
+ * @brief Specifies the criteria used to group cards in the DeckListModel.
+ */
+enum DeckListModelGroupCriteria
+{
+    MAIN_TYPE, /**< Group cards by their main type (e.g., creature, instant). */
+    MANA_COST, /**< Group cards by their mana cost. */
+    COLOR      /**< Group cards by their color identity. */
+};
+
+/**
+ * @brief Adapter node that wraps a DecklistCardNode for use in the DeckListModel tree.
+ *
+ * This class forwards all property accessors (name, number, provider ID, set info, etc.)
+ * to the underlying DecklistCardNode. It exists so the model can represent cards
+ * in the same hierarchy as InnerDecklistNode containers.
+ */
+class DecklistModelCardNode : public AbstractDecklistCardNode
+{
+private:
+    DecklistCardNode *dataNode; /**< Pointer to the underlying data node. */
+
+public:
+    /**
+     * @brief Constructs a model node wrapping a DecklistCardNode.
+     * @param _dataNode The underlying DecklistCardNode to wrap.
+     * @param _parent The parent InnerDecklistNode in the model tree.
+     * @param position Optional position to insert in parent (-1 appends at end).
+     */
+    DecklistModelCardNode(DecklistCardNode *_dataNode, InnerDecklistNode *_parent, int position = -1)
+        : AbstractDecklistCardNode(_parent, position), dataNode(_dataNode)
+    {
+    }
+    int getNumber() const override
+    {
+        return dataNode->getNumber();
+    }
+    void setNumber(int _number) override
+    {
+        dataNode->setNumber(_number);
+    }
+    QString getName() const override
+    {
+        return dataNode->getName();
+    }
+    void setName(const QString &_name) override
+    {
+        dataNode->setName(_name);
+    }
+    QString getCardProviderId() const override
+    {
+        return dataNode->getCardProviderId();
+    }
+    void setCardProviderId(const QString &_cardProviderId) override
+    {
+        dataNode->setCardProviderId(_cardProviderId);
+    }
+    QString getCardSetShortName() const override
+    {
+        return dataNode->getCardSetShortName();
+    }
+    void setCardSetShortName(const QString &_cardSetShortName) override
+    {
+        dataNode->setCardSetShortName(_cardSetShortName);
+    }
+    QString getCardCollectorNumber() const override
+    {
+        return dataNode->getCardCollectorNumber();
+    }
+    void setCardCollectorNumber(const QString &_cardSetNumber) override
+    {
+        dataNode->setCardCollectorNumber(_cardSetNumber);
+    }
+
+    /**
+     * @brief Returns the underlying data node.
+     * @return Pointer to the DecklistCardNode wrapped by this node.
+     */
+    DecklistCardNode *getDataNode() const
+    {
+        return dataNode;
+    }
+    [[nodiscard]] bool isDeckHeader() const override
+    {
+        return false;
+    }
+};
+
+/**
+ * @brief Qt model representing a decklist for use in views (tree/table).
+ *
+ * DeckListModel is a QAbstractItemModel that exposes the structure of a deck
+ * (zones and cards) to Qt views. It organizes cards hierarchically under
+ * InnerDecklistNode containers and supports grouping, sorting, adding/removing
+ * cards, and printing decklists.
+ *
+ * Signals:
+ * - deckHashChanged(): emitted when the deck contents change in a way that
+ *   affects its hash.
+ *
+ * Slots:
+ * - rebuildTree(): rebuilds the model structure from the underlying DeckLoader.
+ * - printDeckList(): renders the decklist to a QPrinter.
+ */
+class DeckListModel : public QAbstractItemModel
+{
+    Q_OBJECT
+private slots:
+    /**
+     * @brief Rebuilds the model tree from the underlying DeckLoader.
+     *
+     * This updates all indices and ensures the model reflects the current
+     * state of the deck.
+     */
+    void rebuildTree();
+
+public slots:
+    /**
+     * @brief Prints the decklist to the provided QPrinter.
+     * @param printer The printer to render the decklist to.
+     */
+    void printDeckList(QPrinter *printer);
+
+signals:
+    /**
+     * @brief Emitted whenever the deck hash changes due to modifications in the model.
+     */
+    void deckHashChanged();
+
+public:
+    explicit DeckListModel(QObject *parent = nullptr);
+    ~DeckListModel() override;
+
+    /**
+     * @brief Returns the root index of the model.
+     * @return QModelIndex representing the root node.
+     */
+    QModelIndex getRoot() const
+    {
+        return nodeToIndex(root);
+    };
+
+    /**
+     * @brief Returns the value of the grouping category for a card based on the current criteria.
+     * @param info Pointer to card information.
+     * @return String representing the value of the current grouping criteria for the card.
+     */
+    QString getGroupCriteriaForCard(CardInfoPtr info) const;
+
+    // Qt model overrides
+    int rowCount(const QModelIndex &parent) const override;
+    int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent) const override;
+    QModelIndex parent(const QModelIndex &index) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    bool removeRows(int row, int count, const QModelIndex &parent) override;
+
+    /**
+     * @brief Finds a card by name, zone, and optional identifiers.
+     * @param cardName The card's name.
+     * @param zoneName The zone to search in (main/side/etc.).
+     * @param providerId Optional provider-specific ID.
+     * @param cardNumber Optional collector number.
+     * @return QModelIndex of the card, or invalid index if not found.
+     */
+    QModelIndex findCard(const QString &cardName,
+                         const QString &zoneName,
+                         const QString &providerId = "",
+                         const QString &cardNumber = "") const;
+
+    /**
+     * @brief Adds a card using the preferred printing if available.
+     *
+     * @param cardName Name of the card to add.
+     * @param zoneName Zone to insert the card into.
+     * @param abAddAnyway Whether to add the card even if resolution fails.
+     * @return QModelIndex pointing to the newly inserted card node.
+     */
+    QModelIndex addPreferredPrintingCard(const QString &cardName, const QString &zoneName, bool abAddAnyway);
+
+    /**
+     * @brief Adds an ExactCard to the specified zone.
+     * @param card The card to add.
+     * @param zoneName The zone to insert the card into.
+     * @return QModelIndex pointing to the newly inserted card node.
+     */
+    QModelIndex addCard(const ExactCard &card, const QString &zoneName);
+
+    /**
+     * @brief Determines the sorted insertion row for a card.
+     * @param parent The parent node where the card will be inserted.
+     * @param cardInfo The card info to insert.
+     * @return Row index where the card should be inserted to maintain sort order.
+     */
+    int findSortedInsertRow(InnerDecklistNode *parent, CardInfoPtr cardInfo) const;
+
+    void sort(int column, Qt::SortOrder order) override;
+
+    /**
+     * @brief Removes all cards and resets the model.
+     */
+    void cleanList();
+    DeckLoader *getDeckList() const
+    {
+        return deckList;
+    }
+    void setDeckList(DeckLoader *_deck);
+
+    QList<ExactCard> getCards() const;
+    QList<ExactCard> getCardsForZone(const QString &zoneName) const;
+    QList<QString> *getZones() const;
+
+    /**
+     * @brief Sets the criteria used to group cards in the model.
+     * @param newCriteria The new grouping criteria.
+     */
+    void setActiveGroupCriteria(DeckListModelGroupCriteria newCriteria);
+
+private:
+    DeckLoader *deckList;    /**< Pointer to the deck loader providing the underlying data. */
+    InnerDecklistNode *root; /**< Root node of the model tree. */
+    DeckListModelGroupCriteria activeGroupCriteria = DeckListModelGroupCriteria::MAIN_TYPE;
+    int lastKnownColumn;          /**< Last column used for sorting. */
+    Qt::SortOrder lastKnownOrder; /**< Last known sort order. */
+
+    InnerDecklistNode *createNodeIfNeeded(const QString &name, InnerDecklistNode *parent);
+    QModelIndex nodeToIndex(AbstractDecklistNode *node) const;
+    DecklistModelCardNode *findCardNode(const QString &cardName,
+                                        const QString &zoneName,
+                                        const QString &providerId = "",
+                                        const QString &cardNumber = "") const;
+    void emitRecursiveUpdates(const QModelIndex &index);
+    void sortHelper(InnerDecklistNode *node, Qt::SortOrder order);
+
+    void printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node);
+
+    template <typename T> T getNode(const QModelIndex &index) const
+    {
+        if (!index.isValid())
+            return dynamic_cast<T>(root);
+        return dynamic_cast<T>(static_cast<AbstractDecklistNode *>(index.internalPointer()));
+    }
+};
+
+#endif
diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp
new file mode 100644
index 000000000..8e98422a6
--- /dev/null
+++ b/cockatrice/src/deck/deck_loader.cpp
@@ -0,0 +1,607 @@
+#include "deck_loader.h"
+
+#include "../database/card_database.h"
+#include "../database/card_database_manager.h"
+#include "../main.h"
+#include "deck_list.h"
+#include "deck_list_card_node.h"
+
+#include <QApplication>
+#include <QClipboard>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QFutureWatcher>
+#include <QRegularExpression>
+#include <QStringList>
+#include <QtConcurrentRun>
+
+const QStringList DeckLoader::ACCEPTED_FILE_EXTENSIONS = {"*.cod", "*.dec", "*.dek", "*.txt", "*.mwDeck"};
+
+const QStringList DeckLoader::FILE_NAME_FILTERS = {
+    tr("Common deck formats (%1)").arg(ACCEPTED_FILE_EXTENSIONS.join(" ")), tr("All files (*.*)")};
+
+DeckLoader::DeckLoader() : DeckList(), lastFileName(QString()), lastFileFormat(CockatriceFormat), lastRemoteDeckId(-1)
+{
+}
+
+DeckLoader::DeckLoader(const QString &nativeString)
+    : DeckList(nativeString), lastFileName(QString()), lastFileFormat(CockatriceFormat), lastRemoteDeckId(-1)
+{
+}
+
+DeckLoader::DeckLoader(const DeckList &other)
+    : DeckList(other), lastFileName(QString()), lastFileFormat(CockatriceFormat), lastRemoteDeckId(-1)
+{
+}
+
+DeckLoader::DeckLoader(const DeckLoader &other)
+    : DeckList(other), lastFileName(other.lastFileName), lastFileFormat(other.lastFileFormat),
+      lastRemoteDeckId(other.lastRemoteDeckId)
+{
+}
+
+bool DeckLoader::loadFromFile(const QString &fileName, FileFormat fmt, bool userRequest)
+{
+    QFile file(fileName);
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        return false;
+    }
+
+    bool result = false;
+    switch (fmt) {
+        case PlainTextFormat:
+            result = loadFromFile_Plain(&file);
+            break;
+        case CockatriceFormat: {
+            result = loadFromFile_Native(&file);
+            qCInfo(DeckLoaderLog) << "Loaded from" << fileName << "-" << result;
+            if (!result) {
+                qCInfo(DeckLoaderLog) << "Retrying as plain format";
+                file.seek(0);
+                result = loadFromFile_Plain(&file);
+                fmt = PlainTextFormat;
+            }
+            break;
+        }
+
+        default:
+            break;
+    }
+
+    if (result) {
+        lastFileName = fileName;
+        lastFileFormat = fmt;
+        if (userRequest) {
+            updateLastLoadedTimestamp(fileName, fmt);
+        }
+
+        emit deckLoaded();
+    }
+
+    qCInfo(DeckLoaderLog) << "Deck was loaded -" << result;
+    return result;
+}
+
+bool DeckLoader::loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest)
+{
+    auto *watcher = new QFutureWatcher<bool>(this);
+
+    connect(watcher, &QFutureWatcher<bool>::finished, this, [this, watcher, fileName, fmt, userRequest]() {
+        const bool result = watcher->result();
+        watcher->deleteLater();
+
+        if (result) {
+            lastFileName = fileName;
+            lastFileFormat = fmt;
+            if (userRequest) {
+                updateLastLoadedTimestamp(fileName, fmt);
+            }
+            emit deckLoaded();
+        }
+
+        emit loadFinished(result);
+    });
+
+    QFuture<bool> future = QtConcurrent::run([=, this]() {
+        QFile file(fileName);
+        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            return false;
+        }
+
+        switch (fmt) {
+            case PlainTextFormat:
+                return loadFromFile_Plain(&file);
+            case CockatriceFormat: {
+                bool result = false;
+                result = loadFromFile_Native(&file);
+                if (!result) {
+                    file.seek(0);
+                    return loadFromFile_Plain(&file);
+                }
+                return result;
+            }
+            default:
+                return false;
+                break;
+        }
+    });
+
+    watcher->setFuture(future);
+    return true; // Return immediately to indicate the async task was started
+}
+
+bool DeckLoader::loadFromRemote(const QString &nativeString, int remoteDeckId)
+{
+    bool result = loadFromString_Native(nativeString);
+    if (result) {
+        lastFileName = QString();
+        lastFileFormat = CockatriceFormat;
+        lastRemoteDeckId = remoteDeckId;
+
+        emit deckLoaded();
+    }
+    return result;
+}
+
+bool DeckLoader::saveToFile(const QString &fileName, FileFormat fmt)
+{
+    QFile file(fileName);
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        return false;
+    }
+
+    bool result = false;
+    switch (fmt) {
+        case PlainTextFormat:
+            result = saveToFile_Plain(&file);
+            break;
+        case CockatriceFormat:
+            result = saveToFile_Native(&file);
+            break;
+    }
+
+    if (result) {
+        lastFileName = fileName;
+        lastFileFormat = fmt;
+    }
+
+    file.flush();
+    file.close();
+
+    return result;
+}
+
+bool DeckLoader::updateLastLoadedTimestamp(const QString &fileName, FileFormat fmt)
+{
+    QFileInfo fileInfo(fileName);
+    if (!fileInfo.exists()) {
+        qCWarning(DeckLoaderLog) << "File does not exist:" << fileName;
+        return false;
+    }
+
+    QDateTime originalTimestamp = fileInfo.lastModified();
+
+    // 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
+    switch (fmt) {
+        case PlainTextFormat:
+            result = saveToFile_Plain(&file);
+            break;
+        case CockatriceFormat:
+            setLastLoadedTimestamp(QDateTime::currentDateTime().toString());
+            result = saveToFile_Native(&file);
+            break;
+    }
+
+    file.close(); // Close the file to ensure changes are flushed
+
+    if (result) {
+        lastFileName = fileName;
+        lastFileFormat = fmt;
+
+        // Re-open the file and set the original timestamp
+        if (!file.open(QIODevice::ReadWrite)) {
+            qCWarning(DeckLoaderLog) << "Failed to re-open file to set timestamp:" << fileName;
+            return false;
+        }
+
+        if (!file.setFileTime(originalTimestamp, QFileDevice::FileModificationTime)) {
+            qCWarning(DeckLoaderLog) << "Failed to set modification time for file:" << fileName;
+            file.close();
+            return false;
+        }
+
+        file.close();
+    }
+
+    return result;
+}
+
+static QString getDomainForWebsite(DeckLoader::DecklistWebsite website)
+{
+    switch (website) {
+        case DeckLoader::DecklistOrg:
+            return "www.decklist.org";
+        case DeckLoader::DecklistXyz:
+            return "www.decklist.xyz";
+        default:
+            qCWarning(DeckLoaderLog) << "Invalid decklist website enum:" << website;
+            return "";
+    }
+}
+
+/**
+ * Converts the card to the String that represents it in the decklist export
+ */
+static QString toDecklistExportString(const DecklistCardNode *card)
+{
+    QString cardString;
+    // Get the number of cards and add the card name
+    cardString += QString::number(card->getNumber());
+    // Add a space between card num and name
+    cardString += "%20";
+    // Add card name
+    cardString += card->getName();
+
+    if (!card->getCardSetShortName().isNull()) {
+        cardString += "%20";
+        cardString += "(" + card->getCardSetShortName() + ")";
+    }
+    if (!card->getCardCollectorNumber().isNull()) {
+        cardString += "%20";
+        cardString += card->getCardCollectorNumber();
+    }
+
+    // Add a return at the end of the card
+    cardString += "%0A";
+
+    return cardString;
+}
+
+/**
+ * Export deck to decklist function, called to format the deck in a way to be sent to a server
+ * @param website The website we're sending the deck to
+ */
+QString DeckLoader::exportDeckToDecklist(DecklistWebsite website)
+{
+    // Add the base url
+    QString deckString = "https://" + getDomainForWebsite(website) + "/?";
+    // Create two strings to pass to function
+    QString mainBoardCards, sideBoardCards;
+
+    // Set up the function to call
+    auto formatDeckListForExport = [&mainBoardCards, &sideBoardCards](const auto *node, const auto *card) {
+        // Get the card name
+        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
+        if (!dbCard || dbCard->getIsToken()) {
+            // If it's a token, we don't care about the card.
+            return;
+        }
+
+        // Check if it's a sideboard card.
+        if (node->getName() == DECK_ZONE_SIDE) {
+            sideBoardCards += toDecklistExportString(card);
+        } else {
+            // If it's a mainboard card, do the same thing, but for the mainboard card string
+            mainBoardCards += toDecklistExportString(card);
+        }
+    };
+
+    // call our struct function for each card in the deck
+    forEachCard(formatDeckListForExport);
+    // Remove the extra return at the end of the last cards
+    mainBoardCards.chop(3);
+    sideBoardCards.chop(3);
+    // if after we've called it for each card, and the strings are empty, we know that
+    // there were no non-token cards in the deck, so show an error message.
+    if ((QString::compare(mainBoardCards, "", Qt::CaseInsensitive) == 0) &&
+        (QString::compare(sideBoardCards, "", Qt::CaseInsensitive) == 0)) {
+        return "";
+    }
+    // return a string with the url for decklist export
+    deckString += "deckmain=" + mainBoardCards + "&deckside=" + sideBoardCards;
+    return deckString;
+}
+
+// This struct is here to support the forEachCard function call, defined in decklist.
+// It requires a function to be called for each card, and it will set the providerId to the preferred printing.
+struct SetProviderIdToPreferred
+{
+    // Main operator for struct, allowing the foreachcard to work.
+    SetProviderIdToPreferred()
+    {
+    }
+
+    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
+    {
+        Q_UNUSED(node);
+        PrintingInfo preferredPrinting = CardDatabaseManager::query()->getPreferredPrinting(card->getName());
+        QString providerId = preferredPrinting.getUuid();
+        QString setShortName = preferredPrinting.getSet()->getShortName();
+        QString collectorNumber = preferredPrinting.getProperty("num");
+
+        card->setCardProviderId(providerId);
+        card->setCardCollectorNumber(collectorNumber);
+        card->setCardSetShortName(setShortName);
+    }
+};
+
+/**
+ * This function iterates through each card in the decklist and sets the providerId
+ * on each card based on its set name and collector number.
+ */
+void DeckLoader::setProviderIdToPreferredPrinting()
+{
+    // Set up the struct to call.
+    SetProviderIdToPreferred setProviderIdToPreferred;
+
+    // Call the forEachCard method for each card in the deck
+    forEachCard(setProviderIdToPreferred);
+}
+
+/**
+ * Sets the providerId on each card in the decklist based on its set name and collector number.
+ */
+void DeckLoader::resolveSetNameAndNumberToProviderID()
+{
+    auto setProviderId = [](const auto node, const auto card) {
+        Q_UNUSED(node);
+        // Retrieve the providerId based on setName and collectorNumber
+        QString providerId =
+            CardDatabaseManager::getInstance()
+                ->query()
+                ->getSpecificPrinting(card->getName(), card->getCardSetShortName(), card->getCardCollectorNumber())
+                .getUuid();
+
+        // Set the providerId on the card
+        card->setCardProviderId(providerId);
+    };
+
+    forEachCard(setProviderId);
+}
+
+// This struct is here to support the forEachCard function call, defined in decklist.
+// It requires a function to be called for each card, and it will set the providerId.
+struct ClearSetNameNumberAndProviderId
+{
+    // Main operator for struct, allowing the foreachcard to work.
+    ClearSetNameNumberAndProviderId()
+    {
+    }
+
+    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
+    {
+        Q_UNUSED(node);
+        // Set the providerId on the card
+        card->setCardSetShortName(nullptr);
+        card->setCardCollectorNumber(nullptr);
+        card->setCardProviderId(nullptr);
+    }
+};
+
+/**
+ * Clears the set name and numbers on each card in the decklist.
+ */
+void DeckLoader::clearSetNamesAndNumbers()
+{
+    auto clearSetNameAndNumber = [](const auto node, auto card) {
+        Q_UNUSED(node)
+        // Set the providerId on the card
+        card->setCardSetShortName(nullptr);
+        card->setCardCollectorNumber(nullptr);
+        card->setCardProviderId(nullptr);
+    };
+
+    forEachCard(clearSetNameAndNumber);
+}
+
+DeckLoader::FileFormat DeckLoader::getFormatFromName(const QString &fileName)
+{
+    if (fileName.endsWith(".cod", Qt::CaseInsensitive)) {
+        return CockatriceFormat;
+    }
+    return PlainTextFormat;
+}
+
+void DeckLoader::saveToClipboard(bool addComments, bool addSetNameAndNumber) const
+{
+    QString buffer;
+    QTextStream stream(&buffer);
+    saveToStream_Plain(stream, addComments, addSetNameAndNumber);
+    QApplication::clipboard()->setText(buffer, QClipboard::Clipboard);
+    QApplication::clipboard()->setText(buffer, QClipboard::Selection);
+}
+
+bool DeckLoader::saveToStream_Plain(QTextStream &out, bool addComments, bool addSetNameAndNumber) const
+{
+    if (addComments) {
+        saveToStream_DeckHeader(out);
+    }
+
+    // loop zones
+    for (int i = 0; i < getRoot()->size(); i++) {
+        const auto *zoneNode = dynamic_cast<InnerDecklistNode *>(getRoot()->at(i));
+
+        saveToStream_DeckZone(out, zoneNode, addComments, addSetNameAndNumber);
+
+        // end of zone
+        out << "\n";
+    }
+
+    return true;
+}
+
+void DeckLoader::saveToStream_DeckHeader(QTextStream &out) const
+{
+    if (!getName().isEmpty()) {
+        out << "// " << getName() << "\n\n";
+    }
+
+    if (!getComments().isEmpty()) {
+        QStringList commentRows = getComments().split(QRegularExpression("\n|\r\n|\r"));
+        for (const QString &row : commentRows) {
+            out << "// " << row << "\n";
+        }
+        out << "\n";
+    }
+}
+
+void DeckLoader::saveToStream_DeckZone(QTextStream &out,
+                                       const InnerDecklistNode *zoneNode,
+                                       bool addComments,
+                                       bool addSetNameAndNumber) const
+{
+    // group cards by card type and count the subtotals
+    QMultiMap<QString, DecklistCardNode *> cardsByType;
+    QMap<QString, int> cardTotalByType;
+    int cardTotal = 0;
+
+    for (int j = 0; j < zoneNode->size(); j++) {
+        auto *card = dynamic_cast<DecklistCardNode *>(zoneNode->at(j));
+
+        CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(card->getName());
+        QString cardType = info ? info->getMainCardType() : "unknown";
+
+        cardsByType.insert(cardType, card);
+
+        if (cardTotalByType.contains(cardType)) {
+            cardTotalByType[cardType] += card->getNumber();
+        } else {
+            cardTotalByType[cardType] = card->getNumber();
+        }
+
+        cardTotal += card->getNumber();
+    }
+
+    if (addComments) {
+        out << "// " << cardTotal << " " << zoneNode->getVisibleName() << "\n";
+    }
+
+    // print cards to stream
+    for (const QString &cardType : cardsByType.uniqueKeys()) {
+        if (addComments) {
+            out << "// " << cardTotalByType[cardType] << " " << cardType << "\n";
+        }
+
+        QList<DecklistCardNode *> cards = cardsByType.values(cardType);
+
+        saveToStream_DeckZoneCards(out, zoneNode, cards, addComments, addSetNameAndNumber);
+
+        if (addComments) {
+            out << "\n";
+        }
+    }
+}
+
+void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out,
+                                            const InnerDecklistNode *zoneNode,
+                                            QList<DecklistCardNode *> cards,
+                                            bool addComments,
+                                            bool addSetNameAndNumber) const
+{
+    // QMultiMap sorts values in reverse order
+    for (int i = cards.size() - 1; i >= 0; --i) {
+        DecklistCardNode *card = cards[i];
+
+        if (zoneNode->getName() == DECK_ZONE_SIDE && addComments) {
+            out << "SB: ";
+        }
+
+        if (card->getNumber()) {
+            out << card->getNumber();
+        }
+        if (!card->getName().isNull() && !card->getName().isEmpty()) {
+            out << " " << card->getName();
+        }
+        if (addSetNameAndNumber) {
+            if (!card->getCardSetShortName().isNull() && !card->getCardSetShortName().isEmpty()) {
+                out << " "
+                    << "(" << card->getCardSetShortName() << ")";
+            }
+            if (!card->getCardCollectorNumber().isNull()) {
+                out << " " << card->getCardCollectorNumber();
+            }
+        }
+        out << "\n";
+    }
+}
+
+bool DeckLoader::convertToCockatriceFormat(QString fileName)
+{
+    // Change the file extension to .cod
+    QFileInfo fileInfo(fileName);
+    QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod");
+
+    // Open the new file for writing
+    QFile file(newFileName);
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        qCWarning(DeckLoaderLog) << "Failed to open file for writing:" << newFileName;
+        return false;
+    }
+
+    bool result = false;
+
+    // Perform file modifications based on the detected format
+    switch (getFormatFromName(fileName)) {
+        case PlainTextFormat:
+            // Save in Cockatrice's native format
+            result = saveToFile_Native(&file);
+            break;
+        case CockatriceFormat:
+            qCInfo(DeckLoaderLog) << "File is already in Cockatrice format. No conversion needed.";
+            result = true;
+            break;
+        default:
+            qCWarning(DeckLoaderLog) << "Unsupported file format for conversion:" << fileName;
+            result = false;
+            break;
+    }
+
+    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;
+        }
+        lastFileName = newFileName;
+        lastFileFormat = CockatriceFormat;
+    }
+
+    return result;
+}
+
+QString DeckLoader::getCardZoneFromName(QString cardName, QString currentZoneName)
+{
+    CardInfoPtr card = CardDatabaseManager::query()->getCardInfo(cardName);
+
+    if (card && card->getIsToken()) {
+        return DECK_ZONE_TOKENS;
+    }
+
+    return currentZoneName;
+}
+
+QString DeckLoader::getCompleteCardName(const QString &cardName) const
+{
+    if (CardDatabaseManager::getInstance()) {
+        ExactCard temp = CardDatabaseManager::query()->guessCard({cardName});
+        if (temp) {
+            return temp.getName();
+        }
+    }
+
+    return cardName;
+}
diff --git a/cockatrice/src/deck/deck_loader.h b/cockatrice/src/deck/deck_loader.h
new file mode 100644
index 000000000..16e14f3d2
--- /dev/null
+++ b/cockatrice/src/deck/deck_loader.h
@@ -0,0 +1,106 @@
+#ifndef DECK_LOADER_H
+#define DECK_LOADER_H
+
+#include "deck_list.h"
+
+#include <QLoggingCategory>
+
+inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader")
+
+    class DeckLoader : public DeckList
+{
+    Q_OBJECT
+signals:
+    void deckLoaded();
+    void loadFinished(bool success);
+
+public:
+    enum FileFormat
+    {
+        PlainTextFormat,
+        CockatriceFormat
+    };
+
+    /**
+     * Supported file extensions for decklist files
+     */
+    static const QStringList ACCEPTED_FILE_EXTENSIONS;
+
+    /**
+     * For use with `QFileDialog::setNameFilters`
+     */
+    static const QStringList FILE_NAME_FILTERS;
+
+    enum DecklistWebsite
+    {
+        DecklistOrg,
+        DecklistXyz
+    };
+
+private:
+    QString lastFileName;
+    FileFormat lastFileFormat;
+    int lastRemoteDeckId;
+
+public:
+    DeckLoader();
+    explicit DeckLoader(const QString &nativeString);
+    explicit DeckLoader(const DeckList &other);
+    DeckLoader(const DeckLoader &other);
+    const QString &getLastFileName() const
+    {
+        return lastFileName;
+    }
+    void setLastFileName(const QString &_lastFileName)
+    {
+        lastFileName = _lastFileName;
+    }
+    FileFormat getLastFileFormat() const
+    {
+        return lastFileFormat;
+    }
+    int getLastRemoteDeckId() const
+    {
+        return lastRemoteDeckId;
+    }
+
+    bool hasNotBeenLoaded() const
+    {
+        return getLastFileName().isEmpty() && getLastRemoteDeckId() == -1;
+    }
+
+    void clearSetNamesAndNumbers();
+    static FileFormat getFormatFromName(const QString &fileName);
+
+    bool loadFromFile(const QString &fileName, FileFormat fmt, bool userRequest = false);
+    bool loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest);
+    bool loadFromRemote(const QString &nativeString, int remoteDeckId);
+    bool saveToFile(const QString &fileName, FileFormat fmt);
+    bool updateLastLoadedTimestamp(const QString &fileName, FileFormat fmt);
+    QString exportDeckToDecklist(DecklistWebsite website);
+    void setProviderIdToPreferredPrinting();
+
+    void resolveSetNameAndNumberToProviderID();
+
+    void saveToClipboard(bool addComments = true, bool addSetNameAndNumber = true) const;
+
+    // overload
+    bool saveToStream_Plain(QTextStream &out, bool addComments = true, bool addSetNameAndNumber = true) const;
+    bool convertToCockatriceFormat(QString fileName);
+
+protected:
+    void saveToStream_DeckHeader(QTextStream &out) const;
+    void saveToStream_DeckZone(QTextStream &out,
+                               const InnerDecklistNode *zoneNode,
+                               bool addComments = true,
+                               bool addSetNameAndNumber = true) const;
+    void saveToStream_DeckZoneCards(QTextStream &out,
+                                    const InnerDecklistNode *zoneNode,
+                                    QList<DecklistCardNode *> cards,
+                                    bool addComments = true,
+                                    bool addSetNameAndNumber = true) const;
+    [[nodiscard]] QString getCardZoneFromName(QString cardName, QString currentZoneName) override;
+    [[nodiscard]] QString getCompleteCardName(const QString &cardName) const override;
+};
+
+#endif
diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp b/cockatrice/src/deck/deck_stats_interface.cpp
similarity index 74%
rename from cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
rename to cockatrice/src/deck/deck_stats_interface.cpp
index 0298daa6b..96865d9e7 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
+++ b/cockatrice/src/deck/deck_stats_interface.cpp
@@ -1,14 +1,15 @@
 #include "deck_stats_interface.h"
 
+#include "deck_list.h"
+#include "deck_list_card_node.h"
+
 #include <QDesktopServices>
 #include <QMessageBox>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <version_string.h>
 
 DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)
@@ -43,32 +44,31 @@ void DeckStatsInterface::queryFinished(QNetworkReply *reply)
     deleteLater();
 }
 
-void DeckStatsInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray &data)
+void DeckStatsInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data)
 {
     DeckList deckWithoutTokens;
-    copyDeckWithoutTokens(deck, deckWithoutTokens);
+    copyDeckWithoutTokens(*deck, deckWithoutTokens);
 
     QUrl params;
     QUrlQuery urlQuery;
     urlQuery.addQueryItem("deck", deckWithoutTokens.writeToString_Plain());
-    urlQuery.addQueryItem("decktitle", deck.getName());
+    urlQuery.addQueryItem("decktitle", deck->getName());
     params.setQuery(urlQuery);
-    data.append(params.query(QUrl::EncodeReserved).toUtf8());
+    data->append(params.query(QUrl::EncodeReserved).toUtf8());
 }
 
-void DeckStatsInterface::analyzeDeck(const DeckList &deck)
+void DeckStatsInterface::analyzeDeck(DeckList *deck)
 {
     QByteArray data;
-    getAnalyzeRequestData(deck, data);
+    getAnalyzeRequestData(deck, &data);
 
     QNetworkRequest request(QUrl("https://deckstats.net/index.php"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     manager->post(request, data);
 }
 
-void DeckStatsInterface::copyDeckWithoutTokens(const DeckList &source, DeckList &destination)
+void DeckStatsInterface::copyDeckWithoutTokens(DeckList &source, DeckList &destination)
 {
     auto copyIfNotAToken = [this, &destination](const auto node, const auto card) {
         CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName());
diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.h b/cockatrice/src/deck/deck_stats_interface.h
similarity index 62%
rename from cockatrice/src/client/network/interfaces/deck_stats_interface.h
rename to cockatrice/src/deck/deck_stats_interface.h
index 7dc841027..80a8a0770 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.h
+++ b/cockatrice/src/deck/deck_stats_interface.h
@@ -1,14 +1,10 @@
-/**
- * @file deck_stats_interface.h
- * @ingroup ApiInterfaces
- * @brief TODO: Document this.
- */
-
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/deck_list/deck_list.h>
+#include "../database/card_database.h"
+#include "deck_list.h"
+
+#include <QObject>
 
 class QByteArray;
 class QNetworkAccessManager;
@@ -28,15 +24,15 @@ private:
      * closest non-token card instead. So we construct a new deck which has no
      * tokens.
      */
-    void copyDeckWithoutTokens(const DeckList &source, DeckList &destination);
+    void copyDeckWithoutTokens(DeckList &source, DeckList &destination);
 
 private slots:
     void queryFinished(QNetworkReply *reply);
-    void getAnalyzeRequestData(const DeckList &deck, QByteArray &data);
+    void getAnalyzeRequestData(DeckList *deck, QByteArray *data);
 
 public:
     explicit DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
-    void analyzeDeck(const DeckList &deck);
+    void analyzeDeck(DeckList *deck);
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/dialogs/dlg_connect.cpp
similarity index 99%
rename from cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
rename to cockatrice/src/dialogs/dlg_connect.cpp
index 0bb0eb1c9..d8cf11487 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
+++ b/cockatrice/src/dialogs/dlg_connect.cpp
@@ -1,10 +1,13 @@
 #include "dlg_connect.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
+#include "trice_limits.h"
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QDebug>
 #include <QDialogButtonBox>
+#include <QEvent>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QKeyEvent>
@@ -12,7 +15,6 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
-#include <libcockatrice/utility/trice_limits.h>
 
 DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h b/cockatrice/src/dialogs/dlg_connect.h
similarity index 81%
rename from cockatrice/src/interface/widgets/dialogs/dlg_connect.h
rename to cockatrice/src/dialogs/dlg_connect.h
index 41993e068..119e3b816 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
+++ b/cockatrice/src/dialogs/dlg_connect.h
@@ -1,18 +1,12 @@
-/**
- * @file dlg_connect.h
- * @ingroup ConnectionDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_CONNECT_H
 #define DLG_CONNECT_H
 
-#include "../interface/widgets/server/handle_public_servers.h"
-#include "../interface/widgets/server/user/user_info_connection.h"
+#include "../server/handle_public_servers.h"
+#include "../server/user/user_info_connection.h"
+#include "../utility/macros.h"
 
 #include <QDialog>
 #include <QLineEdit>
-#include <libcockatrice/utility/macros.h>
 
 class QCheckBox;
 class QComboBox;
@@ -34,16 +28,16 @@ signals:
 public:
     explicit DlgConnect(QWidget *parent = nullptr);
     ~DlgConnect() override;
-    [[nodiscard]] QString getHost() const;
-    [[nodiscard]] int getPort() const
+    QString getHost() const;
+    int getPort() const
     {
         return portEdit->text().toInt();
     }
-    [[nodiscard]] QString getPlayerName() const
+    QString getPlayerName() const
     {
         return playernameEdit->text();
     }
-    [[nodiscard]] QString getPassword() const
+    QString getPassword() const
     {
         return passwordEdit->text();
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp b/cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
rename to cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.cpp
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h b/cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.h
similarity index 76%
rename from cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h
rename to cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.h
index 61eea1d6e..88a19591e 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h
+++ b/cockatrice/src/dialogs/dlg_convert_deck_to_cod_format.h
@@ -1,10 +1,3 @@
-/**
- * @file dlg_convert_deck_to_cod_format.h
- * @ingroup LocalDeckStorageDialogs
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef DIALOG_CONVERT_DECK_TO_COD_FORMAT_H
 #define DIALOG_CONVERT_DECK_TO_COD_FORMAT_H
 
@@ -22,7 +15,7 @@ public:
     explicit DialogConvertDeckToCodFormat(QWidget *parent);
     void retranslateUi();
 
-    [[nodiscard]] bool dontAskAgain() const;
+    bool dontAskAgain() const;
 
 private:
     QVBoxLayout *layout;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp b/cockatrice/src/dialogs/dlg_create_game.cpp
similarity index 90%
rename from cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
rename to cockatrice/src/dialogs/dlg_create_game.cpp
index 7f109f600..81b233dcb 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/dialogs/dlg_create_game.cpp
@@ -1,7 +1,10 @@
 #include "dlg_create_game.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../interface/widgets/tabs/tab_room.h"
+#include "../server/pending_command.h"
+#include "../settings/cache_settings.h"
+#include "../tabs/tab_room.h"
+#include "pb/serverinfo_game.pb.h"
+#include "trice_limits.h"
 
 #include <QApplication>
 #include <QCheckBox>
@@ -15,9 +18,7 @@
 #include <QRadioButton>
 #include <QSet>
 #include <QSpinBox>
-#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <QWizard>
 
 void DlgCreateGame::sharedCtor()
 {
@@ -34,7 +35,7 @@ void DlgCreateGame::sharedCtor()
     maxPlayersEdit->setValue(2);
     maxPlayersLabel->setBuddy(maxPlayersEdit);
 
-    auto *generalGrid = new QGridLayout;
+    QGridLayout *generalGrid = new QGridLayout;
     generalGrid->addWidget(descriptionLabel, 0, 0);
     generalGrid->addWidget(descriptionEdit, 0, 1);
     generalGrid->addWidget(maxPlayersLabel, 1, 0);
@@ -42,17 +43,17 @@ void DlgCreateGame::sharedCtor()
     generalGroupBox = new QGroupBox(tr("General"));
     generalGroupBox->setLayout(generalGrid);
 
-    auto *gameTypeLayout = new QVBoxLayout;
+    QVBoxLayout *gameTypeLayout = new QVBoxLayout;
     QMapIterator<int, QString> gameTypeIterator(gameTypes);
     while (gameTypeIterator.hasNext()) {
         gameTypeIterator.next();
-        auto *gameTypeRadioButton = new QRadioButton(gameTypeIterator.value(), this);
+        QRadioButton *gameTypeRadioButton = new QRadioButton(gameTypeIterator.value(), this);
         gameTypeLayout->addWidget(gameTypeRadioButton);
         gameTypeCheckBoxes.insert(gameTypeIterator.key(), gameTypeRadioButton);
         bool isChecked = SettingsCache::instance().getGameTypes().contains(gameTypeIterator.value() + ", ");
         gameTypeCheckBoxes[gameTypeIterator.key()]->setChecked(isChecked);
     }
-    auto *gameTypeGroupBox = new QGroupBox(tr("Game type"));
+    QGroupBox *gameTypeGroupBox = new QGroupBox(tr("Game type"));
     gameTypeGroupBox->setLayout(gameTypeLayout);
 
     passwordLabel = new QLabel(tr("&Password:"));
@@ -69,13 +70,13 @@ void DlgCreateGame::sharedCtor()
         onlyRegisteredCheckBox->setEnabled(false);
     }
 
-    auto *joinRestrictionsLayout = new QGridLayout;
+    QGridLayout *joinRestrictionsLayout = new QGridLayout;
     joinRestrictionsLayout->addWidget(passwordLabel, 0, 0);
     joinRestrictionsLayout->addWidget(passwordEdit, 0, 1);
     joinRestrictionsLayout->addWidget(onlyBuddiesCheckBox, 1, 0, 1, 2);
     joinRestrictionsLayout->addWidget(onlyRegisteredCheckBox, 2, 0, 1, 2);
 
-    auto *joinRestrictionsGroupBox = new QGroupBox(tr("Joining restrictions"));
+    QGroupBox *joinRestrictionsGroupBox = new QGroupBox(tr("Joining restrictions"));
     joinRestrictionsGroupBox->setLayout(joinRestrictionsLayout);
 
     spectatorsAllowedCheckBox = new QCheckBox(tr("&Spectators can watch"));
@@ -85,7 +86,7 @@ void DlgCreateGame::sharedCtor()
     spectatorsCanTalkCheckBox = new QCheckBox(tr("Spectators can &chat"));
     spectatorsSeeEverythingCheckBox = new QCheckBox(tr("Spectators can see &hands"));
     createGameAsSpectatorCheckBox = new QCheckBox(tr("Create game as spectator"));
-    auto *spectatorsLayout = new QVBoxLayout;
+    QVBoxLayout *spectatorsLayout = new QVBoxLayout;
     spectatorsLayout->addWidget(spectatorsAllowedCheckBox);
     spectatorsLayout->addWidget(spectatorsNeedPasswordCheckBox);
     spectatorsLayout->addWidget(spectatorsCanTalkCheckBox);
@@ -101,20 +102,15 @@ void DlgCreateGame::sharedCtor()
     startingLifeTotalEdit->setValue(20);
     startingLifeTotalLabel->setBuddy(startingLifeTotalEdit);
 
-    shareDecklistsOnLoadCheckBox = new QCheckBox(tr("Open decklists in lobby"));
+    shareDecklistsOnLoadLabel = new QLabel(tr("Open decklists in lobby"));
+    shareDecklistsOnLoadCheckBox = new QCheckBox();
+    shareDecklistsOnLoadLabel->setBuddy(shareDecklistsOnLoadCheckBox);
 
-    createGameAsJudgeCheckBox = new QCheckBox(tr("Create game as judge"));
-
-    auto *gameSetupOptionsLayout = new QGridLayout;
+    QGridLayout *gameSetupOptionsLayout = new QGridLayout;
     gameSetupOptionsLayout->addWidget(startingLifeTotalLabel, 0, 0);
     gameSetupOptionsLayout->addWidget(startingLifeTotalEdit, 0, 1);
-    gameSetupOptionsLayout->addWidget(shareDecklistsOnLoadCheckBox, 1, 0);
-    if (room && room->getUserInfo()->user_level() & ServerInfo_User::IsJudge) {
-        gameSetupOptionsLayout->addWidget(createGameAsJudgeCheckBox, 2, 0);
-    } else {
-        createGameAsJudgeCheckBox->setChecked(false);
-        createGameAsJudgeCheckBox->setHidden(true);
-    }
+    gameSetupOptionsLayout->addWidget(shareDecklistsOnLoadLabel, 1, 0);
+    gameSetupOptionsLayout->addWidget(shareDecklistsOnLoadCheckBox, 1, 1);
     gameSetupOptionsGroupBox = new QGroupBox(tr("Game setup options"));
     gameSetupOptionsGroupBox->setLayout(gameSetupOptionsLayout);
 
@@ -140,7 +136,7 @@ void DlgCreateGame::sharedCtor()
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgCreateGame::reject);
 
-    auto *mainLayout = new QVBoxLayout;
+    QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(grid);
     mainLayout->addWidget(buttonBox);
 
@@ -249,7 +245,6 @@ void DlgCreateGame::actReset()
 
     startingLifeTotalEdit->setValue(20);
     shareDecklistsOnLoadCheckBox->setChecked(false);
-    createGameAsJudgeCheckBox->setChecked(false);
 
     QMapIterator<int, QRadioButton *> gameTypeCheckBoxIterator(gameTypeCheckBoxes);
     while (gameTypeCheckBoxIterator.hasNext()) {
@@ -275,12 +270,12 @@ void DlgCreateGame::actOK()
     cmd.set_spectators_need_password(spectatorsNeedPasswordCheckBox->isChecked());
     cmd.set_spectators_can_talk(spectatorsCanTalkCheckBox->isChecked());
     cmd.set_spectators_see_everything(spectatorsSeeEverythingCheckBox->isChecked());
-    cmd.set_join_as_judge(createGameAsJudgeCheckBox->isChecked());
+    cmd.set_join_as_judge(QApplication::keyboardModifiers() & Qt::ShiftModifier);
     cmd.set_join_as_spectator(createGameAsSpectatorCheckBox->isChecked());
     cmd.set_starting_life_total(startingLifeTotalEdit->value());
     cmd.set_share_decklists_on_load(shareDecklistsOnLoadCheckBox->isChecked());
 
-    auto _gameTypes = QString();
+    QString _gameTypes = QString();
     QMapIterator<int, QRadioButton *> gameTypeCheckBoxIterator(gameTypeCheckBoxes);
     while (gameTypeCheckBoxIterator.hasNext()) {
         gameTypeCheckBoxIterator.next();
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h b/cockatrice/src/dialogs/dlg_create_game.h
similarity index 86%
rename from cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
rename to cockatrice/src/dialogs/dlg_create_game.h
index e28363311..ae10bf01b 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
+++ b/cockatrice/src/dialogs/dlg_create_game.h
@@ -1,15 +1,10 @@
-/**
- * @file dlg_create_game.h
- * @ingroup RoomDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_CREATEGAME_H
 #define DLG_CREATEGAME_H
 
+#include "../utility/macros.h"
+
 #include <QDialog>
 #include <QMap>
-#include <libcockatrice/utility/macros.h>
 
 class QCheckBox;
 class QDialogButtonBox;
@@ -46,7 +41,7 @@ private:
     QSpinBox *maxPlayersEdit, *startingLifeTotalEdit;
     QCheckBox *onlyBuddiesCheckBox, *onlyRegisteredCheckBox;
     QCheckBox *spectatorsAllowedCheckBox, *spectatorsNeedPasswordCheckBox, *spectatorsCanTalkCheckBox,
-        *spectatorsSeeEverythingCheckBox, *createGameAsJudgeCheckBox, *createGameAsSpectatorCheckBox;
+        *spectatorsSeeEverythingCheckBox, *createGameAsSpectatorCheckBox;
     QCheckBox *shareDecklistsOnLoadCheckBox;
     QDialogButtonBox *buttonBox;
     QPushButton *clearButton;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp b/cockatrice/src/dialogs/dlg_default_tags_editor.cpp
similarity index 98%
rename from cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
rename to cockatrice/src/dialogs/dlg_default_tags_editor.cpp
index 349f4ca4c..fbd737d4a 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
+++ b/cockatrice/src/dialogs/dlg_default_tags_editor.cpp
@@ -1,9 +1,8 @@
 #include "dlg_default_tags_editor.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 
 #include <QMessageBox>
-#include <QPushButton>
 #include <QVBoxLayout>
 
 DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent)
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h b/cockatrice/src/dialogs/dlg_default_tags_editor.h
similarity index 85%
rename from cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
rename to cockatrice/src/dialogs/dlg_default_tags_editor.h
index 27af74105..8dd58e018 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
+++ b/cockatrice/src/dialogs/dlg_default_tags_editor.h
@@ -1,16 +1,10 @@
-/**
- * @file dlg_default_tags_editor.h
- * @ingroup Dialogs
- * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_DEFAULT_TAGS_EDITOR_H
 #define DLG_DEFAULT_TAGS_EDITOR_H
 
 #include <QDialog>
 #include <QLineEdit>
 #include <QListWidget>
+#include <QPushButton>
 #include <QVBoxLayout>
 
 class DlgDefaultTagsEditor : public QDialog
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp b/cockatrice/src/dialogs/dlg_edit_avatar.cpp
similarity index 91%
rename from cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
rename to cockatrice/src/dialogs/dlg_edit_avatar.cpp
index db5f21701..98a41bdfa 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_avatar.cpp
@@ -1,14 +1,16 @@
 #include "dlg_edit_avatar.h"
 
+#include "trice_limits.h"
+
 #include <QBuffer>
 #include <QDebug>
 #include <QDialogButtonBox>
+#include <QDir>
 #include <QFileDialog>
 #include <QImageReader>
 #include <QLabel>
 #include <QPushButton>
 #include <QVBoxLayout>
-#include <libcockatrice/utility/trice_limits.h>
 
 DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image()
 {
@@ -22,16 +24,16 @@ DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image()
     browseButton = new QPushButton(tr("Browse..."));
     connect(browseButton, &QPushButton::clicked, this, &DlgEditAvatar::actBrowse);
 
-    auto *grid = new QGridLayout;
+    QGridLayout *grid = new QGridLayout;
     grid->addWidget(imageLabel, 0, 0, 1, 2);
     grid->addWidget(textLabel, 1, 0);
     grid->addWidget(browseButton, 1, 1);
 
-    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgEditAvatar::actOk);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgEditAvatar::reject);
 
-    auto *mainLayout = new QVBoxLayout;
+    QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(grid);
     mainLayout->addWidget(buttonBox);
     setLayout(mainLayout);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h b/cockatrice/src/dialogs/dlg_edit_avatar.h
similarity index 85%
rename from cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
rename to cockatrice/src/dialogs/dlg_edit_avatar.h
index 641b736dc..8a84349e2 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
+++ b/cockatrice/src/dialogs/dlg_edit_avatar.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_edit_avatar.h
- * @ingroup AccountDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_EDITAVATAR_H
 #define DLG_EDITAVATAR_H
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp b/cockatrice/src/dialogs/dlg_edit_password.cpp
similarity index 93%
rename from cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
rename to cockatrice/src/dialogs/dlg_edit_password.cpp
index e3bbc7435..bea94ae08 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_password.cpp
@@ -1,13 +1,13 @@
 #include "dlg_edit_password.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
+#include "trice_limits.h"
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/utility/trice_limits.h>
 
 DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent)
 {
@@ -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/dialogs/dlg_edit_password.h
similarity index 74%
rename from cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
rename to cockatrice/src/dialogs/dlg_edit_password.h
index ee8e45985..e3fcce6ec 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
+++ b/cockatrice/src/dialogs/dlg_edit_password.h
@@ -1,12 +1,7 @@
-/**
- * @file dlg_edit_password.h
- * @ingroup AccountDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_EDITPASSWORD_H
 #define DLG_EDITPASSWORD_H
 
+#include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
 
@@ -19,11 +14,11 @@ class DlgEditPassword : public QDialog
     Q_OBJECT
 public:
     explicit DlgEditPassword(QWidget *parent = nullptr);
-    [[nodiscard]] QString getOldPassword() const
+    QString getOldPassword() const
     {
         return oldPasswordEdit->text();
     }
-    [[nodiscard]] QString getNewPassword() const
+    QString getNewPassword() const
     {
         return newPasswordEdit->text();
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/dialogs/dlg_edit_tokens.cpp
similarity index 93%
rename from cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
rename to cockatrice/src/dialogs/dlg_edit_tokens.cpp
index fe9cd181c..56711dda6 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_tokens.cpp
@@ -1,6 +1,12 @@
 #include "dlg_edit_tokens.h"
 
-#include "../interface/widgets/utility/get_text_with_max.h"
+#include "../client/get_text_with_max.h"
+#include "../database/card_database.h"
+#include "../database/card_database_manager.h"
+#include "../database/model/card_database_model.h"
+#include "../database/model/token/token_edit_model.h"
+#include "../main.h"
+#include "trice_limits.h"
 
 #include <QAction>
 #include <QComboBox>
@@ -15,11 +21,7 @@
 #include <QMessageBox>
 #include <QToolBar>
 #include <QTreeView>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/models/database/token/token_edit_model.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <QVBoxLayout>
 
 DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr)
 {
@@ -163,8 +165,8 @@ void DlgEditTokens::actAddToken()
     QString setName = CardSet::TOKENS_SETNAME;
     SetToPrintingsMap sets;
     sets[setName].append(PrintingInfo(databaseModel->getDatabase()->getSet(setName)));
-    CardInfo::UiAttributes attributes = {.tableRow = -1};
-    CardInfoPtr card = CardInfo::newInstance(name, "", true, {}, {}, {}, sets, attributes);
+    CardInfoPtr card = CardInfo::newInstance(name, "", true, QVariantHash(), QList<CardRelation *>(),
+                                             QList<CardRelation *>(), sets, false, false, -1, false);
     card->setCardType("Token");
 
     databaseModel->getDatabase()->addCard(card);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h b/cockatrice/src/dialogs/dlg_edit_tokens.h
similarity index 87%
rename from cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
rename to cockatrice/src/dialogs/dlg_edit_tokens.h
index f19646756..be09032da 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
+++ b/cockatrice/src/dialogs/dlg_edit_tokens.h
@@ -1,14 +1,9 @@
-/**
- * @file dlg_edit_tokens.h
- * @ingroup GameDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_EDIT_TOKENS_H
 #define DLG_EDIT_TOKENS_H
 
+#include "../card/card_info.h"
+
 #include <QDialog>
-#include <libcockatrice/card/card_info.h>
 
 class QModelIndex;
 class CardDatabaseModel;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp b/cockatrice/src/dialogs/dlg_edit_user.cpp
similarity index 95%
rename from cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
rename to cockatrice/src/dialogs/dlg_edit_user.cpp
index dcfbc91e9..7b2af1445 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
+++ b/cockatrice/src/dialogs/dlg_edit_user.cpp
@@ -1,12 +1,13 @@
 #include "dlg_edit_user.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
+#include "trice_limits.h"
 
+#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <libcockatrice/utility/trice_limits.h>
 
 DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QString realName) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h b/cockatrice/src/dialogs/dlg_edit_user.h
similarity index 77%
rename from cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
rename to cockatrice/src/dialogs/dlg_edit_user.h
index b89a3be04..db2ca60ac 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
+++ b/cockatrice/src/dialogs/dlg_edit_user.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_edit user.h
- * @ingroup NetworkDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_EDITUSER_H
 #define DLG_EDITUSER_H
 
@@ -23,15 +17,15 @@ public:
                          QString email = QString(),
                          QString country = QString(),
                          QString realName = QString());
-    [[nodiscard]] QString getEmail() const
+    QString getEmail() const
     {
         return emailEdit->text();
     }
-    [[nodiscard]] QString getCountry() const
+    QString getCountry() const
     {
         return countryEdit->currentIndex() == 0 ? "" : countryEdit->currentText();
     }
-    [[nodiscard]] QString getRealName() const
+    QString getRealName() const
     {
         return realnameEdit->text();
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp b/cockatrice/src/dialogs/dlg_filter_games.cpp
similarity index 98%
rename from cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
rename to cockatrice/src/dialogs/dlg_filter_games.cpp
index 1bf98822c..0c5191f99 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
+++ b/cockatrice/src/dialogs/dlg_filter_games.cpp
@@ -37,7 +37,7 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
     hideIgnoredUserGames = new QCheckBox(tr("Hide 'ignored user' games"));
     hideIgnoredUserGames->setChecked(gamesProxyModel->getHideIgnoredUserGames());
 
-    hideNotBuddyCreatedGames = new QCheckBox(tr("Hide games not created by buddies"));
+    hideNotBuddyCreatedGames = new QCheckBox(tr("Hide games not created by buddy"));
     hideNotBuddyCreatedGames->setChecked(gamesProxyModel->getHideNotBuddyCreatedGames());
 
     hideOpenDecklistGames = new QCheckBox(tr("Hide games with forced open decklists"));
@@ -56,7 +56,7 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
     auto *gameNameFilterLabel = new QLabel(tr("Game &description:"));
     gameNameFilterLabel->setBuddy(gameNameFilterEdit);
     creatorNameFilterEdit = new QLineEdit;
-    creatorNameFilterEdit->setText(gamesProxyModel->getCreatorNameFilters().join(", "));
+    creatorNameFilterEdit->setText(gamesProxyModel->getCreatorNameFilter());
     auto *creatorNameFilterLabel = new QLabel(tr("&Creator name:"));
     creatorNameFilterLabel->setBuddy(creatorNameFilterEdit);
 
@@ -232,9 +232,9 @@ QString DlgFilterGames::getGameNameFilter() const
     return gameNameFilterEdit->text();
 }
 
-QStringList DlgFilterGames::getCreatorNameFilters() const
+QString DlgFilterGames::getCreatorNameFilter() const
 {
-    return creatorNameFilterEdit->text().split(",", Qt::SkipEmptyParts);
+    return creatorNameFilterEdit->text();
 }
 
 QSet<int> DlgFilterGames::getGameTypeFilter() const
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h b/cockatrice/src/dialogs/dlg_filter_games.h
similarity index 63%
rename from cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
rename to cockatrice/src/dialogs/dlg_filter_games.h
index abfdab28a..d805755d9 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
+++ b/cockatrice/src/dialogs/dlg_filter_games.h
@@ -1,13 +1,7 @@
-/**
- * @file dlg_filter_games.h
- * @ingroup RoomDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_FILTER_GAMES_H
 #define DLG_FILTER_GAMES_H
 
-#include "../interface/widgets/server/games_model.h"
+#include "../server/games_model.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -58,32 +52,32 @@ public:
                    const GamesProxyModel *_gamesProxyModel,
                    QWidget *parent = nullptr);
 
-    [[nodiscard]] bool getHideFullGames() const;
-    [[nodiscard]] bool getHideGamesThatStarted() const;
-    [[nodiscard]] bool getHidePasswordProtectedGames() const;
+    bool getHideFullGames() const;
+    bool getHideGamesThatStarted() const;
+    bool getHidePasswordProtectedGames() const;
     void setShowPasswordProtectedGames(bool _passwordProtectedGamesHidden);
-    [[nodiscard]] bool getHideBuddiesOnlyGames() const;
+    bool getHideBuddiesOnlyGames() const;
     void setHideBuddiesOnlyGames(bool _hideBuddiesOnlyGames);
-    [[nodiscard]] bool getHideOpenDecklistGames() const;
+    bool getHideOpenDecklistGames() const;
     void setHideOpenDecklistGames(bool _hideOpenDecklistGames);
-    [[nodiscard]] bool getHideIgnoredUserGames() const;
+    bool getHideIgnoredUserGames() const;
     void setHideIgnoredUserGames(bool _hideIgnoredUserGames);
-    [[nodiscard]] bool getHideNotBuddyCreatedGames() const;
-    [[nodiscard]] QString getGameNameFilter() const;
+    bool getHideNotBuddyCreatedGames() const;
+    QString getGameNameFilter() const;
     void setGameNameFilter(const QString &_gameNameFilter);
-    [[nodiscard]] QStringList getCreatorNameFilters() const;
+    QString getCreatorNameFilter() const;
     void setCreatorNameFilter(const QString &_creatorNameFilter);
-    [[nodiscard]] QSet<int> getGameTypeFilter() const;
+    QSet<int> getGameTypeFilter() const;
     void setGameTypeFilter(const QSet<int> &_gameTypeFilter);
-    [[nodiscard]] int getMaxPlayersFilterMin() const;
-    [[nodiscard]] int getMaxPlayersFilterMax() const;
+    int getMaxPlayersFilterMin() const;
+    int getMaxPlayersFilterMax() const;
     void setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax);
-    [[nodiscard]] QTime getMaxGameAge() const;
+    QTime getMaxGameAge() const;
     const QMap<QTime, QString> gameAgeMap;
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanWatch() const;
-    [[nodiscard]] bool getShowSpectatorPasswordProtected() const;
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanChat() const;
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanSeeHands() const;
+    bool getShowOnlyIfSpectatorsCanWatch() const;
+    bool getShowSpectatorPasswordProtected() const;
+    bool getShowOnlyIfSpectatorsCanChat() const;
+    bool getShowOnlyIfSpectatorsCanSeeHands() const;
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp
similarity index 92%
rename from cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
rename to cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp
index 24e9030e0..4ff237edf 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
+++ b/cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp
@@ -1,13 +1,15 @@
 #include "dlg_forgot_password_challenge.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
+#include "trice_limits.h"
 
+#include <QCheckBox>
+#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/utility/trice_limits.h>
 
 DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent)
 {
@@ -64,7 +66,7 @@ DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialo
         playernameEdit->hide();
     }
 
-    auto *grid = new QGridLayout;
+    QGridLayout *grid = new QGridLayout;
     grid->addWidget(infoLabel, 0, 0, 1, 2);
     grid->addWidget(hostLabel, 1, 0);
     grid->addWidget(hostEdit, 1, 1);
@@ -75,11 +77,11 @@ DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialo
     grid->addWidget(emailLabel, 4, 0);
     grid->addWidget(emailEdit, 4, 1);
 
-    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgForgotPasswordChallenge::actOk);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgForgotPasswordChallenge::reject);
 
-    auto *mainLayout = new QVBoxLayout;
+    QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(grid);
     mainLayout->addWidget(buttonBox);
     setLayout(mainLayout);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h b/cockatrice/src/dialogs/dlg_forgot_password_challenge.h
similarity index 72%
rename from cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
rename to cockatrice/src/dialogs/dlg_forgot_password_challenge.h
index e8925b1d3..73fb44c33 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
+++ b/cockatrice/src/dialogs/dlg_forgot_password_challenge.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_forgot_password_challenge.h
- * @ingroup AccountDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_FORGOTPASSWORDCHALLENGE_H
 #define DLG_FORGOTPASSWORDCHALLENGE_H
 
@@ -20,19 +14,19 @@ class DlgForgotPasswordChallenge : public QDialog
     Q_OBJECT
 public:
     explicit DlgForgotPasswordChallenge(QWidget *parent = nullptr);
-    [[nodiscard]] QString getHost() const
+    QString getHost() const
     {
         return hostEdit->text();
     }
-    [[nodiscard]] int getPort() const
+    int getPort() const
     {
         return portEdit->text().toInt();
     }
-    [[nodiscard]] QString getPlayerName() const
+    QString getPlayerName() const
     {
         return playernameEdit->text();
     }
-    [[nodiscard]] QString getEmail() const
+    QString getEmail() const
     {
         return emailEdit->text();
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp
similarity index 89%
rename from cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
rename to cockatrice/src/dialogs/dlg_forgot_password_request.cpp
index c33a41bed..a07bda279 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
+++ b/cockatrice/src/dialogs/dlg_forgot_password_request.cpp
@@ -1,13 +1,15 @@
 #include "dlg_forgot_password_request.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
+#include "trice_limits.h"
 
+#include <QCheckBox>
+#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/utility/trice_limits.h>
 
 DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent)
 {
@@ -43,7 +45,7 @@ DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(pa
     playernameEdit->setMaxLength(MAX_NAME_LENGTH);
     playernameLabel->setBuddy(playernameEdit);
 
-    auto *grid = new QGridLayout;
+    QGridLayout *grid = new QGridLayout;
     grid->addWidget(infoLabel, 0, 0, 1, 2);
     grid->addWidget(hostLabel, 1, 0);
     grid->addWidget(hostEdit, 1, 1);
@@ -52,11 +54,11 @@ DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(pa
     grid->addWidget(playernameLabel, 3, 0);
     grid->addWidget(playernameEdit, 3, 1);
 
-    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgForgotPasswordRequest::actOk);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgForgotPasswordRequest::reject);
 
-    auto *mainLayout = new QVBoxLayout;
+    QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(grid);
     mainLayout->addWidget(buttonBox);
     setLayout(mainLayout);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h b/cockatrice/src/dialogs/dlg_forgot_password_request.h
similarity index 73%
rename from cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
rename to cockatrice/src/dialogs/dlg_forgot_password_request.h
index e51dad810..8d267042a 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
+++ b/cockatrice/src/dialogs/dlg_forgot_password_request.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_forgot_password_request.h
- * @ingroup AccountDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_FORGOTPASSWORDREQUEST_H
 #define DLG_FORGOTPASSWORDREQUEST_H
 
@@ -20,15 +14,15 @@ class DlgForgotPasswordRequest : public QDialog
     Q_OBJECT
 public:
     explicit DlgForgotPasswordRequest(QWidget *parent = nullptr);
-    [[nodiscard]] QString getHost() const
+    QString getHost() const
     {
         return hostEdit->text();
     }
-    [[nodiscard]] int getPort() const
+    int getPort() const
     {
         return portEdit->text().toInt();
     }
-    [[nodiscard]] QString getPlayerName() const
+    QString getPlayerName() const
     {
         return playernameEdit->text();
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp
similarity index 97%
rename from cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
rename to cockatrice/src/dialogs/dlg_forgot_password_reset.cpp
index c9c41722e..81ab96b9b 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
+++ b/cockatrice/src/dialogs/dlg_forgot_password_reset.cpp
@@ -1,13 +1,15 @@
 #include "dlg_forgot_password_reset.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
+#include "trice_limits.h"
 
+#include <QCheckBox>
+#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/utility/trice_limits.h>
 
 DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent)
 {
@@ -121,7 +123,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/dialogs/dlg_forgot_password_reset.h
similarity index 72%
rename from cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
rename to cockatrice/src/dialogs/dlg_forgot_password_reset.h
index 3d110c71d..e523e19c3 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
+++ b/cockatrice/src/dialogs/dlg_forgot_password_reset.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_forgot_password_reset.h
- * @ingroup AccountDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_FORGOTPASSWORDRESET_H
 #define DLG_FORGOTPASSWORDRESET_H
 
@@ -20,23 +14,23 @@ class DlgForgotPasswordReset : public QDialog
     Q_OBJECT
 public:
     explicit DlgForgotPasswordReset(QWidget *parent = nullptr);
-    [[nodiscard]] QString getHost() const
+    QString getHost() const
     {
         return hostEdit->text();
     }
-    [[nodiscard]] int getPort() const
+    int getPort() const
     {
         return portEdit->text().toInt();
     }
-    [[nodiscard]] QString getPlayerName() const
+    QString getPlayerName() const
     {
         return playernameEdit->text();
     }
-    [[nodiscard]] QString getToken() const
+    QString getToken() const
     {
         return tokenEdit->text();
     }
-    [[nodiscard]] QString getPassword() const
+    QString getPassword() const
     {
         return newpasswordEdit->text();
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp b/cockatrice/src/dialogs/dlg_load_deck.cpp
similarity index 85%
rename from cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
rename to cockatrice/src/dialogs/dlg_load_deck.cpp
index b87800909..91252a768 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
+++ b/cockatrice/src/dialogs/dlg_load_deck.cpp
@@ -1,7 +1,7 @@
 #include "dlg_load_deck.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_loader.h"
+#include "../deck/deck_loader.h"
+#include "../settings/cache_settings.h"
 
 DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))
 {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h b/cockatrice/src/dialogs/dlg_load_deck.h
similarity index 75%
rename from cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
rename to cockatrice/src/dialogs/dlg_load_deck.h
index b103f6a56..13df97995 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
+++ b/cockatrice/src/dialogs/dlg_load_deck.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_load_deck.h
- * @ingroup LocalDeckStorageDialogs
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
 
 #ifndef DLG_LOAD_DECK_H
 #define DLG_LOAD_DECK_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp
similarity index 76%
rename from cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
rename to cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp
index 9ceb35d78..26f92f4e9 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
+++ b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp
@@ -1,8 +1,7 @@
 #include "dlg_load_deck_from_clipboard.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/card_node_function.h"
-#include "../../deck_loader/deck_loader.h"
+#include "../deck/deck_loader.h"
+#include "../settings/cache_settings.h"
 #include "dlg_settings.h"
 
 #include <QApplication>
@@ -14,7 +13,6 @@
 #include <QPushButton>
 #include <QTextStream>
 #include <QVBoxLayout>
-#include <libcockatrice/card/import/card_name_normalizer.h>
 
 /**
  * Creates the main layout and connects the signals that are common to all versions of this window
@@ -26,7 +24,7 @@ AbstractDlgDeckTextEdit::AbstractDlgDeckTextEdit(QWidget *parent) : QDialog(pare
     refreshButton = new QPushButton(tr("&Refresh"));
     connect(refreshButton, &QPushButton::clicked, this, &AbstractDlgDeckTextEdit::actRefresh);
 
-    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     buttonBox->addButton(refreshButton, QDialogButtonBox::ActionRole);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &AbstractDlgDeckTextEdit::actOK);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &AbstractDlgDeckTextEdit::reject);
@@ -67,26 +65,26 @@ void AbstractDlgDeckTextEdit::setText(const QString &text)
 }
 
 /**
- * Tries to load the current contents of the contentsEdit into the deckList
+ * Tries to load the current contents of the contentsEdit into the DeckLoader
  *
- * @param deckList The deckList to load the deck into
+ * @param deckLoader The DeckLoader to load the deck into
  * @return Whether the loading was successful
  */
-bool AbstractDlgDeckTextEdit::loadIntoDeck(DeckList &deckList) const
+bool AbstractDlgDeckTextEdit::loadIntoDeck(DeckLoader *deckLoader) const
 {
     QString buffer = contentsEdit->toPlainText();
 
     if (buffer.contains("<cockatrice_deck version=\"1\">")) {
-        return deckList.loadFromString_Native(buffer);
+        return deckLoader->loadFromString_Native(buffer);
     }
 
     QTextStream stream(&buffer);
 
-    if (deckList.loadFromStream_Plain(stream, true, CardNameNormalizer())) {
+    if (deckLoader->loadFromStream_Plain(stream, true)) {
         if (loadSetNameAndNumberCheckBox->isChecked()) {
-            deckList.forEachCard(CardNodeFunction::ResolveProviderId());
+            deckLoader->resolveSetNameAndNumberToProviderID();
         } else {
-            deckList.forEachCard(CardNodeFunction::ClearPrintingData());
+            deckLoader->clearSetNamesAndNumbers();
         }
         return true;
     }
@@ -109,7 +107,7 @@ void AbstractDlgDeckTextEdit::keyPressEvent(QKeyEvent *event)
  *
  * @param parent The parent widget
  */
-DlgLoadDeckFromClipboard::DlgLoadDeckFromClipboard(QWidget *parent) : AbstractDlgDeckTextEdit(parent)
+DlgLoadDeckFromClipboard::DlgLoadDeckFromClipboard(QWidget *parent) : AbstractDlgDeckTextEdit(parent), deckList(nullptr)
 {
     setWindowTitle(tr("Load deck from clipboard"));
 
@@ -123,6 +121,9 @@ void DlgLoadDeckFromClipboard::actRefresh()
 
 void DlgLoadDeckFromClipboard::actOK()
 {
+    deckList = new DeckLoader;
+    deckList->setParent(this);
+
     if (loadIntoDeck(deckList)) {
         accept();
     } else {
@@ -133,15 +134,18 @@ void DlgLoadDeckFromClipboard::actOK()
 /**
  * Creates the dialog window for the "Edit deck in clipboard" action
  *
- * @param _deckList The existing deck in the deck editor.
+ * @param deckList The existing deck in the deck editor. Copies the instance
  * @param _annotated Whether to add annotations to the text that is loaded from the deck
  * @param parent The parent widget
  */
-DlgEditDeckInClipboard::DlgEditDeckInClipboard(const DeckList &_deckList, bool _annotated, QWidget *parent)
-    : AbstractDlgDeckTextEdit(parent), deckList(_deckList), annotated(_annotated)
+DlgEditDeckInClipboard::DlgEditDeckInClipboard(const DeckLoader &deckList, bool _annotated, QWidget *parent)
+    : AbstractDlgDeckTextEdit(parent), annotated(_annotated)
 {
     setWindowTitle(tr("Edit deck in clipboard"));
 
+    deckLoader = new DeckLoader(deckList);
+    deckLoader->setParent(this);
+
     DlgEditDeckInClipboard::actRefresh();
 }
 
@@ -151,22 +155,22 @@ DlgEditDeckInClipboard::DlgEditDeckInClipboard(const DeckList &_deckList, bool _
  * @param addComments Whether to add annotations
  * @return A QString
  */
-static QString deckListToString(const DeckList &deckList, bool addComments)
+static QString deckListToString(const DeckLoader *deckList, bool addComments)
 {
     QString buffer;
     QTextStream stream(&buffer);
-    DeckLoader::saveToStream_Plain(stream, deckList, addComments);
+    deckList->saveToStream_Plain(stream, addComments);
     return buffer;
 }
 
 void DlgEditDeckInClipboard::actRefresh()
 {
-    setText(deckListToString(deckList, annotated));
+    setText(deckListToString(deckLoader, annotated));
 }
 
 void DlgEditDeckInClipboard::actOK()
 {
-    if (loadIntoDeck(deckList)) {
+    if (loadIntoDeck(deckLoader)) {
         accept();
     } else {
         QMessageBox::critical(this, tr("Error"), tr("Invalid deck list."));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.h
similarity index 70%
rename from cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
rename to cockatrice/src/dialogs/dlg_load_deck_from_clipboard.h
index 0e59653ea..ce2ccf720 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
+++ b/cockatrice/src/dialogs/dlg_load_deck_from_clipboard.h
@@ -1,18 +1,10 @@
-/**
- * @file dlg_load_deck_from_clipboard.h
- * @ingroup LocalDeckStorageDialogs
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_LOAD_DECK_FROM_CLIPBOARD_H
 #define DLG_LOAD_DECK_FROM_CLIPBOARD_H
 
-#include "../../deck_loader/loaded_deck.h"
-
 #include <QCheckBox>
 #include <QDialog>
 
+class DeckLoader;
 class QPlainTextEdit;
 class QPushButton;
 
@@ -36,13 +28,15 @@ public:
     /**
      * Gets the loaded deck. Only call this method after this dialog window has been successfully exec'd.
      *
-     * @return The loaded decklist
+     * The returned DeckLoader is parented to this object; make sure to take ownership of the DeckLoader if you intend
+     * to use it, since otherwise it will get destroyed once this dlg is destroyed
+     * @return The DeckLoader
      */
-    [[nodiscard]] virtual const DeckList &getDeckList() = 0;
+    virtual DeckLoader *getDeckList() const = 0;
 
 protected:
     void setText(const QString &text);
-    bool loadIntoDeck(DeckList &deckList) const;
+    bool loadIntoDeck(DeckLoader *deckLoader) const;
     void keyPressEvent(QKeyEvent *event) override;
 
 protected slots:
@@ -61,12 +55,12 @@ protected slots:
     void actRefresh() override;
 
 private:
-    DeckList deckList;
+    DeckLoader *deckList;
 
 public:
     explicit DlgLoadDeckFromClipboard(QWidget *parent = nullptr);
 
-    [[nodiscard]] const DeckList &getDeckList() override
+    DeckLoader *getDeckList() const override
     {
         return deckList;
     }
@@ -83,15 +77,15 @@ protected slots:
     void actRefresh() override;
 
 private:
-    DeckList deckList;
+    DeckLoader *deckLoader;
     bool annotated;
 
 public:
-    explicit DlgEditDeckInClipboard(const DeckList &_deckList, bool _annotated, QWidget *parent = nullptr);
+    explicit DlgEditDeckInClipboard(const DeckLoader &deckList, bool _annotated, QWidget *parent = nullptr);
 
-    [[nodiscard]] const DeckList &getDeckList() override
+    DeckLoader *getDeckList() const override
     {
-        return deckList;
+        return deckLoader;
     }
 };
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp b/cockatrice/src/dialogs/dlg_load_deck_from_website.cpp
similarity index 92%
rename from cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
rename to cockatrice/src/dialogs/dlg_load_deck_from_website.cpp
index ba00873d9..44a4432c7 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
+++ b/cockatrice/src/dialogs/dlg_load_deck_from_website.cpp
@@ -8,8 +8,6 @@
 #include <QJsonObject>
 #include <QMessageBox>
 #include <QNetworkReply>
-#include <libcockatrice/card/import/card_name_normalizer.h>
-#include <version_string.h>
 
 DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent)
 {
@@ -69,7 +67,6 @@ void DlgLoadDeckFromWebsite::accept()
         }
 
         QNetworkRequest request(QUrl(info.fullUrl));
-        request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
         QNetworkReply *reply = nam->get(request);
 
         QEventLoop loop;
@@ -98,11 +95,11 @@ void DlgLoadDeckFromWebsite::accept()
             }
 
             // Parse the plain text deck here
-            DeckList deckList;
+            DeckLoader *loader = new DeckLoader();
             QTextStream stream(&deckText);
-            deckList.loadFromStream_Plain(stream, false, CardNameNormalizer());
-            deckList.forEachCard(CardNodeFunction::ResolveProviderId());
-            deck = deckList;
+            loader->loadFromStream_Plain(stream, false);
+            loader->resolveSetNameAndNumberToProviderID();
+            deck = loader;
 
             QDialog::accept();
             return;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h b/cockatrice/src/dialogs/dlg_load_deck_from_website.h
similarity index 80%
rename from cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h
rename to cockatrice/src/dialogs/dlg_load_deck_from_website.h
index 1ac98d206..5810c8ecc 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.h
+++ b/cockatrice/src/dialogs/dlg_load_deck_from_website.h
@@ -1,10 +1,3 @@
-/**
- * @file dlg_load_deck_from_website.h
- * @ingroup RemoteDeckStorageDialogs
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_LOAD_DECK_FROM_WEBSITE_H
 #define DLG_LOAD_DECK_FROM_WEBSITE_H
 
@@ -14,7 +7,6 @@
 #include <QDialog>
 #include <QLabel>
 #include <QLineEdit>
-#include <QLoggingCategory>
 #include <QNetworkAccessManager>
 #include <QVBoxLayout>
 
@@ -27,9 +19,9 @@ public:
     explicit DlgLoadDeckFromWebsite(QWidget *parent);
     void retranslateUi();
     bool testValidUrl();
-    DeckList deck;
+    DeckLoader *deck;
 
-    const DeckList &getDeck() const
+    DeckLoader *getDeck()
     {
         return deck;
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp b/cockatrice/src/dialogs/dlg_load_remote_deck.cpp
similarity index 90%
rename from cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
rename to cockatrice/src/dialogs/dlg_load_remote_deck.cpp
index ffe08bec9..5e2823b57 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
+++ b/cockatrice/src/dialogs/dlg_load_remote_deck.cpp
@@ -1,8 +1,10 @@
 #include "dlg_load_remote_deck.h"
 
-#include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
+#include "../main.h"
+#include "../server/remote/remote_decklist_tree_widget.h"
 
 #include <QDialogButtonBox>
+#include <QHBoxLayout>
 #include <QPushButton>
 #include <QVBoxLayout>
 
@@ -16,7 +18,7 @@ DlgLoadRemoteDeck::DlgLoadRemoteDeck(AbstractClient *_client, QWidget *parent) :
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgLoadRemoteDeck::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgLoadRemoteDeck::reject);
 
-    auto *mainLayout = new QVBoxLayout;
+    QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addWidget(dirView);
     mainLayout->addWidget(buttonBox);
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h b/cockatrice/src/dialogs/dlg_load_remote_deck.h
similarity index 76%
rename from cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
rename to cockatrice/src/dialogs/dlg_load_remote_deck.h
index b7e0d7aa3..54be44c77 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
+++ b/cockatrice/src/dialogs/dlg_load_remote_deck.h
@@ -1,10 +1,3 @@
-/**
- * @file dlg_load_remote_deck.h
- * @ingroup RemoteDeckStorageDialogs
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_STARTGAME_H
 #define DLG_STARTGAME_H
 
@@ -28,7 +21,7 @@ private slots:
 
 public:
     explicit DlgLoadRemoteDeck(AbstractClient *_client, QWidget *parent = nullptr);
-    [[nodiscard]] int getDeckId() const;
+    int getDeckId() const;
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp
similarity index 93%
rename from cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
rename to cockatrice/src/dialogs/dlg_manage_sets.cpp
index a4f54564f..890afc075 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp
@@ -1,11 +1,15 @@
 #include "dlg_manage_sets.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../interface/card_picture_loader/card_picture_loader.h"
-#include "../interface/widgets/utility/custom_line_edit.h"
+#include "../client/network/sets_model.h"
+#include "../database/card_database_manager.h"
+#include "../deck/custom_line_edit.h"
+#include "../main.h"
+#include "../picture_loader/picture_loader.h"
+#include "../settings/cache_settings.h"
 
 #include <QAction>
 #include <QCheckBox>
+#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
@@ -13,12 +17,13 @@
 #include <QHeaderView>
 #include <QItemSelection>
 #include <QLabel>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QToolBar>
 #include <QTreeView>
 #include <algorithm>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/database/card_set/card_sets_model.h>
+
+#define SORT_RESET -1
 
 WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
 {
@@ -95,6 +100,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     view->setDropIndicatorShown(true);
     view->setDragDropMode(QAbstractItemView::InternalMove);
 
+    view->sortByColumn(SetsModel::SortKeyCol, Qt::AscendingOrder);
     view->setColumnHidden(SetsModel::SortKeyCol, true);
     view->setColumnHidden(SetsModel::IsKnownCol, true);
     view->setColumnHidden(SetsModel::PriorityCol, true);
@@ -186,17 +192,17 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
 
     setWindowTitle(tr("Manage sets"));
     setMinimumSize(800, 500);
-    auto geometry = SettingsCache::instance().layouts().getSetsDialogGeometry();
+    auto &geometry = SettingsCache::instance().getSetsDialogGeometry();
     if (!geometry.isEmpty()) {
         restoreGeometry(geometry);
     }
-    auto headerState = SettingsCache::instance().layouts().getSetsDialogHeaderState();
+    auto &headerState = SettingsCache::instance().layouts().getSetsDialogHeaderState();
     if (!headerState.isEmpty()) {
         view->header()->restoreState(headerState);
+        view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
     } else {
         view->header()->resizeSections(QHeaderView::ResizeToContents);
     }
-    resetSort();
     connect(view->header(), &QHeaderView::geometriesChanged, this, &WndSets::saveHeaderState);
 }
 
@@ -206,7 +212,7 @@ WndSets::~WndSets()
 
 void WndSets::closeEvent(QCloseEvent * /*ev*/)
 {
-    SettingsCache::instance().layouts().setSetsDialogGeometry(saveGeometry());
+    SettingsCache::instance().setSetsDialogGeometry(saveGeometry());
 }
 
 void WndSets::saveHeaderState()
@@ -236,13 +242,6 @@ void WndSets::rebuildMainLayout(int actionToTake)
     }
 }
 
-void WndSets::resetSort()
-{
-    view->sortByColumn(SetsModel::SortKeyCol, Qt::AscendingOrder);
-    sortIndex = -1;
-    sortWarning->setVisible(false);
-}
-
 void WndSets::includeRebalancedCardsChanged(bool _includeRebalancedCards)
 {
     includeRebalancedCards = _includeRebalancedCards;
@@ -252,7 +251,7 @@ void WndSets::actSave()
 {
     model->save(CardDatabaseManager::getInstance());
     SettingsCache::instance().setIncludeRebalancedCards(includeRebalancedCards);
-    CardPictureLoader::clearPixmapCache();
+    PictureLoader::clearPixmapCache();
     close();
 }
 
@@ -264,9 +263,9 @@ void WndSets::actRestore()
 
 void WndSets::actRestoreOriginalOrder()
 {
+    view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
     model->restoreOriginalOrder();
-    view->selectionModel()->reset();
-    resetSort();
+    sortWarning->setVisible(false);
 }
 
 void WndSets::actDisableResetButton(const QString &filterString)
@@ -292,12 +291,11 @@ void WndSets::actSort(int index)
             sortIndex = index;
             sortWarning->setVisible(true);
         } else {
-            resetSort();
+            view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
+            sortIndex = -1;
+            sortWarning->setVisible(false);
         }
     }
-    if (!view->selectionModel()->selection().empty()) {
-        view->scrollTo(view->selectionModel()->selectedRows().first());
-    }
 }
 
 void WndSets::actIgnoreWarning()
@@ -306,18 +304,23 @@ void WndSets::actIgnoreWarning()
         return;
     }
     model->sort(sortIndex, sortOrder);
-    resetSort();
+    view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
+    sortIndex = -1;
+    sortWarning->setVisible(false);
 }
 
 void WndSets::actDisableSortButtons(int index)
 {
-    if (index != SetsModel::SortKeyCol) {
+    if (index != SORT_RESET) {
         view->setDragEnabled(false);
         setOrderIsSorted = true;
     } else {
         setOrderIsSorted = false;
         view->setDragEnabled(true);
     }
+    if (!view->selectionModel()->selection().empty()) {
+        view->scrollTo(view->selectionModel()->selectedRows().first());
+    }
     actToggleButtons(view->selectionModel()->selection(), QItemSelection());
 }
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h b/cockatrice/src/dialogs/dlg_manage_sets.h
similarity index 94%
rename from cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
rename to cockatrice/src/dialogs/dlg_manage_sets.h
index d9b77a76e..50e29043b 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
+++ b/cockatrice/src/dialogs/dlg_manage_sets.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_manage_sets.h
- * @ingroup Dialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_MANAGE_SETS_H
 #define DLG_MANAGE_SETS_H
 
@@ -11,6 +5,7 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QMainWindow>
+#include <QSet>
 
 class CardDatabase;
 class LineEditUnfocusable;
@@ -45,6 +40,9 @@ private:
     QHBoxLayout *filterBox;
     int sortIndex;
     Qt::SortOrder sortOrder;
+    void closeEvent(QCloseEvent *ev) override;
+    void saveHeaderState();
+    void rebuildMainLayout(int actionToTake);
     bool setOrderIsSorted;
     bool includeRebalancedCards;
     enum
@@ -53,11 +51,6 @@ private:
         SOME_SETS_SELECTED
     };
 
-    void closeEvent(QCloseEvent *ev) override;
-    void saveHeaderState();
-    void rebuildMainLayout(int actionToTake);
-    void resetSort();
-
 public:
     explicit WndSets(QWidget *parent = nullptr);
     ~WndSets() override;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp b/cockatrice/src/dialogs/dlg_register.cpp
similarity index 98%
rename from cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
rename to cockatrice/src/dialogs/dlg_register.cpp
index a3f232d9b..05c73179e 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
+++ b/cockatrice/src/dialogs/dlg_register.cpp
@@ -1,14 +1,16 @@
 #include "dlg_register.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
+#include "pb/serverinfo_user.pb.h"
+#include "trice_limits.h"
 
 #include <QCheckBox>
+#include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/utility/trice_limits.h>
 
 DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
 {
@@ -319,7 +321,7 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
     realnameEdit->setMaxLength(MAX_NAME_LENGTH);
     realnameLabel->setBuddy(realnameEdit);
 
-    auto *grid = new QGridLayout;
+    QGridLayout *grid = new QGridLayout;
     grid->addWidget(infoLabel, 0, 0, 1, 2);
     grid->addWidget(hostLabel, 1, 0);
     grid->addWidget(hostEdit, 1, 1);
@@ -340,11 +342,11 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
     grid->addWidget(realnameLabel, 10, 0);
     grid->addWidget(realnameEdit, 10, 1);
 
-    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgRegister::actOk);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgRegister::reject);
 
-    auto *mainLayout = new QVBoxLayout;
+    QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(grid);
     mainLayout->addWidget(buttonBox);
     setLayout(mainLayout);
@@ -356,7 +358,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/dialogs/dlg_register.h
similarity index 73%
rename from cockatrice/src/interface/widgets/dialogs/dlg_register.h
rename to cockatrice/src/dialogs/dlg_register.h
index bebbfc500..1d87212bf 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.h
+++ b/cockatrice/src/dialogs/dlg_register.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_register.h
- * @ingroup AccountDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_REGISTER_H
 #define DLG_REGISTER_H
 
@@ -20,31 +14,31 @@ class DlgRegister : public QDialog
     Q_OBJECT
 public:
     explicit DlgRegister(QWidget *parent = nullptr);
-    [[nodiscard]] QString getHost() const
+    QString getHost() const
     {
         return hostEdit->text();
     }
-    [[nodiscard]] int getPort() const
+    int getPort() const
     {
         return portEdit->text().toInt();
     }
-    [[nodiscard]] QString getPlayerName() const
+    QString getPlayerName() const
     {
         return playernameEdit->text();
     }
-    [[nodiscard]] QString getPassword() const
+    QString getPassword() const
     {
         return passwordEdit->text();
     }
-    [[nodiscard]] QString getEmail() const
+    QString getEmail() const
     {
         return emailEdit->text();
     }
-    [[nodiscard]] QString getCountry() const
+    QString getCountry() const
     {
         return countryEdit->currentIndex() == 0 ? "" : countryEdit->currentText();
     }
-    [[nodiscard]] QString getRealName() const
+    QString getRealName() const
     {
         return realnameEdit->text();
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
similarity index 79%
rename from cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
rename to cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
index 5d9e2679c..9f20067b2 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
+++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp
@@ -1,10 +1,10 @@
 #include "dlg_select_set_for_cards.h"
 
-#include "../../deck_loader/card_node_function.h"
-#include "../../deck_loader/deck_loader.h"
-#include "../deck_editor/deck_state_manager.h"
+#include "../database/card_database_manager.h"
+#include "../deck/deck_loader.h"
 #include "../interface/widgets/cards/card_info_picture_widget.h"
 #include "../interface/widgets/general/layout_containers/flow_widget.h"
+#include "dlg_select_set_for_cards.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
@@ -15,15 +15,12 @@
 #include <QPushButton>
 #include <QScrollBar>
 #include <QSplitter>
-#include <QTimer>
 #include <QVBoxLayout>
 #include <algorithm>
-#include <libcockatrice/card/database/card_database_manager.h>
 #include <qdrag.h>
 #include <qevent.h>
 
-DlgSelectSetForCards::DlgSelectSetForCards(QWidget *parent, DeckStateManager *deckStateManger)
-    : QDialog(parent), deckStateManager(deckStateManger)
+DlgSelectSetForCards::DlgSelectSetForCards(QWidget *parent, DeckListModel *_model) : QDialog(parent), model(_model)
 {
     setMinimumSize(500, 500);
     setAcceptDrops(true);
@@ -145,61 +142,34 @@ void DlgSelectSetForCards::retranslateUi()
     setAllToPreferredButton->setText(tr("Set all to preferred"));
 }
 
-static bool swapPrinting(DeckListModel *model, const QString &modifiedSet, const QString &cardName)
-{
-    QModelIndex idx = model->findCard(cardName, DECK_ZONE_MAIN);
-    if (!idx.isValid()) {
-        return false;
-    }
-    int amount = model->data(idx.siblingAtColumn(DeckListModelColumns::CARD_AMOUNT), Qt::DisplayRole).toInt();
-    model->removeCardAtIndex(idx);
-    CardInfoPtr cardInfo = CardDatabaseManager::query()->getCardInfo(cardName);
-    PrintingInfo printing = CardDatabaseManager::query()->getSpecificPrinting(cardName, modifiedSet, "");
-    for (int i = 0; i < amount; i++) {
-        model->addCard(ExactCard(cardInfo, printing), DECK_ZONE_MAIN);
-    }
-    return true;
-}
-
 void DlgSelectSetForCards::actOK()
 {
     QMap<QString, QStringList> modifiedSetsAndCardsMap = getModifiedCards();
-
-    if (modifiedSetsAndCardsMap.isEmpty()) {
-        accept(); // Nothing to do
-        return;
-    }
-
-    auto bulkModify = [&modifiedSetsAndCardsMap](DeckListModel *model) {
-        for (QString modifiedSet : modifiedSetsAndCardsMap.keys()) {
-            for (QString card : modifiedSetsAndCardsMap.value(modifiedSet)) {
-                swapPrinting(model, modifiedSet, card);
+    for (QString modifiedSet : modifiedSetsAndCardsMap.keys()) {
+        for (QString card : modifiedSetsAndCardsMap.value(modifiedSet)) {
+            QModelIndex find_card = model->findCard(card, DECK_ZONE_MAIN);
+            if (!find_card.isValid()) {
+                continue;
             }
+            model->removeRow(find_card.row(), find_card.parent());
+            CardInfoPtr cardInfo = CardDatabaseManager::query()->getCardInfo(card);
+            PrintingInfo printing = CardDatabaseManager::query()->getSpecificPrinting(card, modifiedSet, "");
+            model->addCard(ExactCard(cardInfo, printing), DECK_ZONE_MAIN);
         }
-        return true;
-    };
-
-    deckStateManager->modifyDeck(tr("Bulk modified printings."), bulkModify);
-
+    }
     accept();
 }
 
 void DlgSelectSetForCards::actClear()
 {
-    deckStateManager->modifyDeck(tr("Cleared all printing information."), [](auto model) {
-        model->forEachCard(CardNodeFunction::ClearPrintingData());
-        return true;
-    });
+    model->getDeckList()->clearSetNamesAndNumbers();
     accept();
 }
 
 void DlgSelectSetForCards::actSetAllToPreferred()
 {
-    deckStateManager->modifyDeck(tr("Set all printings to preferred."), [](auto model) {
-        model->forEachCard(CardNodeFunction::ClearPrintingData());
-        model->forEachCard(CardNodeFunction::SetProviderIdToPreferred());
-        return true;
-    });
+    model->getDeckList()->clearSetNamesAndNumbers();
+    model->getDeckList()->setProviderIdToPreferredPrinting();
     accept();
 }
 
@@ -232,20 +202,37 @@ void DlgSelectSetForCards::sortSetsByCount()
 QMap<QString, int> DlgSelectSetForCards::getSetsForCards()
 {
     QMap<QString, int> setCounts;
+    if (!model)
+        return setCounts;
 
-    QList<QString> cardNames = deckStateManager->getModel()->getCardNames();
+    DeckList *decklist = model->getDeckList();
+    if (!decklist)
+        return setCounts;
 
-    for (auto cardName : cardNames) {
-        CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(cardName);
-        if (!infoPtr)
+    InnerDecklistNode *listRoot = decklist->getRoot();
+    if (!listRoot)
+        return setCounts;
+
+    for (auto *i : *listRoot) {
+        auto *countCurrentZone = dynamic_cast<InnerDecklistNode *>(i);
+        if (!countCurrentZone)
             continue;
 
-        SetToPrintingsMap setMap = infoPtr->getSets();
-        for (auto &setName : setMap.keys()) {
-            setCounts[setName]++;
+        for (auto *cardNode : *countCurrentZone) {
+            auto *currentCard = dynamic_cast<DecklistCardNode *>(cardNode);
+            if (!currentCard)
+                continue;
+
+            CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
+            if (!infoPtr)
+                continue;
+
+            SetToPrintingsMap setMap = infoPtr->getSets();
+            for (auto &setName : setMap.keys()) {
+                setCounts[setName]++;
+            }
         }
     }
-
     return setCounts;
 }
 
@@ -272,36 +259,52 @@ void DlgSelectSetForCards::updateCardLists()
         }
     }
 
-    QList<QString> cardNames = deckStateManager->getModel()->getCardNames();
+    DeckList *decklist = model->getDeckList();
+    if (!decklist)
+        return;
 
-    for (auto cardName : cardNames) {
-        bool found = false;
-        QString foundSetName;
+    InnerDecklistNode *listRoot = decklist->getRoot();
+    if (!listRoot)
+        return;
 
-        // Check across all sets if the card is present
-        for (auto it = selectedCardsBySet.begin(); it != selectedCardsBySet.end(); ++it) {
-            if (it.value().contains(cardName)) {
-                found = true;
-                foundSetName = it.key(); // Store the set name where it was found
-                break;                   // Stop at the first match
+    for (auto *i : *listRoot) {
+        auto *countCurrentZone = dynamic_cast<InnerDecklistNode *>(i);
+        if (!countCurrentZone)
+            continue;
+
+        for (auto *cardNode : *countCurrentZone) {
+            auto *currentCard = dynamic_cast<DecklistCardNode *>(cardNode);
+            if (!currentCard)
+                continue;
+
+            bool found = false;
+            QString foundSetName;
+
+            // Check across all sets if the card is present
+            for (auto it = selectedCardsBySet.begin(); it != selectedCardsBySet.end(); ++it) {
+                if (it.value().contains(currentCard->getName())) {
+                    found = true;
+                    foundSetName = it.key(); // Store the set name where it was found
+                    break;                   // Stop at the first match
+                }
             }
-        }
 
-        if (!found) {
-            // The card was not in any selected set
-            ExactCard card = CardDatabaseManager::query()->getCard({cardName});
-            CardInfoPictureWidget *picture_widget = new CardInfoPictureWidget(uneditedCardsFlowWidget);
-            picture_widget->setCard(card);
-            uneditedCardsFlowWidget->addWidget(picture_widget);
-        } else {
-            ExactCard card =
-                CardDatabaseManager::query()->getCard({cardName, CardDatabaseManager::getInstance()
-                                                                     ->query()
-                                                                     ->getSpecificPrinting(cardName, foundSetName, "")
-                                                                     .getUuid()});
-            CardInfoPictureWidget *picture_widget = new CardInfoPictureWidget(modifiedCardsFlowWidget);
-            picture_widget->setCard(card);
-            modifiedCardsFlowWidget->addWidget(picture_widget);
+            if (!found) {
+                // The card was not in any selected set
+                ExactCard card = CardDatabaseManager::query()->getCard({currentCard->getName()});
+                CardInfoPictureWidget *picture_widget = new CardInfoPictureWidget(uneditedCardsFlowWidget);
+                picture_widget->setCard(card);
+                uneditedCardsFlowWidget->addWidget(picture_widget);
+            } else {
+                ExactCard card = CardDatabaseManager::query()->getCard(
+                    {currentCard->getName(), CardDatabaseManager::getInstance()
+                                                 ->query()
+                                                 ->getSpecificPrinting(currentCard->getName(), foundSetName, "")
+                                                 .getUuid()});
+                CardInfoPictureWidget *picture_widget = new CardInfoPictureWidget(modifiedCardsFlowWidget);
+                picture_widget->setCard(card);
+                modifiedCardsFlowWidget->addWidget(picture_widget);
+            }
         }
     }
 }
@@ -354,20 +357,37 @@ void DlgSelectSetForCards::dropEvent(QDropEvent *event)
 QMap<QString, QStringList> DlgSelectSetForCards::getCardsForSets()
 {
     QMap<QString, QStringList> setCards;
+    if (!model)
+        return setCards;
 
-    QList<QString> cardNames = deckStateManager->getModel()->getCardNames();
+    DeckList *decklist = model->getDeckList();
+    if (!decklist)
+        return setCards;
 
-    for (auto cardName : cardNames) {
-        CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(cardName);
-        if (!infoPtr)
+    InnerDecklistNode *listRoot = decklist->getRoot();
+    if (!listRoot)
+        return setCards;
+
+    for (auto *i : *listRoot) {
+        auto *countCurrentZone = dynamic_cast<InnerDecklistNode *>(i);
+        if (!countCurrentZone)
             continue;
 
-        SetToPrintingsMap setMap = infoPtr->getSets();
-        for (auto it = setMap.begin(); it != setMap.end(); ++it) {
-            setCards[it.key()].append(cardName);
+        for (auto *cardNode : *countCurrentZone) {
+            auto *currentCard = dynamic_cast<DecklistCardNode *>(cardNode);
+            if (!currentCard)
+                continue;
+
+            CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
+            if (!infoPtr)
+                continue;
+
+            SetToPrintingsMap setMap = infoPtr->getSets();
+            for (auto it = setMap.begin(); it != setMap.end(); ++it) {
+                setCards[it.key()].append(currentCard->getName());
+            }
         }
     }
-
     return setCards;
 }
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/dialogs/dlg_select_set_for_cards.h
similarity index 86%
rename from cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
rename to cockatrice/src/dialogs/dlg_select_set_for_cards.h
index 795366b57..8b7b79a9f 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
+++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.h
@@ -1,12 +1,7 @@
-/**
- * @file dlg_select_set_for_cards.h
- * @ingroup Dialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_SELECT_SET_FOR_CARDS_H
 #define DLG_SELECT_SET_FOR_CARDS_H
 
+#include "../deck/deck_list_model.h"
 #include "../interface/widgets/general/layout_containers/flow_widget.h"
 
 #include <QCheckBox>
@@ -16,9 +11,7 @@
 #include <QMap>
 #include <QScrollArea>
 #include <QVBoxLayout>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
-class DeckStateManager;
 class SetEntryWidget; // Forward declaration
 
 class DlgSelectSetForCards : public QDialog
@@ -26,7 +19,7 @@ class DlgSelectSetForCards : public QDialog
     Q_OBJECT
 
 public:
-    explicit DlgSelectSetForCards(QWidget *parent, DeckStateManager *deckStateManager);
+    explicit DlgSelectSetForCards(QWidget *parent, DeckListModel *_model);
     void retranslateUi();
     void sortSetsByCount();
     QMap<QString, QStringList> getCardsForSets();
@@ -38,7 +31,6 @@ public:
 signals:
     void widgetOrderChanged();
     void orderChanged();
-    void deckModified();
 
 public slots:
     void actOK();
@@ -61,7 +53,7 @@ private:
     QLabel *modifiedCardsLabel;
     QWidget *listContainer;
     QListWidget *listWidget;
-    DeckStateManager *deckStateManager;
+    DeckListModel *model;
     QMap<QString, SetEntryWidget *> setEntries;
     QPushButton *clearButton;
     QPushButton *setAllToPreferredButton;
@@ -80,7 +72,7 @@ public:
     QStringList getAllCardsForSet();
     void populateCardList();
     void updateCardDisplayWidgets();
-    [[nodiscard]] bool isChecked() const;
+    bool isChecked() const;
     DlgSelectSetForCards *parent;
     QString setName;
     bool expanded;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp
similarity index 94%
rename from cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
rename to cockatrice/src/dialogs/dlg_settings.cpp
index 6238bc80b..6948a8e8b 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/dialogs/dlg_settings.cpp
@@ -1,21 +1,22 @@
 #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/get_text_with_max.h"
+#include "../client/network/release_channel.h"
+#include "../client/network/spoiler_background_updater.h"
 #include "../client/sound_engine.h"
-#include "../interface/card_picture_loader/card_picture_loader.h"
+#include "../database/card_database.h"
+#include "../database/card_database_manager.h"
+#include "../deck/custom_line_edit.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 "override_printing_warning.h"
+#include "../picture_loader/picture_loader.h"
+#include "../settings/cache_settings.h"
+#include "../settings/card_counter_settings.h"
+#include "../settings/shortcut_treeview.h"
+#include "../tabs/tab_supervisor.h"
+#include "../utility/sequence_edit.h"
 
-#include <../../client/settings/card_counter_settings.h>
 #include <QAbstractButton>
 #include <QAbstractListModel>
 #include <QAction>
@@ -37,6 +38,7 @@
 #include <QListWidget>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QRadioButton>
 #include <QScreen>
 #include <QScrollArea>
 #include <QScrollBar>
@@ -46,8 +48,6 @@
 #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"
@@ -141,38 +141,38 @@ GeneralSettingsPage::GeneralSettingsPage()
 
     deckPathEdit = new QLineEdit(settings.getDeckPath());
     deckPathEdit->setReadOnly(true);
-    auto *deckPathButton = new QPushButton("...");
+    QPushButton *deckPathButton = new QPushButton("...");
     connect(deckPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::deckPathButtonClicked);
 
     filtersPathEdit = new QLineEdit(settings.getFiltersPath());
     filtersPathEdit->setReadOnly(true);
-    auto *filtersPathButton = new QPushButton("...");
+    QPushButton *filtersPathButton = new QPushButton("...");
     connect(filtersPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::filtersPathButtonClicked);
 
     replaysPathEdit = new QLineEdit(settings.getReplaysPath());
     replaysPathEdit->setReadOnly(true);
-    auto *replaysPathButton = new QPushButton("...");
+    QPushButton *replaysPathButton = new QPushButton("...");
     connect(replaysPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::replaysPathButtonClicked);
 
     picsPathEdit = new QLineEdit(settings.getPicsPath());
     picsPathEdit->setReadOnly(true);
-    auto *picsPathButton = new QPushButton("...");
+    QPushButton *picsPathButton = new QPushButton("...");
     connect(picsPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::picsPathButtonClicked);
 
     cardDatabasePathEdit = new QLineEdit(settings.getCardDatabasePath());
     cardDatabasePathEdit->setReadOnly(true);
-    auto *cardDatabasePathButton = new QPushButton("...");
+    QPushButton *cardDatabasePathButton = new QPushButton("...");
     connect(cardDatabasePathButton, &QPushButton::clicked, this, &GeneralSettingsPage::cardDatabasePathButtonClicked);
 
     customCardDatabasePathEdit = new QLineEdit(settings.getCustomCardDatabasePath());
     customCardDatabasePathEdit->setReadOnly(true);
-    auto *customCardDatabasePathButton = new QPushButton("...");
+    QPushButton *customCardDatabasePathButton = new QPushButton("...");
     connect(customCardDatabasePathButton, &QPushButton::clicked, this,
             &GeneralSettingsPage::customCardDatabaseButtonClicked);
 
     tokenDatabasePathEdit = new QLineEdit(settings.getTokenDatabasePath());
     tokenDatabasePathEdit->setReadOnly(true);
-    auto *tokenDatabasePathButton = new QPushButton("...");
+    QPushButton *tokenDatabasePathButton = new QPushButton("...");
     connect(tokenDatabasePathButton, &QPushButton::clicked, this, &GeneralSettingsPage::tokenDatabasePathButtonClicked);
 
     // Required init here to avoid crashing on Portable builds
@@ -439,7 +439,6 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     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);
@@ -448,12 +447,6 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     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);
@@ -462,8 +455,6 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     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);
@@ -472,13 +463,8 @@ AppearanceSettingsPage::AppearanceSettingsPage()
     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);
@@ -492,8 +478,8 @@ AppearanceSettingsPage::AppearanceSettingsPage()
             &SettingsCache::setAutoRotateSidewaysLayoutCards);
 
     overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(settings.getOverrideAllCardArtWithPersonalPreference());
-    connect(&overrideAllCardArtWithPersonalPreferenceCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
-            &AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled);
+    connect(&overrideAllCardArtWithPersonalPreferenceCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
+            &SettingsCache::setOverrideAllCardArtWithPersonalPreference);
 
     bumpSetsWithCardsInDeckToTopCheckBox.setChecked(settings.getBumpSetsWithCardsInDeckToTop());
     connect(&bumpSetsWithCardsInDeckToTopCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
@@ -660,39 +646,12 @@ void AppearanceSettingsPage::openThemeLocation()
     }
 }
 
-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
@@ -727,17 +686,16 @@ void AppearanceSettingsPage::retranslateUi()
     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)"));
+        tr("Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client "
+           "restart]"));
     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"));
@@ -805,10 +763,6 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
     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);
@@ -821,14 +775,6 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
     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); });
@@ -837,13 +783,10 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage()
     generalGrid->addWidget(&doubleClickToPlayCheckBox, 0, 0);
     generalGrid->addWidget(&clickPlaysAllSelectedCheckBox, 1, 0);
     generalGrid->addWidget(&playToStackCheckBox, 2, 0);
-    generalGrid->addWidget(&doNotDeleteArrowsInSubPhasesCheckBox, 3, 0);
-    generalGrid->addWidget(&closeEmptyCardViewCheckBox, 4, 0);
-    generalGrid->addWidget(&focusCardViewSearchBarCheckBox, 5, 0);
-    generalGrid->addWidget(&annotateTokensCheckBox, 6, 0);
-    generalGrid->addWidget(&showDragSelectionCountCheckBox, 7, 0);
-    generalGrid->addWidget(&showTotalSelectionCountCheckBox, 8, 0);
-    generalGrid->addWidget(&useTearOffMenusCheckBox, 9, 0);
+    generalGrid->addWidget(&closeEmptyCardViewCheckBox, 3, 0);
+    generalGrid->addWidget(&focusCardViewSearchBarCheckBox, 4, 0);
+    generalGrid->addWidget(&annotateTokensCheckBox, 5, 0);
+    generalGrid->addWidget(&useTearOffMenusCheckBox, 6, 0);
 
     generalGroupBox = new QGroupBox;
     generalGroupBox->setLayout(generalGrid);
@@ -961,12 +904,9 @@ void UserInterfaceSettingsPage::retranslateUi()
     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"));
@@ -1146,7 +1086,7 @@ void DeckEditorSettingsPage::resetDownloadedURLsButtonClicked()
 
 void DeckEditorSettingsPage::clearDownloadedPicsButtonClicked()
 {
-    CardPictureLoader::clearNetworkCache();
+    PictureLoader::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'
@@ -1785,7 +1725,7 @@ 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);
@@ -1930,7 +1870,7 @@ void DlgSettings::closeEvent(QCloseEvent *event)
     }
 
     if (!QDir(SettingsCache::instance().getDeckPath()).exists() || SettingsCache::instance().getDeckPath().isEmpty()) {
-        //! \todo Prompt to create it
+        // 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?"),
@@ -1941,7 +1881,7 @@ void DlgSettings::closeEvent(QCloseEvent *event)
     }
 
     if (!QDir(SettingsCache::instance().getPicsPath()).exists() || SettingsCache::instance().getPicsPath().isEmpty()) {
-        //! \todo Prompt to create it
+        // 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?"),
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h b/cockatrice/src/dialogs/dlg_settings.h
similarity index 94%
rename from cockatrice/src/interface/widgets/dialogs/dlg_settings.h
rename to cockatrice/src/dialogs/dlg_settings.h
index b655a30bc..d21bf69a9 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
+++ b/cockatrice/src/dialogs/dlg_settings.h
@@ -1,12 +1,8 @@
-/**
- * @file dlg_settings.h
- * @ingroup Dialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_SETTINGS_H
 #define DLG_SETTINGS_H
 
+#include "../utility/macros.h"
+
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialog>
@@ -15,7 +11,6 @@
 #include <QLoggingCategory>
 #include <QPushButton>
 #include <QSpinBox>
-#include <libcockatrice/utility/macros.h>
 
 inline Q_LOGGING_CATEGORY(DlgSettingsLog, "dlg_settings");
 
@@ -103,9 +98,7 @@ class AppearanceSettingsPage : public AbstractSettingsPage
 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);
@@ -118,12 +111,9 @@ private:
     QComboBox homeTabBackgroundSourceBox;
     QLabel homeTabBackgroundShuffleFrequencyLabel;
     QSpinBox homeTabBackgroundShuffleFrequencySpinBox;
-    QLabel homeTabDisplayCardNameLabel;
-    QCheckBox homeTabDisplayCardNameCheckBox;
     QLabel minPlayersForMultiColumnLayoutLabel;
     QLabel maxFontSizeForCardsLabel;
     QCheckBox showShortcutsCheckBox;
-    QCheckBox showGameSelectorFilterToolbarCheckBox;
     QCheckBox displayCardNamesCheckBox;
     QCheckBox autoRotateSidewaysLayoutCardsCheckBox;
     QCheckBox overrideAllCardArtWithPersonalPreferenceCheckBox;
@@ -167,12 +157,9 @@ private:
     QCheckBox doubleClickToPlayCheckBox;
     QCheckBox clickPlaysAllSelectedCheckBox;
     QCheckBox playToStackCheckBox;
-    QCheckBox doNotDeleteArrowsInSubPhasesCheckBox;
     QCheckBox closeEmptyCardViewCheckBox;
     QCheckBox focusCardViewSearchBarCheckBox;
     QCheckBox annotateTokensCheckBox;
-    QCheckBox showDragSelectionCountCheckBox;
-    QCheckBox showTotalSelectionCountCheckBox;
     QCheckBox useTearOffMenusCheckBox;
     QCheckBox tapAnimationCheckBox;
     QCheckBox openDeckInNewTabCheckBox;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp b/cockatrice/src/dialogs/dlg_startup_card_check.cpp
similarity index 97%
rename from cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
rename to cockatrice/src/dialogs/dlg_startup_card_check.cpp
index ac1922a9d..5d76bc253 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
+++ b/cockatrice/src/dialogs/dlg_startup_card_check.cpp
@@ -1,6 +1,6 @@
 #include "dlg_startup_card_check.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 
 #include <QDate>
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h b/cockatrice/src/dialogs/dlg_startup_card_check.h
similarity index 83%
rename from cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
rename to cockatrice/src/dialogs/dlg_startup_card_check.h
index 44fc59d58..cb7acd280 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
+++ b/cockatrice/src/dialogs/dlg_startup_card_check.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_startup_card_check.h
- * @ingroup CardDatabaseUpdateDialogs
- * @brief TODO: Document this.
- */
-
 #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.cpp b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp
similarity index 98%
rename from cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
rename to cockatrice/src/dialogs/dlg_tip_of_the_day.cpp
index 59330e27e..eb8e8dc47 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
+++ b/cockatrice/src/dialogs/dlg_tip_of_the_day.cpp
@@ -1,12 +1,13 @@
 #include "dlg_tip_of_the_day.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 #include "tip_of_the_day.h"
 
 #include <QCheckBox>
 #include <QDate>
 #include <QDebug>
 #include <QDialogButtonBox>
+#include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h b/cockatrice/src/dialogs/dlg_tip_of_the_day.h
similarity index 92%
rename from cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
rename to cockatrice/src/dialogs/dlg_tip_of_the_day.h
index 3dad7c652..4a7d86354 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.h
+++ b/cockatrice/src/dialogs/dlg_tip_of_the_day.h
@@ -1,17 +1,13 @@
-/**
- * @file dlg_tip_of_the_day.h
- * @ingroup Dialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_TIPOFDAY_H
 #define DLG_TIPOFDAY_H
 
 #include <QComboBox>
 #include <QDialog>
 #include <QDialogButtonBox>
+#include <QHBoxLayout>
 #include <QLineEdit>
 #include <QLoggingCategory>
+#include <QPushButton>
 #include <QVBoxLayout>
 
 inline Q_LOGGING_CATEGORY(DlgTipOfTheDayLog, "dlg_tip_of_the_day");
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp b/cockatrice/src/dialogs/dlg_update.cpp
similarity index 95%
rename from cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
rename to cockatrice/src/dialogs/dlg_update.cpp
index c9adeb270..0edcb1512 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
+++ b/cockatrice/src/dialogs/dlg_update.cpp
@@ -1,14 +1,16 @@
 #include "dlg_update.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../client/network/update/client/client_update_checker.h"
-#include "../client/network/update/client/release_channel.h"
+#include "../client/network/client_update_checker.h"
+#include "../client/network/release_channel.h"
 #include "../interface/window_main.h"
+#include "../settings/cache_settings.h"
 
+#include <QApplication>
 #include <QDesktopServices>
 #include <QLabel>
 #include <QMessageBox>
 #include <QProgressBar>
+#include <QProgressDialog>
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QtNetwork>
@@ -219,9 +221,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/dialogs/dlg_update.h
similarity index 88%
rename from cockatrice/src/interface/widgets/dialogs/dlg_update.h
rename to cockatrice/src/dialogs/dlg_update.h
index daf0b9e47..3ac86dee1 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.h
+++ b/cockatrice/src/dialogs/dlg_update.h
@@ -1,13 +1,7 @@
-/**
- * @file dlg_update.h
- * @ingroup ClientUpdateDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_UPDATE_H
 #define DLG_UPDATE_H
 
-#include "../client/network/update/client/update_downloader.h"
+#include "../client/update_downloader.h"
 
 #include <QDialogButtonBox>
 #include <QLoggingCategory>
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp b/cockatrice/src/dialogs/dlg_view_log.cpp
similarity index 96%
rename from cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
rename to cockatrice/src/dialogs/dlg_view_log.cpp
index 3dd0fedb3..b60a9767b 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
+++ b/cockatrice/src/dialogs/dlg_view_log.cpp
@@ -1,7 +1,7 @@
 #include "dlg_view_log.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../logger.h"
+#include "../settings/cache_settings.h"
+#include "../utility/logger.h"
 
 #include <QClipboard>
 #include <QPlainTextEdit>
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h b/cockatrice/src/dialogs/dlg_view_log.h
similarity index 85%
rename from cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
rename to cockatrice/src/dialogs/dlg_view_log.h
index f0b900527..26d6ad5e1 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
+++ b/cockatrice/src/dialogs/dlg_view_log.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_view_log.h
- * @ingroup ServerLogDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_VIEWLOG_H
 #define DLG_VIEWLOG_H
 
diff --git a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp b/cockatrice/src/dialogs/tip_of_the_day.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
rename to cockatrice/src/dialogs/tip_of_the_day.cpp
diff --git a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h b/cockatrice/src/dialogs/tip_of_the_day.h
similarity index 64%
rename from cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
rename to cockatrice/src/dialogs/tip_of_the_day.h
index d61fddab5..32792391d 100644
--- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
+++ b/cockatrice/src/dialogs/tip_of_the_day.h
@@ -1,9 +1,3 @@
-/**
- * @file tip_of_the_day.h
- * @ingroup Dialogs
- * @brief TODO: Document this.
- */
-
 #ifndef TIP_OF_DAY_H
 #define TIP_OF_DAY_H
 
@@ -14,19 +8,19 @@ class TipOfTheDay
 {
 public:
     explicit TipOfTheDay(QString _title, QString _content, QString _imagePath, QDate _date);
-    [[nodiscard]] QString getTitle() const
+    QString getTitle() const
     {
         return title;
     }
-    [[nodiscard]] QString getContent() const
+    QString getContent() const
     {
         return content;
     }
-    [[nodiscard]] QString getImagePath() const
+    QString getImagePath() const
     {
         return imagePath;
     }
-    [[nodiscard]] QDate getDate() const
+    QDate getDate() const
     {
         return date;
     }
@@ -51,8 +45,8 @@ public:
     explicit TipsOfTheDay(QString xmlPath, QObject *parent = nullptr);
     ~TipsOfTheDay() override;
     TipOfTheDay getTip(int tipId);
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
 
 private:
     QList<TipOfTheDay> *tipList;
diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp
index 6b671831d..f107884c3 100644
--- a/cockatrice/src/filters/deck_filter_string.cpp
+++ b/cockatrice/src/filters/deck_filter_string.cpp
@@ -1,9 +1,8 @@
 #include "deck_filter_string.h"
 
-#include <QFileInfo>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/filters/filter_string.h>
-#include <libcockatrice/utility/peglib.h>
+#include "../database/card_database_manager.h"
+#include "filter_string.h"
+#include "lib/peglib.h"
 
 static peg::parser search(R"(
 Start <- QueryPartList
@@ -13,7 +12,7 @@ QueryPartList <- ComplexQueryPart ( ws ("AND" ws)? ComplexQueryPart)* ws*
 ComplexQueryPart <- SomewhatComplexQueryPart ws "OR" ws ComplexQueryPart / SomewhatComplexQueryPart
 SomewhatComplexQueryPart <- [(] QueryPartList [)] / QueryPart
 
-QueryPart <- NotQuery / DeckContentQuery / DeckNameQuery / FileNameQuery / PathQuery / FormatQuery / CommentQuery / GenericQuery
+QueryPart <- NotQuery / DeckContentQuery / DeckNameQuery / FileNameQuery / PathQuery / GenericQuery
 
 NotQuery <- ('NOT' ws/'-') SomewhatComplexQueryPart
 
@@ -22,16 +21,14 @@ CardSearch <- '[[' CardFilterString ']]'
 CardFilterString <- (!']]'.)*
 
 DeckNameQuery <- ([Dd] 'eck')? [Nn] 'ame'? [:] String
-FileNameQuery <- [Ff] ([Nn] / 'ile' ([Nn] 'ame')?) [:] String
+FileNameQuery <- [Ff] ('ile' 'name'?)? [:] String
 PathQuery <- [Pp] 'ath'? [:] String
-FormatQuery <- [Ff] 'ormat'? [:] String
-CommentQuery <- [Cc] ('omment' 's'?)? [:] String
 
 GenericQuery <- String
 
 NonDoubleQuoteUnlessEscaped <- '\\\"'. / !["].
 NonSingleQuoteUnlessEscaped <- "\\\'". / !['].
-UnescapedStringListPart <- !['":<>()=! ].
+UnescapedStringListPart <- !['":<>=! ].
 SingleApostropheString <- (UnescapedStringListPart+ ws*)* ['] (UnescapedStringListPart+ ws*)*
 
 String <- SingleApostropheString / UnescapedStringListPart+ / ["] <NonDoubleQuoteUnlessEscaped*> ["] / ['] <NonSingleQuoteUnlessEscaped*> [']
@@ -120,13 +117,12 @@ static void setupParserRules()
 
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) -> bool {
             int count = 0;
-            auto cardNodes = deck->deckLoader->getDeck().deckList.getCardNodes();
-            for (auto node : cardNodes) {
+            deck->deckLoader->forEachCard([&](InnerDecklistNode *, const DecklistCardNode *node) {
                 auto cardInfoPtr = CardDatabaseManager::query()->getCardInfo(node->getName());
                 if (!cardInfoPtr.isNull() && cardFilter.check(cardInfoPtr)) {
                     count += node->getNumber();
                 }
-            }
+            });
             return numberMatcher(count);
         };
     };
@@ -140,7 +136,7 @@ static void setupParserRules()
     search["DeckNameQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         auto name = std::any_cast<QString>(sv[0]);
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            return deck->deckLoader->getDeck().deckList.getName().contains(name, Qt::CaseInsensitive);
+            return deck->deckLoader->getName().contains(name, Qt::CaseInsensitive);
         };
     };
 
@@ -159,22 +155,6 @@ static void setupParserRules()
         };
     };
 
-    search["FormatQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        auto format = std::any_cast<QString>(sv[0]);
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            auto gameFormat = deck->deckLoader->getDeck().deckList.getGameFormat();
-            return QString::compare(format, gameFormat, Qt::CaseInsensitive) == 0;
-        };
-    };
-
-    search["CommentQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        auto value = std::any_cast<QString>(sv[0]);
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            auto comments = deck->deckLoader->getDeck().deckList.getComments();
-            return comments.contains(value, Qt::CaseInsensitive);
-        };
-    };
-
     search["GenericQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         auto name = std::any_cast<QString>(sv[0]);
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h
index 1b43d770d..37e19b3ba 100644
--- a/cockatrice/src/filters/deck_filter_string.h
+++ b/cockatrice/src/filters/deck_filter_string.h
@@ -1,17 +1,13 @@
-/**
- * @file deck_filter_string.h
- * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_FILTER_STRING_H
 #define DECK_FILTER_STRING_H
 
 #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h"
 
 #include <QLoggingCategory>
+#include <QMap>
 #include <QString>
 #include <functional>
+#include <utility>
 
 inline Q_LOGGING_CATEGORY(DeckFilterStringLog, "deck_filter_string");
 
@@ -38,7 +34,7 @@ public:
         return filter(deck, info);
     }
 
-    [[nodiscard]] bool valid() const
+    bool valid() const
     {
         return _error.isEmpty();
     }
diff --git a/cockatrice/src/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp
index 7178ce95a..97056ac60 100644
--- a/cockatrice/src/filters/filter_builder.cpp
+++ b/cockatrice/src/filters/filter_builder.cpp
@@ -1,11 +1,11 @@
 #include "filter_builder.h"
 
-#include "../interface/widgets/utility/custom_line_edit.h"
+#include "../deck/custom_line_edit.h"
+#include "filter_card.h"
 
 #include <QComboBox>
 #include <QGridLayout>
 #include <QPushButton>
-#include <libcockatrice/filters/filter_card.h>
 
 FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/filters/filter_builder.h b/cockatrice/src/filters/filter_builder.h
index 74872e3cd..45ae24839 100644
--- a/cockatrice/src/filters/filter_builder.h
+++ b/cockatrice/src/filters/filter_builder.h
@@ -1,9 +1,3 @@
-/**
- * @file filter_builder.h
- * @ingroup CardDatabaseModelFilters
- * @brief TODO: Document this.
- */
-
 #ifndef FILTERBUILDER_H
 #define FILTERBUILDER_H
 
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.cpp b/cockatrice/src/filters/filter_card.cpp
similarity index 97%
rename from libcockatrice_filters/libcockatrice/filters/filter_card.cpp
rename to cockatrice/src/filters/filter_card.cpp
index 5fdce7ae0..d49a1b9cb 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
+++ b/cockatrice/src/filters/filter_card.cpp
@@ -60,8 +60,6 @@ const QString CardFilter::attrName(Attr a)
     switch (a) {
         case AttrName:
             return tr("Name");
-        case AttrNameExact:
-            return tr("Name (Exact)");
         case AttrType:
             return tr("Type");
         case AttrColor:
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.h b/cockatrice/src/filters/filter_card.h
similarity index 77%
rename from libcockatrice_filters/libcockatrice/filters/filter_card.h
rename to cockatrice/src/filters/filter_card.h
index 732e43a09..210d5c062 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_card.h
+++ b/cockatrice/src/filters/filter_card.h
@@ -1,14 +1,9 @@
-/**
- * @file filter_card.h
- * @ingroup CardDatabaseModelFilters
- * @brief TODO: Document this.
- */
-
 #ifndef CARDFILTER_H
 #define CARDFILTER_H
 
 #include <QObject>
 #include <QString>
+#include <utility>
 
 class CardFilter : public QObject
 {
@@ -33,7 +28,6 @@ public:
         AttrLoyalty,
         AttrManaCost,
         AttrName,
-        AttrNameExact,
         AttrPow,
         AttrRarity,
         AttrSet,
@@ -52,24 +46,22 @@ private:
     enum Attr a;
 
 public:
-    CardFilter(QString &term, Type type, Attr attr) : trm(term), t(type), a(attr)
-    {
-    }
+    CardFilter(QString &term, Type type, Attr attr) : trm(term), t(type), a(attr){};
 
-    [[nodiscard]] Type type() const
+    Type type() const
     {
         return t;
     }
-    [[nodiscard]] const QString &term() const
+    const QString &term() const
     {
         return trm;
     }
-    [[nodiscard]] Attr attr() const
+    Attr attr() const
     {
         return a;
     }
 
-    [[nodiscard]] QJsonObject toJson() const;
+    QJsonObject toJson() const;
     static CardFilter *fromJson(const QJsonObject &json);
     static const QString typeName(Type t);
     static const QString attrName(Attr a);
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp b/cockatrice/src/filters/filter_string.cpp
similarity index 97%
rename from libcockatrice_filters/libcockatrice/filters/filter_string.cpp
rename to cockatrice/src/filters/filter_string.cpp
index 704e8fadb..02fc1e1ec 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
+++ b/cockatrice/src/filters/filter_string.cpp
@@ -1,11 +1,12 @@
 #include "filter_string.h"
 
+#include "../../../common/lib/peglib.h"
+
 #include <QByteArray>
 #include <QDebug>
 #include <QRegularExpression>
 #include <QString>
 #include <functional>
-#include <libcockatrice/utility/peglib.h>
 
 static peg::parser search(R"(
 Start <- QueryPartList
@@ -46,7 +47,7 @@ FieldQuery <- String [:] MatcherString / String ws? NumericExpression
 
 NonDoubleQuoteUnlessEscaped <- '\\\"'. / !["].
 NonSingleQuoteUnlessEscaped <- "\\\'". / !['].
-UnescapedStringListPart <- !['":<>()=! ].
+UnescapedStringListPart <- !['":<>=! ].
 SingleApostropheString <- (UnescapedStringListPart+ ws*)* ['] (UnescapedStringListPart+ ws*)*
 String <- SingleApostropheString / UnescapedStringListPart+ / ["] <NonDoubleQuoteUnlessEscaped*> ["] / ['] <NonSingleQuoteUnlessEscaped*> [']
 StringValue <- String / [(] StringList [)]
@@ -143,12 +144,13 @@ static void setupParserRules()
     search["FormatQuery"] = [](const peg::SemanticValues &sv) -> Filter {
         if (sv.choice() == 0) {
             const auto format = std::any_cast<QString>(sv[0]);
-            return [=](const CardData &x) -> bool { return x->getLegalityProp(format) == "legal"; };
+            return
+                [=](const CardData &x) -> bool { return x->getProperty(QString("format-%1").arg(format)) == "legal"; };
         }
 
         const auto format = std::any_cast<QString>(sv[1]);
         const auto legality = std::any_cast<QString>(sv[0]);
-        return [=](const CardData &x) -> bool { return x->getLegalityProp(format) == legality; };
+        return [=](const CardData &x) -> bool { return x->getProperty(QString("format-%1").arg(format)) == legality; };
     };
     search["Legality"] = [](const peg::SemanticValues &sv) -> QString {
         switch (tolower(std::string(sv.sv())[0])) {
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.h b/cockatrice/src/filters/filter_string.h
similarity index 83%
rename from libcockatrice_filters/libcockatrice/filters/filter_string.h
rename to cockatrice/src/filters/filter_string.h
index 8fc41ce68..149710d00 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.h
+++ b/cockatrice/src/filters/filter_string.h
@@ -1,19 +1,13 @@
-/**
- * @file filter_string.h
- * @ingroup CardDatabaseModelFilters
- * @brief TODO: Document this.
- */
-
 #ifndef FILTER_STRING_H
 #define FILTER_STRING_H
 
+#include "../card/card_info.h"
 #include "filter_tree.h"
 
 #include <QLoggingCategory>
 #include <QMap>
 #include <QString>
 #include <functional>
-#include <libcockatrice/card/card_info.h>
 #include <utility>
 
 inline Q_LOGGING_CATEGORY(FilterStringLog, "filter_string");
@@ -35,7 +29,7 @@ class FilterString
 public:
     FilterString();
     explicit FilterString(const QString &exp);
-    [[nodiscard]] bool check(const CardData &card) const
+    bool check(const CardData &card) const
     {
         if (card.isNull()) {
             static CardInfoPtr blankCard = CardInfo::newInstance("");
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/cockatrice/src/filters/filter_tree.cpp
similarity index 98%
rename from libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
rename to cockatrice/src/filters/filter_tree.cpp
index 19e8c2d8d..89b772b8e 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
+++ b/cockatrice/src/filters/filter_tree.cpp
@@ -153,11 +153,6 @@ bool FilterItem::acceptName(const CardInfoPtr info) const
     return info->getName().contains(term, Qt::CaseInsensitive);
 }
 
-bool FilterItem::acceptNameExact(const CardInfoPtr info) const
-{
-    return info->getName() == term;
-}
-
 bool FilterItem::acceptType(const CardInfoPtr info) const
 {
     return info->getCardType().contains(term, Qt::CaseInsensitive);
@@ -275,7 +270,7 @@ bool FilterItem::acceptCmc(const CardInfoPtr info) const
 
 bool FilterItem::acceptFormat(const CardInfoPtr info) const
 {
-    return info->getLegalityProp(term.toLower()) == "legal";
+    return info->getProperty(QString("format-%1").arg(term.toLower())) == "legal";
 }
 
 bool FilterItem::acceptLoyalty(const CardInfoPtr info) const
@@ -406,8 +401,6 @@ bool FilterItem::acceptCardAttr(const CardInfoPtr info, CardFilter::Attr attr) c
     switch (attr) {
         case CardFilter::AttrName:
             return acceptName(info);
-        case CardFilter::AttrNameExact:
-            return acceptNameExact(info);
         case CardFilter::AttrType:
             return acceptType(info);
         case CardFilter::AttrColor:
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.h b/cockatrice/src/filters/filter_tree.h
similarity index 62%
rename from libcockatrice_filters/libcockatrice/filters/filter_tree.h
rename to cockatrice/src/filters/filter_tree.h
index 75d4241a5..a1c015e20 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.h
+++ b/cockatrice/src/filters/filter_tree.h
@@ -1,17 +1,12 @@
-/**
- * @file filter_tree.h
- * @ingroup CardDatabaseModelFilters
- * @brief TODO: Document this.
- */
-
 #ifndef FILTERTREE_H
 #define FILTERTREE_H
 
+#include "../database/card_database.h"
 #include "filter_card.h"
 
 #include <QList>
+#include <QMap>
 #include <QObject>
-#include <libcockatrice/card/database/card_database.h>
 #include <utility>
 
 class FilterTreeNode
@@ -23,7 +18,7 @@ public:
     FilterTreeNode() : enabled(true)
     {
     }
-    [[nodiscard]] virtual bool isEnabled() const
+    virtual bool isEnabled() const
     {
         return enabled;
     }
@@ -37,18 +32,18 @@ public:
         enabled = false;
         nodeChanged();
     }
-    [[nodiscard]] virtual FilterTreeNode *parent() const
+    virtual FilterTreeNode *parent() const
     {
         return nullptr;
     }
-    [[nodiscard]] virtual FilterTreeNode *nodeAt(int /* i */) const
+    virtual FilterTreeNode *nodeAt(int /* i */) const
     {
         return nullptr;
     }
     virtual void deleteAt(int /* i */)
     {
     }
-    [[nodiscard]] virtual int childCount() const
+    virtual int childCount() const
     {
         return 0;
     }
@@ -56,15 +51,15 @@ public:
     {
         return -1;
     }
-    [[nodiscard]] virtual int index() const
+    virtual int index() const
     {
         return (parent() != nullptr) ? parent()->childIndex(this) : -1;
     }
-    [[nodiscard]] virtual const QString text() const
+    virtual const QString text() const
     {
         return QString("");
     }
-    [[nodiscard]] virtual bool isLeaf() const
+    virtual bool isLeaf() const
     {
         return false;
     }
@@ -103,9 +98,9 @@ protected:
 public:
     virtual ~FilterTreeBranch();
     void removeFiltersByAttr(CardFilter::Attr filterType);
-    [[nodiscard]] FilterTreeNode *nodeAt(int i) const override;
+    FilterTreeNode *nodeAt(int i) const override;
     void deleteAt(int i) override;
-    [[nodiscard]] int childCount() const override
+    int childCount() const override
     {
         return childNodes.size();
     }
@@ -126,10 +121,10 @@ public:
     LogicMap(CardFilter::Attr a, FilterTree *parent) : p(parent), attr(a)
     {
     }
-    [[nodiscard]] const FilterItemList *findTypeList(CardFilter::Type type) const;
+    const FilterItemList *findTypeList(CardFilter::Type type) const;
     FilterItemList *typeList(CardFilter::Type type);
-    [[nodiscard]] FilterTreeNode *parent() const override;
-    [[nodiscard]] const QString text() const override
+    FilterTreeNode *parent() const override;
+    const QString text() const override
     {
         return CardFilter::attrName(attr);
     }
@@ -147,25 +142,25 @@ public:
     FilterItemList(CardFilter::Type t, LogicMap *parent) : p(parent), type(t)
     {
     }
-    [[nodiscard]] CardFilter::Attr attr() const
+    CardFilter::Attr attr() const
     {
         return p->attr;
     }
-    [[nodiscard]] FilterTreeNode *parent() const override
+    FilterTreeNode *parent() const override
     {
         return p;
     }
-    [[nodiscard]] int termIndex(const QString &term) const;
+    int termIndex(const QString &term) const;
     FilterTreeNode *termNode(const QString &term);
-    [[nodiscard]] const QString text() const override
+    const QString text() const override
     {
         return CardFilter::typeName(type);
     }
 
-    [[nodiscard]] bool testTypeAnd(CardInfoPtr info, CardFilter::Attr attr) const;
-    [[nodiscard]] bool testTypeAndNot(CardInfoPtr info, CardFilter::Attr attr) const;
-    [[nodiscard]] bool testTypeOr(CardInfoPtr info, CardFilter::Attr attr) const;
-    [[nodiscard]] bool testTypeOrNot(CardInfoPtr info, CardFilter::Attr attr) const;
+    bool testTypeAnd(CardInfoPtr info, CardFilter::Attr attr) const;
+    bool testTypeAndNot(CardInfoPtr info, CardFilter::Attr attr) const;
+    bool testTypeOr(CardInfoPtr info, CardFilter::Attr attr) const;
+    bool testTypeOrNot(CardInfoPtr info, CardFilter::Attr attr) const;
 };
 
 class FilterItem : public FilterTreeNode
@@ -181,43 +176,42 @@ public:
     }
     virtual ~FilterItem() = default;
 
-    [[nodiscard]] CardFilter::Attr attr() const
+    CardFilter::Attr attr() const
     {
         return p->attr();
     }
-    [[nodiscard]] CardFilter::Type type() const
+    CardFilter::Type type() const
     {
         return p->type;
     }
-    [[nodiscard]] FilterTreeNode *parent() const override
+    FilterTreeNode *parent() const override
     {
         return p;
     }
-    [[nodiscard]] const QString text() const override
+    const QString text() const override
     {
         return term;
     }
-    [[nodiscard]] bool isLeaf() const override
+    bool isLeaf() const override
     {
         return true;
     }
 
-    [[nodiscard]] bool acceptName(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptNameExact(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptType(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptMainType(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptSubType(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptColor(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptText(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptSet(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptManaCost(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptCmc(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptPowerToughness(CardInfoPtr info, CardFilter::Attr attr) const;
-    [[nodiscard]] bool acceptLoyalty(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptRarity(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptCardAttr(CardInfoPtr info, CardFilter::Attr attr) const;
-    [[nodiscard]] bool acceptFormat(CardInfoPtr info) const;
-    [[nodiscard]] bool relationCheck(int cardInfo) const;
+    bool acceptName(CardInfoPtr info) const;
+    bool acceptType(CardInfoPtr info) const;
+    bool acceptMainType(CardInfoPtr info) const;
+    bool acceptSubType(CardInfoPtr info) const;
+    bool acceptColor(CardInfoPtr info) const;
+    bool acceptText(CardInfoPtr info) const;
+    bool acceptSet(CardInfoPtr info) const;
+    bool acceptManaCost(CardInfoPtr info) const;
+    bool acceptCmc(CardInfoPtr info) const;
+    bool acceptPowerToughness(CardInfoPtr info, CardFilter::Attr attr) const;
+    bool acceptLoyalty(CardInfoPtr info) const;
+    bool acceptRarity(CardInfoPtr info) const;
+    bool acceptCardAttr(CardInfoPtr info, CardFilter::Attr attr) const;
+    bool acceptFormat(CardInfoPtr info) const;
+    bool relationCheck(int cardInfo) const;
 };
 
 class FilterTree : public QObject, public FilterTreeBranch<LogicMap *>
@@ -265,16 +259,16 @@ public:
     FilterTreeNode *termNode(CardFilter::Attr attr, CardFilter::Type type, const QString &term);
     FilterTreeNode *termNode(const CardFilter *f);
 
-    [[nodiscard]] const QString text() const override
+    const QString text() const override
     {
         return QString("root");
     }
-    [[nodiscard]] int index() const override
+    int index() const override
     {
         return 0;
     }
 
-    [[nodiscard]] bool acceptsCard(CardInfoPtr info) const;
+    bool acceptsCard(CardInfoPtr info) const;
     void removeFiltersByAttr(CardFilter::Attr filterType);
     void removeFilter(const CardFilter *toRemove);
     void clear();
diff --git a/cockatrice/src/filters/filter_tree_model.cpp b/cockatrice/src/filters/filter_tree_model.cpp
index f0a02ec79..c4ce3aa35 100644
--- a/cockatrice/src/filters/filter_tree_model.cpp
+++ b/cockatrice/src/filters/filter_tree_model.cpp
@@ -1,8 +1,9 @@
 #include "filter_tree_model.h"
 
+#include "filter_card.h"
+#include "filter_tree.h"
+
 #include <QFont>
-#include <libcockatrice/filters/filter_card.h>
-#include <libcockatrice/filters/filter_tree.h>
 
 FilterTreeModel::FilterTreeModel(QObject *parent) : QAbstractItemModel(parent)
 {
diff --git a/cockatrice/src/filters/filter_tree_model.h b/cockatrice/src/filters/filter_tree_model.h
index c6666a838..89547e7a2 100644
--- a/cockatrice/src/filters/filter_tree_model.h
+++ b/cockatrice/src/filters/filter_tree_model.h
@@ -1,14 +1,9 @@
-/**
- * @file filter_tree_model.h
- * @ingroup CardDatabaseModelFilters
- * @brief TODO: Document this.
- */
-
 #ifndef FILTERTREEMODEL_H
 #define FILTERTREEMODEL_H
 
+#include "filter_card.h"
+
 #include <QAbstractItemModel>
-#include <libcockatrice/filters/filter_card.h>
 
 class FilterTree;
 class CardFilter;
@@ -24,8 +19,8 @@ public slots:
     void addFilter(const CardFilter *f);
     void removeFilter(const CardFilter *f);
     void clearFiltersOfType(CardFilter::Attr filterType);
-    [[nodiscard]] QList<const CardFilter *> getFiltersOfType(CardFilter::Attr filterType) const;
-    [[nodiscard]] QList<const CardFilter *> allFilters() const;
+    QList<const CardFilter *> getFiltersOfType(CardFilter::Attr filterType) const;
+    QList<const CardFilter *> allFilters() const;
 
 private slots:
     void proxyBeginInsertRow(const FilterTreeNode *, int);
@@ -34,23 +29,23 @@ private slots:
     void proxyEndRemoveRow(const FilterTreeNode *, int);
 
 private:
-    [[nodiscard]] FilterTreeNode *indexToNode(const QModelIndex &idx) const;
+    FilterTreeNode *indexToNode(const QModelIndex &idx) const;
     QModelIndex nodeIndex(const FilterTreeNode *node, int row, int column) const;
 
 public:
     FilterTreeModel(QObject *parent = nullptr);
     ~FilterTreeModel() override;
-    [[nodiscard]] FilterTree *filterTree() const
+    FilterTree *filterTree() const
     {
         return fTree;
     }
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
-    [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override;
-    [[nodiscard]] QModelIndex parent(const QModelIndex &ind) const override;
-    [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    QModelIndex parent(const QModelIndex &ind) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent) const override;
     bool removeRows(int row, int count, const QModelIndex &parent) override;
     void clear();
 };
diff --git a/cockatrice/src/filters/syntax_help.cpp b/cockatrice/src/filters/syntax_help.cpp
index fa5338a41..9fb918629 100644
--- a/cockatrice/src/filters/syntax_help.cpp
+++ b/cockatrice/src/filters/syntax_help.cpp
@@ -22,11 +22,8 @@ static QTextBrowser *createBrowser(const QString &helpFile)
     QString text = in.readAll();
     file.close();
 
-    // --- Remove @page declarations at the top of the file ---
-    auto opts = QRegularExpression::MultilineOption;
-    text = text.replace(QRegularExpression(R"(^\s*@page[^\n]*\n)", opts), "");
-
     // Poor Markdown Converter
+    auto opts = QRegularExpression::MultilineOption;
     text = text.replace(QRegularExpression("^(###)(.*)", opts), "<h3>\\2</h3>")
                .replace(QRegularExpression("^(##)(.*)", opts), "<h2>\\2</h2>")
                .replace(QRegularExpression("^(#)(.*)", opts), "<h1>\\2</h1>")
diff --git a/cockatrice/src/filters/syntax_help.h b/cockatrice/src/filters/syntax_help.h
index 7e5ef3e0e..911c2fdf0 100644
--- a/cockatrice/src/filters/syntax_help.h
+++ b/cockatrice/src/filters/syntax_help.h
@@ -1,10 +1,3 @@
-/**
- * @file syntax_help.h
- * @ingroup CardDatabaseModelFilters
- * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #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 9216f9174..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.h"
 
-AbstractGame::AbstractGame(TabGame *_tab) : QObject(_tab), tab(_tab)
+AbstractGame::AbstractGame(TabGame *_tab) : tab(_tab)
 {
     gameMetaInfo = new GameMetaInfo(this);
     gameEventHandler = new GameEventHandler(this);
diff --git a/cockatrice/src/game/abstract_game.h b/cockatrice/src/game/abstract_game.h
index cb4dbac2a..386b2ee8e 100644
--- a/cockatrice/src/game/abstract_game.h
+++ b/cockatrice/src/game/abstract_game.h
@@ -1,19 +1,13 @@
-/**
- * @file abstract_game.h
- * @ingroup GameLogic
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_ABSTRACT_GAME_H
 #define COCKATRICE_ABSTRACT_GAME_H
 
+#include "../../../common/pb/game_replay.pb.h"
 #include "game_event_handler.h"
 #include "game_meta_info.h"
 #include "game_state.h"
 #include "player/player_manager.h"
 
 #include <QObject>
-#include <libcockatrice/protocol/pb/game_replay.pb.h>
 
 class CardItem;
 class TabGame;
diff --git a/cockatrice/src/game/board/abstract_card_drag_item.cpp b/cockatrice/src/game/board/abstract_card_drag_item.cpp
index 8e3def4ca..d7b0b7d46 100644
--- a/cockatrice/src/game/board/abstract_card_drag_item.cpp
+++ b/cockatrice/src/game/board/abstract_card_drag_item.cpp
@@ -1,13 +1,14 @@
 #include "abstract_card_drag_item.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "../z_values.h"
+#include "../../settings/cache_settings.h"
 
 #include <QCursor>
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 
+static const float CARD_WIDTH_HALF = CARD_WIDTH / 2;
+static const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2;
 const QColor GHOST_MASK = QColor(255, 255, 255, 50);
 
 AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
@@ -17,19 +18,19 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
 {
     if (parentDrag) {
         parentDrag->addChildDrag(this);
-        setZValue(ZValues::childDragZValue(hotSpot.x(), hotSpot.y()));
+        setZValue(2000000007 + hotSpot.x() * 1000000 + hotSpot.y() * 1000 + 1000);
         connect(parentDrag, &QObject::destroyed, this, &AbstractCardDragItem::deleteLater);
     } else {
-        hotSpot = QPointF{qBound(0.0, hotSpot.x(), CardDimensions::WIDTH_F - 1),
-                          qBound(0.0, hotSpot.y(), CardDimensions::HEIGHT_F - 1)};
+        hotSpot = QPointF{qBound(0.0, hotSpot.x(), static_cast<qreal>(CARD_WIDTH - 1)),
+                          qBound(0.0, hotSpot.y(), static_cast<qreal>(CARD_HEIGHT - 1))};
         setCursor(Qt::ClosedHandCursor);
-        setZValue(ZValues::DRAG_ITEM);
+        setZValue(2000000007);
     }
     if (item->getTapped())
         setTransform(QTransform()
-                         .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
+                         .translate(CARD_WIDTH_HALF, CARD_HEIGHT_HALF)
                          .rotate(90)
-                         .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
+                         .translate(-CARD_WIDTH_HALF, -CARD_HEIGHT_HALF));
 
     setCacheMode(DeviceCoordinateCache);
 
@@ -46,7 +47,7 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
 QPainterPath AbstractCardDragItem::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
+    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0;
     shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
     return shape;
 }
diff --git a/cockatrice/src/game/board/abstract_card_drag_item.h b/cockatrice/src/game/board/abstract_card_drag_item.h
index fe3b87983..a411a24d1 100644
--- a/cockatrice/src/game/board/abstract_card_drag_item.h
+++ b/cockatrice/src/game/board/abstract_card_drag_item.h
@@ -1,9 +1,3 @@
-/**
- * @file abstract_card_drag_item.h
- * @ingroup GameGraphicsCards
- * @brief TODO: Document this.
- */
-
 #ifndef ABSTRACTCARDDRAGITEM_H
 #define ABSTRACTCARDDRAGITEM_H
 
@@ -27,22 +21,22 @@ public:
     {
         Type = typeCardDrag
     };
-    [[nodiscard]] int type() const override
+    int type() const override
     {
         return Type;
     }
     AbstractCardDragItem(AbstractCardItem *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag = 0);
-    [[nodiscard]] QRectF boundingRect() const override
+    QRectF boundingRect() const override
     {
-        return QRectF(0, 0, CardDimensions::WIDTH_F, CardDimensions::HEIGHT_F);
+        return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);
     }
-    [[nodiscard]] QPainterPath shape() const override;
+    QPainterPath shape() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    [[nodiscard]] AbstractCardItem *getItem() const
+    AbstractCardItem *getItem() const
     {
         return item;
     }
-    [[nodiscard]] QPointF getHotSpot() const
+    QPointF getHotSpot() const
     {
         return hotSpot;
     }
diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp
index 9ec6ada9a..ea23f39c0 100644
--- a/cockatrice/src/game/board/abstract_card_item.cpp
+++ b/cockatrice/src/game/board/abstract_card_item.cpp
@@ -1,17 +1,16 @@
 #include "abstract_card_item.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "../../interface/card_picture_loader/card_picture_loader.h"
+#include "../../database/card_database.h"
+#include "../../database/card_database_manager.h"
+#include "../../picture_loader/picture_loader.h"
+#include "../../settings/cache_settings.h"
 #include "../game_scene.h"
-#include "../z_values.h"
 
 #include <QCursor>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <algorithm>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
 
 AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, Player *_owner, int _id)
     : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0),
@@ -39,13 +38,13 @@ AbstractCardItem::~AbstractCardItem()
 
 QRectF AbstractCardItem::boundingRect() const
 {
-    return QRectF(0, 0, CardDimensions::WIDTH_F, CardDimensions::HEIGHT_F);
+    return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);
 }
 
 QPainterPath AbstractCardItem::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
+    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0;
     shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
     return shape;
 }
@@ -61,8 +60,7 @@ void AbstractCardItem::refreshCardInfo()
     exactCard = CardDatabaseManager::query()->getCard(cardRef);
 
     if (!exactCard && !cardRef.name.isEmpty()) {
-        CardInfo::UiAttributes attributes = {.tableRow = -1};
-        auto info = CardInfo::newInstance(cardRef.name, "", true, {}, {}, {}, {}, attributes);
+        auto info = CardInfo::newInstance(cardRef.name, "", true, {}, {}, {}, {}, false, false, -1, false);
         exactCard = ExactCard(info);
     }
     if (exactCard) {
@@ -121,11 +119,11 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
 
     if (facedown || cardRef.name.isEmpty()) {
         // never reveal card color, always paint the card back
-        CardPictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize());
+        PictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize());
     } else {
         // 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());
+            PictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize());
             if (translatedPixmap.isNull())
                 paintImage = false;
         } else {
@@ -216,9 +214,9 @@ void AbstractCardItem::setHovered(bool _hovered)
     if (_hovered)
         processHoverEvent();
     isHovered = _hovered;
-    setZValue(_hovered ? ZValues::HOVERED_CARD : realZValue);
+    setZValue(_hovered ? 2000000004 : realZValue);
     setScale(_hovered && SettingsCache::instance().getScaleCards() ? 1.1 : 1);
-    setTransformOriginPoint(_hovered ? CardDimensions::WIDTH_HALF_F : 0, _hovered ? CardDimensions::HEIGHT_HALF_F : 0);
+    setTransformOriginPoint(_hovered ? CARD_WIDTH / 2 : 0, _hovered ? CARD_HEIGHT / 2 : 0);
     update();
 }
 
@@ -274,9 +272,9 @@ void AbstractCardItem::setTapped(bool _tapped, bool canAnimate)
     else {
         tapAngle = tapped ? 90 : 0;
         setTransform(QTransform()
-                         .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
+                         .translate((float)CARD_WIDTH / 2, (float)CARD_HEIGHT / 2)
                          .rotate(tapAngle)
-                         .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
+                         .translate((float)-CARD_WIDTH / 2, (float)-CARD_HEIGHT / 2));
         update();
     }
 }
diff --git a/cockatrice/src/game/board/abstract_card_item.h b/cockatrice/src/game/board/abstract_card_item.h
index 7d2c29cae..755735383 100644
--- a/cockatrice/src/game/board/abstract_card_item.h
+++ b/cockatrice/src/game/board/abstract_card_item.h
@@ -1,21 +1,16 @@
-/**
- * @file abstract_card_item.h
- * @ingroup GameGraphicsCards
- * @brief TODO: Document this.
- */
-
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
-#include "../../game_graphics/board/graphics_item_type.h"
-#include "../card_dimensions.h"
+#include "../../card/exact_card.h"
 #include "arrow_target.h"
-
-#include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/utility/card_ref.h>
+#include "card_ref.h"
+#include "graphics_item_type.h"
 
 class Player;
 
+const int CARD_WIDTH = 72;
+const int CARD_HEIGHT = 102;
+
 class AbstractCardItem : public ArrowTarget
 {
     Q_OBJECT
diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp
index 08d19ec8a..c821dc4f8 100644
--- a/cockatrice/src/game/board/abstract_counter.cpp
+++ b/cockatrice/src/game/board/abstract_counter.cpp
@@ -1,20 +1,21 @@
 #include "abstract_counter.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../settings/cache_settings.h"
+#include "../../tabs/tab_game.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
+#include "expression.h"
+#include "pb/command_inc_counter.pb.h"
+#include "pb/command_set_counter.pb.h"
 #include "translate_counter_name.h"
 
 #include <QAction>
 #include <QApplication>
+#include <QGraphicsSceneHoverEvent>
 #include <QGraphicsSceneMouseEvent>
 #include <QKeyEvent>
 #include <QMenu>
+#include <QPainter>
 #include <QString>
-#include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_set_counter.pb.h>
-#include <libcockatrice/utility/expression.h>
 
 AbstractCounter::AbstractCounter(Player *_player,
                                  int _id,
@@ -84,13 +85,9 @@ void AbstractCounter::retranslateUi()
 
 void AbstractCounter::setShortcutsActive()
 {
-    if (!menu) {
-        return;
-    }
     if (!player->getPlayerInfo()->getLocal()) {
         return;
     }
-
     ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
     if (name == "life") {
         shortcutActive = true;
@@ -107,10 +104,6 @@ void AbstractCounter::setShortcutsActive()
 
 void AbstractCounter::setShortcutsInactive()
 {
-    if (!menu) {
-        return;
-    }
-
     shortcutActive = false;
     if (name == "life" || useNameForShortcut) {
         aSet->setShortcut(QKeySequence());
diff --git a/cockatrice/src/game/board/abstract_counter.h b/cockatrice/src/game/board/abstract_counter.h
index 074650d54..dca167ffa 100644
--- a/cockatrice/src/game/board/abstract_counter.h
+++ b/cockatrice/src/game/board/abstract_counter.h
@@ -1,14 +1,7 @@
-/**
- * @file abstract_counter.h
- * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef COUNTER_H
 #define COUNTER_H
 
-#include "../../interface/widgets/menus/tearoff_menu.h"
-#include "../player/menu/abstract_player_component.h"
+#include "../../interface/tearoff_menu.h"
 
 #include <QGraphicsItem>
 #include <QInputDialog>
@@ -19,7 +12,7 @@ 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)
@@ -57,10 +50,10 @@ public:
                     QGraphicsItem *parent = nullptr);
     ~AbstractCounter() override;
 
-    void retranslateUi() override;
+    void retranslateUi();
     void setValue(int _value);
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
+    void setShortcutsActive();
+    void setShortcutsInactive();
     void delCounter();
 
     QMenu *getMenu() const
diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp b/cockatrice/src/game/board/abstract_graphics_item.cpp
similarity index 92%
rename from cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
rename to cockatrice/src/game/board/abstract_graphics_item.cpp
index 05f4a41ab..8ced8d5bc 100644
--- a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
+++ b/cockatrice/src/game/board/abstract_graphics_item.cpp
@@ -17,7 +17,12 @@ void AbstractGraphicsItem::paintNumberEllipse(int number,
     font.setWeight(QFont::Bold);
 
     QFontMetrics fm(font);
-    double w = 1.3 * fm.horizontalAdvance(numStr);
+    double w = 1.3 *
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
+               fm.horizontalAdvance(numStr);
+#else
+               fm.width(numStr);
+#endif
     double h = fm.height() * 1.3;
     if (w < h)
         w = h;
diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.h b/cockatrice/src/game/board/abstract_graphics_item.h
similarity index 84%
rename from cockatrice/src/game_graphics/board/abstract_graphics_item.h
rename to cockatrice/src/game/board/abstract_graphics_item.h
index 93b9bff1b..eaa0b881a 100644
--- a/cockatrice/src/game_graphics/board/abstract_graphics_item.h
+++ b/cockatrice/src/game/board/abstract_graphics_item.h
@@ -1,9 +1,3 @@
-/**
- * @file abstract_graphics_item.h
- * @ingroup GameGraphics
- * @brief TODO: Document this.
- */
-
 #ifndef ABSTRACTGRAPHICSITEM_H
 #define ABSTRACTGRAPHICSITEM_H
 
diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp
index 60585a774..819fb7927 100644
--- a/cockatrice/src/game/board/arrow_item.cpp
+++ b/cockatrice/src/game/board/arrow_item.cpp
@@ -1,31 +1,28 @@
 #define _USE_MATH_DEFINES
 #include "arrow_item.h"
 
-#include "../../client/settings/cache_settings.h"
+#include "../../card/card_info.h"
+#include "../../settings/cache_settings.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
 #include "../player/player_target.h"
-#include "../z_values.h"
 #include "../zones/card_zone.h"
 #include "card_item.h"
+#include "color.h"
+#include "pb/command_attach_card.pb.h"
+#include "pb/command_create_arrow.pb.h"
+#include "pb/command_delete_arrow.pb.h"
 
 #include <QDebug>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <QtMath>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
-#include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
-#include <libcockatrice/utility/color.h>
-#include <libcockatrice/utility/zone_names.h>
 
 ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color)
     : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), targetLocked(false),
       color(_color), fullColor(true)
 {
-    setZValue(ZValues::ARROWS);
+    setZValue(2000000005);
 
     if (startItem)
         startItem->addArrowFrom(this);
@@ -154,8 +151,8 @@ void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
     }
 }
 
-ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase)
-    : ArrowItem(_owner, -1, _startItem, 0, _color), deleteInPhase(_deleteInPhase)
+ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color)
+    : ArrowItem(_owner, -1, _startItem, 0, _color)
 {
 }
 
@@ -234,28 +231,20 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
             cmd.set_target_zone(targetZone->getName().toStdString());
             cmd.set_target_card_id(targetCard->getId());
-        } else { // failed to cast target to card, this means it's a player
+        } else {
             PlayerTarget *targetPlayer = qgraphicsitem_cast<PlayerTarget *>(targetItem);
             cmd.set_target_player_id(targetPlayer->getOwner()->getPlayerInfo()->getId());
         }
-
-        // if the card is in hand then we will move the card to stack or table as part of drawing the arrow
-        if (startZone->getName() == ZoneNames::HAND) {
+        if (startZone->getName().compare("hand") == 0) {
             startCard->playCard(false);
             CardInfoPtr ci = startCard->getCard().getCardPtr();
-            bool playToStack = SettingsCache::instance().getPlayToStack();
-            if (ci && ((!playToStack && ci->getUiAttributes().tableRow == 3) ||
-                       (playToStack && ci->getUiAttributes().tableRow != 0 &&
-                        startCard->getZone()->getName() != ZoneNames::STACK)))
-                cmd.set_start_zone(ZoneNames::STACK);
+            if (ci && ((!SettingsCache::instance().getPlayToStack() && ci->getTableRow() == 3) ||
+                       (SettingsCache::instance().getPlayToStack() && ci->getTableRow() != 0 &&
+                        startCard->getZone()->getName().toStdString() != "stack")))
+                cmd.set_start_zone("stack");
             else
-                cmd.set_start_zone(playToStack ? ZoneNames::STACK : ZoneNames::TABLE);
+                cmd.set_start_zone(SettingsCache::instance().getPlayToStack() ? "stack" : "table");
         }
-
-        if (deleteInPhase != 0) {
-            cmd.set_delete_in_phase(deleteInPhase);
-        }
-
         player->getPlayerActions()->sendGameCommand(cmd);
     }
     delArrow();
@@ -319,7 +308,7 @@ void ArrowAttachItem::mouseMoveEvent(QGraphicsSceneMouseEvent *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) {
+    if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != "table") {
         return;
     }
 
@@ -327,12 +316,12 @@ void ArrowAttachItem::attachCards(CardItem *startCard, const CardItem *targetCar
     CardZoneLogic *targetZone = targetCard->getZone();
 
     // move card onto table first if attaching from some other zone
-    if (startZone->getName() != ZoneNames::TABLE) {
+    if (startZone->getName() != "table") {
         player->getPlayerActions()->playCardToTable(startCard, false);
     }
 
     Command_AttachCard cmd;
-    cmd.set_start_zone(ZoneNames::TABLE);
+    cmd.set_start_zone("table");
     cmd.set_card_id(startCard->getId());
     cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
     cmd.set_target_zone(targetZone->getName().toStdString());
diff --git a/cockatrice/src/game/board/arrow_item.h b/cockatrice/src/game/board/arrow_item.h
index cb78ee066..fe5669eb3 100644
--- a/cockatrice/src/game/board/arrow_item.h
+++ b/cockatrice/src/game/board/arrow_item.h
@@ -1,9 +1,3 @@
-/**
- * @file arrow_item.h
- * @ingroup GameGraphics
- * @brief TODO: Document this.
- */
-
 #ifndef ARROWITEM_H
 #define ARROWITEM_H
 
@@ -36,22 +30,22 @@ public:
     ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &color);
     ~ArrowItem() override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    [[nodiscard]] QRectF boundingRect() const override
+    QRectF boundingRect() const override
     {
         return path.boundingRect();
     }
-    [[nodiscard]] QPainterPath shape() const override
+    QPainterPath shape() const override
     {
         return path;
     }
     void updatePath();
     void updatePath(const QPointF &endPoint);
 
-    [[nodiscard]] int getId() const
+    int getId() const
     {
         return id;
     }
-    [[nodiscard]] Player *getPlayer() const
+    Player *getPlayer() const
     {
         return player;
     }
@@ -63,11 +57,11 @@ public:
     {
         targetItem = _item;
     }
-    [[nodiscard]] ArrowTarget *getStartItem() const
+    ArrowTarget *getStartItem() const
     {
         return startItem;
     }
-    [[nodiscard]] ArrowTarget *getTargetItem() const
+    ArrowTarget *getTargetItem() const
     {
         return targetItem;
     }
@@ -82,11 +76,10 @@ class ArrowDragItem : public ArrowItem
 {
     Q_OBJECT
 private:
-    int deleteInPhase;
     QList<ArrowDragItem *> childArrows;
 
 public:
-    ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase);
+    ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color);
     void addChildArrow(ArrowDragItem *childArrow);
 
 protected:
diff --git a/cockatrice/src/game/board/arrow_target.h b/cockatrice/src/game/board/arrow_target.h
index 55f4ef678..a4ef6895d 100644
--- a/cockatrice/src/game/board/arrow_target.h
+++ b/cockatrice/src/game/board/arrow_target.h
@@ -1,13 +1,7 @@
-/**
- * @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 "abstract_graphics_item.h"
 
 #include <QList>
 
@@ -28,18 +22,18 @@ public:
     explicit ArrowTarget(Player *_owner, QGraphicsItem *parent = nullptr);
     ~ArrowTarget() override;
 
-    [[nodiscard]] Player *getOwner() const
+    Player *getOwner() const
     {
         return owner;
     }
 
     void setBeingPointedAt(bool _beingPointedAt);
-    [[nodiscard]] bool getBeingPointedAt() const
+    bool getBeingPointedAt() const
     {
         return beingPointedAt;
     }
 
-    [[nodiscard]] const QList<ArrowItem *> &getArrowsFrom() const
+    const QList<ArrowItem *> &getArrowsFrom() const
     {
         return arrowsFrom;
     }
@@ -51,7 +45,7 @@ public:
     {
         arrowsFrom.removeOne(arrow);
     }
-    [[nodiscard]] const QList<ArrowItem *> &getArrowsTo() const
+    const QList<ArrowItem *> &getArrowsTo() const
     {
         return arrowsTo;
     }
diff --git a/cockatrice/src/game/board/card_drag_item.cpp b/cockatrice/src/game/board/card_drag_item.cpp
index 5ae56ccba..9eadadeda 100644
--- a/cockatrice/src/game/board/card_drag_item.cpp
+++ b/cockatrice/src/game/board/card_drag_item.cpp
@@ -13,10 +13,9 @@
 CardDragItem::CardDragItem(CardItem *_item,
                            int _id,
                            const QPointF &_hotSpot,
-                           bool _forceFaceDown,
+                           bool _faceDown,
                            AbstractCardDragItem *parentDrag)
-    : AbstractCardDragItem(_item, _hotSpot, parentDrag), id(_id), forceFaceDown(_forceFaceDown), occupied(false),
-      currentZone(0)
+    : AbstractCardDragItem(_item, _hotSpot, parentDrag), id(_id), faceDown(_faceDown), occupied(false), currentZone(0)
 {
 }
 
diff --git a/cockatrice/src/game/board/card_drag_item.h b/cockatrice/src/game/board/card_drag_item.h
index 930c6be6f..794fd6ed3 100644
--- a/cockatrice/src/game/board/card_drag_item.h
+++ b/cockatrice/src/game/board/card_drag_item.h
@@ -1,9 +1,3 @@
-/**
- * @file card_drag_item.h
- * @ingroup GameGraphicsCards
- * @brief TODO: Document this.
- */
-
 #ifndef CARDDRAGITEM_H
 #define CARDDRAGITEM_H
 
@@ -16,7 +10,7 @@ class CardDragItem : public AbstractCardDragItem
     Q_OBJECT
 private:
     int id;
-    bool forceFaceDown;
+    bool faceDown;
     bool occupied;
     CardZone *currentZone;
 
@@ -24,15 +18,15 @@ public:
     CardDragItem(CardItem *_item,
                  int _id,
                  const QPointF &_hotSpot,
-                 bool _forceFaceDown,
+                 bool _faceDown,
                  AbstractCardDragItem *parentDrag = 0);
     int getId() const
     {
         return id;
     }
-    bool isForceFaceDown() const
+    bool getFaceDown() const
     {
-        return forceFaceDown;
+        return faceDown;
     }
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     void updatePosition(const QPointF &cursorScenePos) override;
diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp
index 62de4a02e..da347098f 100644
--- a/cockatrice/src/game/board/card_item.cpp
+++ b/cockatrice/src/game/board/card_item.cpp
@@ -1,24 +1,23 @@
 #include "card_item.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../card/card_info.h"
+#include "../../settings/cache_settings.h"
+#include "../../settings/card_counter_settings.h"
+#include "../../tabs/tab_game.h"
 #include "../game_scene.h"
-#include "../phase.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
+#include "../zones/card_zone.h"
 #include "../zones/logic/view_zone_logic.h"
 #include "../zones/table_zone.h"
 #include "../zones/view_zone.h"
 #include "arrow_item.h"
 #include "card_drag_item.h"
+#include "pb/serverinfo_card.pb.h"
 
-#include <../../client/settings/card_counter_settings.h>
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QMenu>
 #include <QPainter>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 
 CardItem::CardItem(Player *_owner, QGraphicsItem *parent, const CardRef &cardRef, int _cardid, CardZoneLogic *_zone)
     : AbstractCardItem(parent, cardRef, _owner, _cardid), zone(_zone), attacking(false), destroyOnZoneChange(false),
@@ -212,12 +211,10 @@ void CardItem::setAttachedTo(CardItem *_attachedTo)
     }
 }
 
-/**
- * @brief Resets the fields that should be reset after a zone transition
- */
 void CardItem::resetState(bool keepAnnotations)
 {
     attacking = false;
+    facedown = false;
     counters.clear();
     pt.clear();
     if (!keepAnnotations) {
@@ -253,10 +250,10 @@ void CardItem::processCardInfo(const ServerInfo_Card &_info)
     setDoesntUntap(_info.doesnt_untap());
 }
 
-CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool forceFaceDown)
+CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown)
 {
     deleteDragItem();
-    dragItem = new CardDragItem(this, _id, _pos, forceFaceDown);
+    dragItem = new CardDragItem(this, _id, _pos, faceDown);
     dragItem->setVisible(false);
     scene()->addItem(dragItem);
     dragItem->updatePosition(_scenePos);
@@ -278,14 +275,9 @@ void CardItem::drawArrow(const QColor &arrowColor)
     if (owner->getGame()->getPlayerManager()->isSpectator())
         return;
 
-    auto *game = owner->getGame();
-    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();
-        phase = Phases::getLastSubphase(currentPhase) + 1;
-    }
-    ArrowDragItem *arrow = new ArrowDragItem(arrowOwner, this, arrowColor, phase);
+    Player *arrowOwner =
+        owner->getGame()->getPlayerManager()->getActiveLocalPlayer(owner->getGame()->getGameState()->getActivePlayer());
+    ArrowDragItem *arrow = new ArrowDragItem(arrowOwner, this, arrowColor);
     scene()->addItem(arrow);
     arrow->grabMouse();
 
@@ -296,7 +288,7 @@ void CardItem::drawArrow(const QColor &arrowColor)
         if (card->getZone() != zone)
             continue;
 
-        ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor, phase);
+        ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor);
         scene()->addItem(childArrow);
         arrow->addChildArrow(childArrow);
     }
@@ -354,7 +346,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
         // Use the buttonDownPos to align the hot spot with the position when
         // the user originally clicked
-        createDragItem(id, event->buttonDownPos(Qt::LeftButton), event->scenePos(), forceFaceDown);
+        createDragItem(id, event->buttonDownPos(Qt::LeftButton), event->scenePos(), facedown || forceFaceDown);
         dragItem->grabMouse();
 
         int childIndex = 0;
@@ -367,7 +359,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
             if (zone->getHasCardAttr())
                 childPos = card->pos() - pos();
             else
-                childPos = QPointF(childIndex * CardDimensions::WIDTH_HALF_F, 0);
+                childPos = QPointF(childIndex * CARD_WIDTH / 2, 0);
             CardDragItem *drag =
                 new CardDragItem(card, card->getId(), childPos, card->getFaceDown() || forceFaceDown, dragItem);
             drag->setPos(dragItem->pos() + childPos);
@@ -476,9 +468,9 @@ bool CardItem::animationEvent()
     }
 
     setTransform(QTransform()
-                     .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
+                     .translate(CARD_WIDTH_HALF, CARD_HEIGHT_HALF)
                      .rotate(tapAngle)
-                     .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
+                     .translate(-CARD_WIDTH_HALF, -CARD_HEIGHT_HALF));
     setHovered(false);
     update();
 
diff --git a/cockatrice/src/game/board/card_item.h b/cockatrice/src/game/board/card_item.h
index da2097a2c..65c870afb 100644
--- a/cockatrice/src/game/board/card_item.h
+++ b/cockatrice/src/game/board/card_item.h
@@ -1,16 +1,9 @@
-/**
- * @file card_item.h
- * @ingroup GameGraphicsCards
- * @brief TODO: Document this.
- */
-
 #ifndef CARDITEM_H
 #define CARDITEM_H
 
 #include "../zones/logic/card_zone_logic.h"
 #include "abstract_card_item.h"
-
-#include <libcockatrice/network/server/remote/game/server_card.h>
+#include "server/game/server_card.h"
 
 class CardDatabase;
 class CardDragItem;
@@ -21,6 +14,8 @@ class QAction;
 class QColor;
 
 const int MAX_COUNTERS_ON_CARD = 999;
+const float CARD_WIDTH_HALF = CARD_WIDTH / 2;
+const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2;
 const int ROTATION_DEGREES_PER_FRAME = 10;
 
 class CardItem : public AbstractCardItem
@@ -49,7 +44,7 @@ public:
     {
         Type = typeCard
     };
-    [[nodiscard]] int type() const override
+    int type() const override
     {
         return Type;
     }
@@ -60,13 +55,13 @@ public:
                       CardZoneLogic *_zone = nullptr);
 
     void retranslateUi();
-    [[nodiscard]] CardZoneLogic *getZone() const
+    CardZoneLogic *getZone() const
     {
         return zone;
     }
     void setZone(CardZoneLogic *_zone);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    [[nodiscard]] QPoint getGridPoint() const
+    QPoint getGridPoint() const
     {
         return gridPoint;
     }
@@ -74,11 +69,11 @@ public:
     {
         gridPoint = _gridPoint;
     }
-    [[nodiscard]] QPoint getGridPos() const
+    QPoint getGridPos() const
     {
         return gridPoint;
     }
-    [[nodiscard]] Player *getOwner() const
+    Player *getOwner() const
     {
         return owner;
     }
@@ -86,32 +81,32 @@ public:
     {
         owner = _owner;
     }
-    [[nodiscard]] bool getAttacking() const
+    bool getAttacking() const
     {
         return attacking;
     }
     void setAttacking(bool _attacking);
-    [[nodiscard]] const QMap<int, int> &getCounters() const
+    const QMap<int, int> &getCounters() const
     {
         return counters;
     }
     void setCounter(int _id, int _value);
-    [[nodiscard]] QString getAnnotation() const
+    QString getAnnotation() const
     {
         return annotation;
     }
     void setAnnotation(const QString &_annotation);
-    [[nodiscard]] bool getDoesntUntap() const
+    bool getDoesntUntap() const
     {
         return doesntUntap;
     }
     void setDoesntUntap(bool _doesntUntap);
-    [[nodiscard]] QString getPT() const
+    QString getPT() const
     {
         return pt;
     }
     void setPT(const QString &_pt);
-    [[nodiscard]] bool getDestroyOnZoneChange() const
+    bool getDestroyOnZoneChange() const
     {
         return destroyOnZoneChange;
     }
@@ -119,7 +114,7 @@ public:
     {
         destroyOnZoneChange = _destroy;
     }
-    [[nodiscard]] CardItem *getAttachedTo() const
+    CardItem *getAttachedTo() const
     {
         return attachedTo;
     }
@@ -132,7 +127,7 @@ public:
     {
         attachedCards.removeOne(card);
     }
-    [[nodiscard]] const QList<CardItem *> &getAttachedCards() const
+    const QList<CardItem *> &getAttachedCards() const
     {
         return attachedCards;
     }
@@ -140,7 +135,7 @@ public:
     void processCardInfo(const ServerInfo_Card &_info);
 
     bool animationEvent();
-    CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool forceFaceDown);
+    CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown);
     void deleteDragItem();
     void drawArrow(const QColor &arrowColor);
     void drawAttachArrow();
diff --git a/cockatrice/src/game/board/card_list.cpp b/cockatrice/src/game/board/card_list.cpp
index c324ca10a..7ad9048c3 100644
--- a/cockatrice/src/game/board/card_list.cpp
+++ b/cockatrice/src/game/board/card_list.cpp
@@ -1,10 +1,10 @@
 #include "card_list.h"
 
+#include "../../card/card_info.h"
 #include "card_item.h"
 
 #include <QDebug>
 #include <algorithm>
-#include <libcockatrice/card/card_info.h>
 
 CardList::CardList(bool _contentsKnown) : QList<CardItem *>(), contentsKnown(_contentsKnown)
 {
diff --git a/cockatrice/src/game/board/card_list.h b/cockatrice/src/game/board/card_list.h
index 07be33b32..d719b9a7e 100644
--- a/cockatrice/src/game/board/card_list.h
+++ b/cockatrice/src/game/board/card_list.h
@@ -1,9 +1,3 @@
-/**
- * @file card_list.h
- * @ingroup GameLogicCards
- * @brief TODO: Document this.
- */
-
 #ifndef CARDLIST_H
 #define CARDLIST_H
 
diff --git a/cockatrice/src/game/board/counter_general.cpp b/cockatrice/src/game/board/counter_general.cpp
index d68486a1b..c71077324 100644
--- a/cockatrice/src/game/board/counter_general.cpp
+++ b/cockatrice/src/game/board/counter_general.cpp
@@ -1,7 +1,7 @@
 #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>
 
diff --git a/cockatrice/src/game/board/counter_general.h b/cockatrice/src/game/board/counter_general.h
index 3db1d7bb4..dcf93c72c 100644
--- a/cockatrice/src/game/board/counter_general.h
+++ b/cockatrice/src/game/board/counter_general.h
@@ -1,9 +1,3 @@
-/**
- * @file counter_general.h
- * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef COUNTER_GENERAL_H
 #define COUNTER_GENERAL_H
 
diff --git a/cockatrice/src/game_graphics/board/graphics_item_type.h b/cockatrice/src/game/board/graphics_item_type.h
similarity index 83%
rename from cockatrice/src/game_graphics/board/graphics_item_type.h
rename to cockatrice/src/game/board/graphics_item_type.h
index c48ae4ed6..eb81cc3aa 100644
--- a/cockatrice/src/game_graphics/board/graphics_item_type.h
+++ b/cockatrice/src/game/board/graphics_item_type.h
@@ -1,9 +1,3 @@
-/**
- * @file graphics_item_type.h
- * @ingroup GameGraphics
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_GRAPHICS_ITEM_TYPE_H
 #define COCKATRICE_GRAPHICS_ITEM_TYPE_H
 
diff --git a/cockatrice/src/game/board/translate_counter_name.h b/cockatrice/src/game/board/translate_counter_name.h
index fdb277c11..a098a8a7d 100644
--- a/cockatrice/src/game/board/translate_counter_name.h
+++ b/cockatrice/src/game/board/translate_counter_name.h
@@ -1,9 +1,3 @@
-/**
- * @file translate_counter_name.h
- * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef TRANSLATECOUNTERNAME_H
 #define TRANSLATECOUNTERNAME_H
 
diff --git a/cockatrice/src/game/card_dimensions.h b/cockatrice/src/game/card_dimensions.h
deleted file mode 100644
index 255d0bc04..000000000
--- a/cockatrice/src/game/card_dimensions.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef CARD_DIMENSIONS_H
-#define CARD_DIMENSIONS_H
-
-#include <QtGlobal>
-
-/**
- * @file card_dimensions.h
- * @brief Canonical card dimension constants for layout and Z-value calculations.
- *
- * These values represent the logical pixel dimensions of a standard card graphic.
- * They are used throughout the game scene for layout, rendering, and Z-value computation.
- */
-namespace CardDimensions
-{
-/// Card width in pixels
-constexpr int WIDTH = 72;
-/// Card height in pixels
-constexpr int HEIGHT = 102;
-
-/// 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);
-
-/// Half-dimensions for centering and rotation transforms
-constexpr qreal WIDTH_HALF_F = WIDTH_F / 2;
-constexpr qreal HEIGHT_HALF_F = HEIGHT_F / 2;
-} // namespace CardDimensions
-
-#endif // CARD_DIMENSIONS_H
diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp
index 620dfaa5f..46b1cc524 100644
--- a/cockatrice/src/game/deckview/deck_view.cpp
+++ b/cockatrice/src/game/deckview/deck_view.cpp
@@ -1,16 +1,16 @@
 #include "deck_view.h"
 
-#include "../../client/settings/cache_settings.h"
+#include "../../card/card_info.h"
 #include "../../interface/theme_manager.h"
+#include "../../settings/cache_settings.h"
+#include "deck_list.h"
+#include "deck_list_card_node.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QMouseEvent>
 #include <QtMath>
 #include <algorithm>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 
 DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item,
                                            const QPointF &_hotSpot,
@@ -41,8 +41,8 @@ void DeckViewCardDragItem::updatePosition(const QPointF &cursorScenePos)
 
 void DeckViewCardDragItem::handleDrop(DeckViewCardContainer *target)
 {
-    auto *card = static_cast<DeckViewCard *>(item);
-    auto *start = static_cast<DeckViewCardContainer *>(item->parentItem());
+    DeckViewCard *card = static_cast<DeckViewCard *>(item);
+    DeckViewCardContainer *start = static_cast<DeckViewCardContainer *>(item->parentItem());
     start->removeCard(card);
     target->addCard(card);
     card->setParentItem(target);
@@ -51,13 +51,13 @@ void DeckViewCardDragItem::handleDrop(DeckViewCardContainer *target)
 void DeckViewCardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     setCursor(Qt::OpenHandCursor);
-    auto *sc = static_cast<DeckViewScene *>(scene());
+    DeckViewScene *sc = static_cast<DeckViewScene *>(scene());
     sc->removeItem(this);
 
     if (currentZone) {
         handleDrop(currentZone);
         for (int i = 0; i < childDrags.size(); i++) {
-            auto *c = static_cast<DeckViewCardDragItem *>(childDrags[i]);
+            DeckViewCardDragItem *c = static_cast<DeckViewCardDragItem *>(childDrags[i]);
             c->handleDrop(currentZone);
             sc->removeItem(c);
         }
@@ -95,9 +95,8 @@ void DeckViewCard::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
     pen.setJoinStyle(Qt::MiterJoin);
     pen.setColor(originZone == DECK_ZONE_MAIN ? Qt::green : Qt::red);
     painter->setPen(pen);
-    qreal cardRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * (CardDimensions::WIDTH_F - 3) : 0.0;
-    painter->drawRoundedRect(QRectF(1.5, 1.5, CardDimensions::WIDTH_F - 3, CardDimensions::HEIGHT_F - 3), cardRadius,
-                             cardRadius);
+    qreal cardRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * (CARD_WIDTH - 3) : 0.0;
+    painter->drawRoundedRect(QRectF(1.5, 1.5, CARD_WIDTH - 3., CARD_HEIGHT - 3.), cardRadius, cardRadius);
     painter->restore();
 }
 
@@ -119,12 +118,12 @@ void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     QList<QGraphicsItem *> sel = scene()->selectedItems();
     int j = 0;
     for (int i = 0; i < sel.size(); i++) {
-        auto *c = static_cast<DeckViewCard *>(sel.at(i));
+        DeckViewCard *c = static_cast<DeckViewCard *>(sel.at(i));
         if (c == this)
             continue;
         ++j;
-        auto childPos = QPointF(j * CardDimensions::WIDTH_HALF_F, 0);
-        auto *drag = new DeckViewCardDragItem(c, childPos, dragItem);
+        QPointF childPos = QPointF(j * CARD_WIDTH / 2, 0);
+        DeckViewCardDragItem *drag = new DeckViewCardDragItem(c, childPos, dragItem);
         drag->setPos(dragItem->pos() + childPos);
         scene()->addItem(drag);
     }
@@ -141,8 +140,8 @@ void DeckView::mouseDoubleClickEvent(QMouseEvent *event)
         QList<QGraphicsItem *> sel = scene()->selectedItems();
 
         for (int i = 0; i < sel.size(); i++) {
-            auto *c = static_cast<DeckViewCard *>(sel.at(i));
-            auto *zone = static_cast<DeckViewCardContainer *>(c->parentItem());
+            DeckViewCard *c = static_cast<DeckViewCard *>(sel.at(i));
+            DeckViewCardContainer *zone = static_cast<DeckViewCardContainer *>(c->parentItem());
             MoveCard_ToZone m;
             m.set_card_name(c->getName().toStdString());
             m.set_start_zone(zone->getName().toStdString());
@@ -205,7 +204,7 @@ void DeckViewCardContainer::paint(QPainter *painter, const QStyleOptionGraphicsI
             painter->setPen(QColor(255, 255, 255, 100));
             painter->drawLine(QPointF(0, yUntilNow - paddingY / 2), QPointF(width, yUntilNow - paddingY / 2));
         }
-        qreal thisRowHeight = CardDimensions::HEIGHT_F * currentRowsAndCols[i].first;
+        qreal thisRowHeight = CARD_HEIGHT * currentRowsAndCols[i].first;
         QRectF textRect(0, yUntilNow, totalTextWidth, thisRowHeight);
         yUntilNow += thisRowHeight + paddingY;
 
@@ -261,9 +260,9 @@ 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)
-            totalWidth = CardDimensions::WIDTH_F * rowsAndCols[i].second;
+        totalHeight += CARD_HEIGHT * rowsAndCols[i].first + paddingY;
+        if (CARD_WIDTH * rowsAndCols[i].second > totalWidth)
+            totalWidth = CARD_WIDTH * rowsAndCols[i].second;
     }
 
     return QSizeF(getCardTypeTextWidth() + totalWidth, totalHeight + separatorY + paddingY);
@@ -290,10 +289,9 @@ void DeckViewCardContainer::rearrangeItems(const QList<QPair<int, int>> &rowsAnd
         std::sort(row.begin(), row.end(), DeckViewCardContainer::sortCardsByName);
         for (int j = 0; j < row.size(); ++j) {
             DeckViewCard *card = row[j];
-            card->setPos(x + (j % tempCols) * CardDimensions::WIDTH_F,
-                         yUntilNow + (j / tempCols) * CardDimensions::HEIGHT_F);
+            card->setPos(x + (j % tempCols) * CARD_WIDTH, yUntilNow + (j / tempCols) * CARD_HEIGHT);
         }
-        yUntilNow += tempRows * CardDimensions::HEIGHT_F + paddingY;
+        yUntilNow += tempRows * CARD_HEIGHT + paddingY;
     }
 
     prepareGeometryChange();
@@ -332,7 +330,7 @@ void DeckViewScene::setDeck(const DeckList &_deck)
     if (deck)
         delete deck;
 
-    deck = new DeckList(_deck.writeToString_Native());
+    deck = new DeckList(_deck);
     rebuildTree();
     applySideboardPlan(deck->getCurrentSideboardPlan());
     rearrangeItems();
@@ -345,7 +343,10 @@ void DeckViewScene::rebuildTree()
     if (!deck)
         return;
 
-    for (auto *currentZone : deck->getZoneNodes()) {
+    InnerDecklistNode *listRoot = deck->getRoot();
+    for (int i = 0; i < listRoot->size(); i++) {
+        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+
         DeckViewCardContainer *container = cardContainers.value(currentZone->getName(), 0);
         if (!container) {
             container = new DeckViewCardContainer(currentZone->getName());
@@ -354,12 +355,12 @@ void DeckViewScene::rebuildTree()
         }
 
         for (int j = 0; j < currentZone->size(); j++) {
-            auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
             if (!currentCard)
                 continue;
 
             for (int k = 0; k < currentCard->getNumber(); ++k) {
-                auto *newCard = new DeckViewCard(container, currentCard->toCardRef(), currentZone->getName());
+                DeckViewCard *newCard = new DeckViewCard(container, currentCard->toCardRef(), currentZone->getName());
                 container->addCard(newCard);
                 emit newCardAdded(newCard);
             }
@@ -394,7 +395,7 @@ void DeckViewScene::applySideboardPlan(const QList<MoveCard_ToZone> &plan)
 
 void DeckViewScene::rearrangeItems()
 {
-    const int spacing = CardDimensions::HEIGHT / 3;
+    const int spacing = CARD_HEIGHT / 3;
     QList<DeckViewCardContainer *> contList = cardContainers.values();
 
     // Initialize space requirements
diff --git a/cockatrice/src/game/deckview/deck_view.h b/cockatrice/src/game/deckview/deck_view.h
index 5abc558bd..2cdfbbe93 100644
--- a/cockatrice/src/game/deckview/deck_view.h
+++ b/cockatrice/src/game/deckview/deck_view.h
@@ -1,17 +1,14 @@
-/**
- * @file deck_view.h
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef DECKVIEW_H
 #define DECKVIEW_H
 
 #include "../board/abstract_card_drag_item.h"
+#include "pb/move_card_to_zone.pb.h"
 
+#include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QMap>
-#include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
+#include <QMultiMap>
+#include <QPixmap>
 
 class DeckList;
 class InnerDecklistNode;
@@ -32,7 +29,7 @@ public:
                           const QString &_originZone = QString());
     ~DeckViewCard() override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    [[nodiscard]] const QString &getOriginZone() const
+    const QString &getOriginZone() const
     {
         return originZone;
     }
@@ -68,34 +65,34 @@ private:
     QMultiMap<QString, DeckViewCard *> cardsByType;
     QList<QPair<int, int>> currentRowsAndCols;
     qreal width, height;
-    [[nodiscard]] int getCardTypeTextWidth() const;
+    int getCardTypeTextWidth() const;
 
 public:
     enum
     {
         Type = typeDeckViewCardContainer
     };
-    [[nodiscard]] int type() const override
+    int type() const override
     {
         return Type;
     }
     explicit DeckViewCardContainer(const QString &_name);
-    [[nodiscard]] QRectF boundingRect() const override;
+    QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     void addCard(DeckViewCard *card);
     void removeCard(DeckViewCard *card);
-    [[nodiscard]] const QList<DeckViewCard *> &getCards() const
+    const QList<DeckViewCard *> &getCards() const
     {
         return cards;
     }
-    [[nodiscard]] const QString &getName() const
+    const QString &getName() const
     {
         return name;
     }
     void setWidth(qreal _width);
 
-    [[nodiscard]] QList<QPair<int, int>> getRowsAndCols() const;
-    [[nodiscard]] QSizeF calculateBoundingRect(const QList<QPair<int, int>> &rowsAndCols) const;
+    QList<QPair<int, int>> getRowsAndCols() const;
+    QSizeF calculateBoundingRect(const QList<QPair<int, int>> &rowsAndCols) const;
     void rearrangeItems(const QList<QPair<int, int>> &rowsAndCols);
 };
 
@@ -120,7 +117,7 @@ public:
     {
         locked = _locked;
     }
-    [[nodiscard]] bool getLocked() const
+    bool getLocked() const
     {
         return locked;
     }
@@ -132,7 +129,7 @@ public:
     }
     void rearrangeItems();
     void updateContents();
-    [[nodiscard]] QList<MoveCard_ToZone> getSideboardPlan() const;
+    QList<MoveCard_ToZone> getSideboardPlan() const;
     void resetSideboardPlan();
     void applySideboardPlan(const QList<MoveCard_ToZone> &plan);
 };
@@ -159,7 +156,7 @@ public:
     {
         deckViewScene->setLocked(_locked);
     }
-    [[nodiscard]] QList<MoveCard_ToZone> getSideboardPlan() const
+    QList<MoveCard_ToZone> getSideboardPlan() const
     {
         return deckViewScene->getSideboardPlan();
     }
diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp
index 44b2be6d1..7dd2da41b 100644
--- a/cockatrice/src/game/deckview/deck_view_container.cpp
+++ b/cockatrice/src/game/deckview/deck_view_container.cpp
@@ -1,25 +1,29 @@
 #include "deck_view_container.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "../../interface/card_picture_loader/card_picture_loader.h"
-#include "../../interface/deck_loader/deck_loader.h"
-#include "../../interface/widgets/dialogs/dlg_load_deck.h"
-#include "../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
-#include "../../interface/widgets/dialogs/dlg_load_deck_from_website.h"
-#include "../../interface/widgets/dialogs/dlg_load_remote_deck.h"
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../database/card_database.h"
+#include "../../database/card_database_manager.h"
+#include "../../deck/deck_loader.h"
+#include "../../dialogs/dlg_load_deck.h"
+#include "../../dialogs/dlg_load_deck_from_clipboard.h"
+#include "../../dialogs/dlg_load_deck_from_website.h"
+#include "../../dialogs/dlg_load_remote_deck.h"
+#include "../../picture_loader/picture_loader.h"
+#include "../../server/pending_command.h"
+#include "../../settings/cache_settings.h"
+#include "../../tabs/tab_game.h"
+#include "../game_scene.h"
 #include "deck_view.h"
+#include "pb/command_deck_select.pb.h"
+#include "pb/command_ready_start.pb.h"
+#include "pb/command_set_sideboard_lock.pb.h"
+#include "pb/command_set_sideboard_plan.pb.h"
+#include "pb/response_deck_download.pb.h"
+#include "trice_limits.h"
 
 #include <QMessageBox>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/protocol/pb/command_deck_select.pb.h>
-#include <libcockatrice/protocol/pb/command_ready_start.pb.h>
-#include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
-#include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_download.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <QMouseEvent>
+#include <QToolButton>
+#include <google/protobuf/descriptor.h>
 
 ToggleButton::ToggleButton(QWidget *parent) : QPushButton(parent), state(false)
 {
@@ -259,21 +263,22 @@ void DeckViewContainer::loadLocalDeck()
 
 void DeckViewContainer::loadDeckFromFile(const QString &filePath)
 {
-    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(filePath);
+    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(filePath);
+    DeckLoader deck;
 
-    std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(filePath, fmt, true);
+    bool success = deck.loadFromFile(filePath, fmt, true);
 
-    if (!deckOpt) {
+    if (!success) {
         QMessageBox::critical(this, tr("Error"), tr("The selected file could not be loaded."));
         return;
     }
 
-    loadDeckFromDeckList(deckOpt.value().deckList);
+    loadDeckFromDeckLoader(&deck);
 }
 
-void DeckViewContainer::loadDeckFromDeckList(const DeckList &deck)
+void DeckViewContainer::loadDeckFromDeckLoader(const DeckLoader *deck)
 {
-    QString deckString = deck.writeToString_Native();
+    QString deckString = deck->writeToString_Native();
 
     if (deckString.length() > MAX_FILE_LENGTH) {
         QMessageBox::critical(this, tr("Error"), tr("Deck is greater than maximum file size."));
@@ -307,8 +312,8 @@ void DeckViewContainer::loadFromClipboard()
         return;
     }
 
-    DeckList deck = dlg.getDeckList();
-    loadDeckFromDeckList(deck);
+    DeckLoader *deck = dlg.getDeckList();
+    loadDeckFromDeckLoader(deck);
 }
 
 void DeckViewContainer::loadFromWebsite()
@@ -319,15 +324,15 @@ void DeckViewContainer::loadFromWebsite()
         return;
     }
 
-    DeckList deck = dlg.getDeck();
-    loadDeckFromDeckList(deck);
+    DeckLoader *deck = dlg.getDeck();
+    loadDeckFromDeckLoader(deck);
 }
 
 void DeckViewContainer::deckSelectFinished(const Response &r)
 {
     const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
-    DeckList newDeck = DeckList(QString::fromStdString(resp.deck()));
-    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
+    DeckLoader newDeck(QString::fromStdString(resp.deck()));
+    PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
     setDeck(newDeck);
     switchToDeckLoadedView();
 }
@@ -408,7 +413,7 @@ void DeckViewContainer::setSideboardLocked(bool locked)
         deckView->resetSideboardPlan();
 }
 
-void DeckViewContainer::setDeck(const DeckList &deck)
+void DeckViewContainer::setDeck(const DeckLoader &deck)
 {
     deckView->setDeck(deck);
     switchToDeckLoadedView();
diff --git a/cockatrice/src/game/deckview/deck_view_container.h b/cockatrice/src/game/deckview/deck_view_container.h
index 6d685cd79..0221570af 100644
--- a/cockatrice/src/game/deckview/deck_view_container.h
+++ b/cockatrice/src/game/deckview/deck_view_container.h
@@ -1,13 +1,7 @@
-/**
- * @file deck_view_container.h
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_VIEW_CONTAINER_H
 #define DECK_VIEW_CONTAINER_H
 
-#include "../../interface/deck_loader/deck_loader.h"
+#include "../../deck/deck_loader.h"
 
 #include <QPushButton>
 
@@ -32,7 +26,7 @@ signals:
 
 public:
     explicit ToggleButton(QWidget *parent = nullptr);
-    [[nodiscard]] bool getState() const
+    bool getState() const
     {
         return state;
     }
@@ -85,12 +79,12 @@ public:
     void setReadyStart(bool ready);
     void readyAndUpdate();
     void setSideboardLocked(bool locked);
-    void setDeck(const DeckList &deck);
+    void setDeck(const DeckLoader &deck);
     void setVisualDeckStorageExists(bool exists);
 
 public slots:
     void loadDeckFromFile(const QString &filePath);
-    void loadDeckFromDeckList(const DeckList &deck);
+    void loadDeckFromDeckLoader(const DeckLoader *deck);
 };
 
 #endif // DECK_VIEW_CONTAINER_H
diff --git a/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
index 2ffb214f7..34fb16260 100644
--- a/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
+++ b/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
@@ -1,6 +1,6 @@
 #include "tabbed_deck_view_container.h"
 
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../tabs/tab_game.h"
 #include "deck_view.h"
 
 TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent)
@@ -21,8 +21,6 @@ void TabbedDeckViewContainer::addOpponentDeckView(const DeckList &opponentDeck,
         opponentDeckViews[opponentId]->setDeck(opponentDeck);
     } else {
         auto *opponentDeckView = new DeckView(this);
-        connect(opponentDeckView, &DeckView::newCardAdded, playerDeckView, &DeckViewContainer::newCardAdded);
-
         opponentDeckView->setDeck(opponentDeck);
 
         addTab(opponentDeckView, QString("%1's Deck").arg(opponentName));
diff --git a/cockatrice/src/game/deckview/tabbed_deck_view_container.h b/cockatrice/src/game/deckview/tabbed_deck_view_container.h
index c34eef1ef..4b4769ece 100644
--- a/cockatrice/src/game/deckview/tabbed_deck_view_container.h
+++ b/cockatrice/src/game/deckview/tabbed_deck_view_container.h
@@ -1,9 +1,3 @@
-/**
- * @file tabbed_deck_view_container.h
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef TABBED_DECK_VIEW_CONTAINER_H
 #define TABBED_DECK_VIEW_CONTAINER_H
 #include "deck_view_container.h"
diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp
index df264f065..8da2bc722 100644
--- a/cockatrice/src/game/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp
@@ -1,8 +1,13 @@
 #include "dlg_create_token.h"
 
-#include "../../client/settings/cache_settings.h"
+#include "../../database/card_database_manager.h"
+#include "../../database/model/card_database_model.h"
+#include "../../database/model/token/token_display_model.h"
 #include "../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "deck_list.h"
+#include "trice_limits.h"
 
 #include <QCheckBox>
 #include <QCloseEvent>
@@ -16,11 +21,7 @@
 #include <QLineEdit>
 #include <QRadioButton>
 #include <QTreeView>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/models/database/token/token_display_model.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <QVBoxLayout>
 
 DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent)
     : QDialog(parent), predefinedTokens(_predefinedTokens)
@@ -66,7 +67,7 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
     faceDownCheckBox = new QCheckBox(tr("Create face-down (Only hides name)"));
     connect(faceDownCheckBox, &QCheckBox::toggled, this, &DlgCreateToken::faceDownCheckBoxToggled);
 
-    auto *grid = new QGridLayout;
+    QGridLayout *grid = new QGridLayout;
     grid->addWidget(nameLabel, 0, 0);
     grid->addWidget(nameEdit, 0, 1);
     grid->addWidget(colorLabel, 1, 0);
@@ -78,7 +79,7 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
     grid->addWidget(destroyCheckBox, 4, 0, 1, 2);
     grid->addWidget(faceDownCheckBox, 5, 0, 1, 2);
 
-    auto *tokenDataGroupBox = new QGroupBox(tr("Token data"));
+    QGroupBox *tokenDataGroupBox = new QGroupBox(tr("Token data"));
     tokenDataGroupBox->setLayout(grid);
 
     cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
@@ -117,28 +118,32 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
         chooseTokenFromDeckRadioButton->setDisabled(true); // No tokens in deck = no need for option
     } else {
         chooseTokenFromDeckRadioButton->setChecked(true);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         cardDatabaseDisplayModel->setCardNameSet(QSet<QString>(predefinedTokens.begin(), predefinedTokens.end()));
+#else
+        cardDatabaseDisplayModel->setCardNameSet(QSet<QString>::fromList(predefinedTokens));
+#endif
     }
 
-    auto *tokenChooseLayout = new QVBoxLayout;
+    QVBoxLayout *tokenChooseLayout = new QVBoxLayout;
     tokenChooseLayout->addWidget(chooseTokenFromAllRadioButton);
     tokenChooseLayout->addWidget(chooseTokenFromDeckRadioButton);
     tokenChooseLayout->addWidget(chooseTokenView);
 
-    auto *tokenChooseGroupBox = new QGroupBox(tr("Choose token from list"));
+    QGroupBox *tokenChooseGroupBox = new QGroupBox(tr("Choose token from list"));
     tokenChooseGroupBox->setLayout(tokenChooseLayout);
 
-    auto *hbox = new QGridLayout;
+    QGridLayout *hbox = new QGridLayout;
     hbox->addWidget(pic, 0, 0, 1, 1);
     hbox->addWidget(tokenDataGroupBox, 1, 0, 1, 1);
     hbox->addWidget(tokenChooseGroupBox, 0, 1, 2, 1);
     hbox->setColumnStretch(1, 1);
 
-    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgCreateToken::actOk);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgCreateToken::actReject);
 
-    auto *mainLayout = new QVBoxLayout;
+    QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(hbox);
     mainLayout->addWidget(buttonBox);
     setLayout(mainLayout);
@@ -146,13 +151,13 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
     setWindowTitle(tr("Create token"));
 
     resize(600, 500);
-    restoreGeometry(SettingsCache::instance().layouts().getTokenDialogGeometry());
+    restoreGeometry(SettingsCache::instance().getTokenDialogGeometry());
 }
 
 void DlgCreateToken::closeEvent(QCloseEvent *event)
 {
     event->accept();
-    SettingsCache::instance().layouts().setTokenDialogGeometry(saveGeometry());
+    SettingsCache::instance().setTokenDialogGeometry(saveGeometry());
 }
 
 void DlgCreateToken::faceDownCheckBoxToggled(bool checked)
@@ -194,7 +199,16 @@ void DlgCreateToken::tokenSelectionChanged(const QModelIndex &current, const QMo
         annotationEdit->setText("");
     }
 
-    pic->setCard(CardDatabaseManager::query()->getPreferredCard(cardInfo));
+    const auto &cardProviderId =
+        SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName());
+    if (!cardProviderId.isEmpty()) {
+        CardRef ref;
+        ref.name = cardInfo->getName();
+        ref.providerId = cardProviderId;
+        pic->setCard(CardDatabaseManager::query()->getCard(ref));
+    } else {
+        pic->setCard(CardDatabaseManager::query()->getPreferredCard(cardInfo));
+    }
 }
 
 void DlgCreateToken::updateSearchFieldWithoutUpdatingFilter(const QString &newValue) const
@@ -219,19 +233,23 @@ void DlgCreateToken::actChooseTokenFromAll(bool checked)
 void DlgCreateToken::actChooseTokenFromDeck(bool checked)
 {
     if (checked) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         cardDatabaseDisplayModel->setCardNameSet(QSet<QString>(predefinedTokens.begin(), predefinedTokens.end()));
+#else
+        cardDatabaseDisplayModel->setCardNameSet(QSet<QString>::fromList(predefinedTokens));
+#endif
     }
 }
 
 void DlgCreateToken::actOk()
 {
-    SettingsCache::instance().layouts().setTokenDialogGeometry(saveGeometry());
+    SettingsCache::instance().setTokenDialogGeometry(saveGeometry());
     accept();
 }
 
 void DlgCreateToken::actReject()
 {
-    SettingsCache::instance().layouts().setTokenDialogGeometry(saveGeometry());
+    SettingsCache::instance().setTokenDialogGeometry(saveGeometry());
     reject();
 }
 
diff --git a/cockatrice/src/game/dialogs/dlg_create_token.h b/cockatrice/src/game/dialogs/dlg_create_token.h
index 9a18f1a57..df00e3d75 100644
--- a/cockatrice/src/game/dialogs/dlg_create_token.h
+++ b/cockatrice/src/game/dialogs/dlg_create_token.h
@@ -1,13 +1,8 @@
-/**
- * @file dlg_create_token.h
- * @ingroup GameDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_CREATETOKEN_H
 #define DLG_CREATETOKEN_H
 
 #include <QDialog>
+#include <QModelIndex>
 
 class QLabel;
 class QLineEdit;
@@ -38,7 +33,7 @@ class DlgCreateToken : public QDialog
     Q_OBJECT
 public:
     explicit DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent = nullptr);
-    [[nodiscard]] TokenInfo getTokenInfo() const;
+    TokenInfo getTokenInfo() const;
 
 protected:
     void closeEvent(QCloseEvent *event) override;
diff --git a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
index 2b54452ac..53b762fb4 100644
--- a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
+++ b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
@@ -1,5 +1,9 @@
 #include "dlg_move_top_cards_until.h"
 
+#include "../../database/card_database.h"
+#include "../../database/card_database_manager.h"
+#include "../../filters/filter_string.h"
+
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QLineEdit>
@@ -8,11 +12,9 @@
 #include <QString>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/card/database/card_database.h>
-#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 +22,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 +36,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 +119,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 +126,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/dialogs/dlg_move_top_cards_until.h b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.h
index 20ba11c5c..d41d029d6 100644
--- a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.h
+++ b/cockatrice/src/game/dialogs/dlg_move_top_cards_until.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_move_top_cards_until.h
- * @ingroup GameDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_MOVE_TOP_CARDS_UNTIL_H
 #define DLG_MOVE_TOP_CARDS_UNTIL_H
 
@@ -16,13 +10,6 @@
 
 class FilterString;
 
-struct MoveTopCardsUntilOptions
-{
-    QStringList exprs = {};
-    int numberOfHits = 1;
-    bool autoPlay = false;
-};
-
 class DlgMoveTopCardsUntil : public QDialog
 {
     Q_OBJECT
@@ -36,12 +23,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 = {});
-    [[nodiscard]] QString getExpr() const;
-    [[nodiscard]] MoveTopCardsUntilOptions getOptions() const;
+    explicit DlgMoveTopCardsUntil(QWidget *parent = nullptr,
+                                  QStringList exprs = QStringList(),
+                                  uint numberOfHits = 1,
+                                  bool autoPlay = false);
+    QString getExpr() const;
+    QStringList getExprs() const;
+    uint getNumberOfHits() const;
+    bool isAutoPlay() const;
 };
 
 #endif // DLG_MOVE_TOP_CARDS_UNTIL_H
diff --git a/cockatrice/src/game/dialogs/dlg_roll_dice.cpp b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp
index dfb3d0bc5..7a1a2bb9b 100644
--- a/cockatrice/src/game/dialogs/dlg_roll_dice.cpp
+++ b/cockatrice/src/game/dialogs/dlg_roll_dice.cpp
@@ -1,11 +1,12 @@
 #include "dlg_roll_dice.h"
 
+#include "trice_limits.h"
+
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QSpinBox>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/utility/trice_limits.h>
 
 DlgRollDice::DlgRollDice(QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/game/dialogs/dlg_roll_dice.h b/cockatrice/src/game/dialogs/dlg_roll_dice.h
index 69edd0757..2bd77749f 100644
--- a/cockatrice/src/game/dialogs/dlg_roll_dice.h
+++ b/cockatrice/src/game/dialogs/dlg_roll_dice.h
@@ -1,9 +1,3 @@
-/**
- * @file dlg_roll_dice.h
- * @ingroup GameDialogs
- * @brief TODO: Document this.
- */
-
 #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 38477f7f7..d24d4cb51 100644
--- a/cockatrice/src/game/game.cpp
+++ b/cockatrice/src/game/game.cpp
@@ -1,8 +1,7 @@
 #include "game.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
-
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
+#include "../tabs/tab_game.h"
+#include "pb/event_game_joined.pb.h"
 
 Game::Game(TabGame *_tab,
            QList<AbstractClient *> &_clients,
diff --git a/cockatrice/src/game/game.h b/cockatrice/src/game/game.h
index 96ebbae4d..123d18378 100644
--- a/cockatrice/src/game/game.h
+++ b/cockatrice/src/game/game.h
@@ -1,9 +1,3 @@
-/**
- * @file game.h
- * @ingroup GameLogic
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_GAME_H
 #define COCKATRICE_GAME_H
 
diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp
index 42dd49458..2637df50f 100644
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/cockatrice/src/game/game_event_handler.cpp
@@ -1,33 +1,33 @@
 #include "game_event_handler.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
+#include "../server/abstract_client.h"
+#include "../server/pending_command.h"
+#include "../tabs/tab_game.h"
 #include "abstract_game.h"
+#include "get_pb_extension.h"
 #include "log/message_log_widget.h"
-
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/get_pb_extension.h>
-#include <libcockatrice/protocol/pb/command_concede.pb.h>
-#include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
-#include <libcockatrice/protocol/pb/command_game_say.pb.h>
-#include <libcockatrice/protocol/pb/command_leave_game.pb.h>
-#include <libcockatrice/protocol/pb/command_next_turn.pb.h>
-#include <libcockatrice/protocol/pb/command_reverse_turn.pb.h>
-#include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
-#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
-#include <libcockatrice/protocol/pb/context_deck_select.pb.h>
-#include <libcockatrice/protocol/pb/event_game_closed.pb.h>
-#include <libcockatrice/protocol/pb/event_game_host_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_game_say.pb.h>
-#include <libcockatrice/protocol/pb/event_game_state_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_join.pb.h>
-#include <libcockatrice/protocol/pb/event_kicked.pb.h>
-#include <libcockatrice/protocol/pb/event_leave.pb.h>
-#include <libcockatrice/protocol/pb/event_player_properties_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_reverse_turn.pb.h>
-#include <libcockatrice/protocol/pb/event_set_active_phase.pb.h>
-#include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
-#include <libcockatrice/protocol/pb/game_event_container.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
+#include "pb/command_concede.pb.h"
+#include "pb/command_delete_arrow.pb.h"
+#include "pb/command_game_say.pb.h"
+#include "pb/command_leave_game.pb.h"
+#include "pb/command_next_turn.pb.h"
+#include "pb/command_reverse_turn.pb.h"
+#include "pb/command_set_active_phase.pb.h"
+#include "pb/context_connection_state_changed.pb.h"
+#include "pb/context_deck_select.pb.h"
+#include "pb/context_ping_changed.pb.h"
+#include "pb/event_game_closed.pb.h"
+#include "pb/event_game_host_changed.pb.h"
+#include "pb/event_game_say.pb.h"
+#include "pb/event_game_state_changed.pb.h"
+#include "pb/event_join.pb.h"
+#include "pb/event_kicked.pb.h"
+#include "pb/event_leave.pb.h"
+#include "pb/event_player_properties_changed.pb.h"
+#include "pb/event_reverse_turn.pb.h"
+#include "pb/event_set_active_phase.pb.h"
+#include "pb/event_set_active_player.pb.h"
+#include "pb/game_event_container.pb.h"
 
 GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_game)
 {
@@ -248,18 +248,20 @@ void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event
         const ServerInfo_Player &playerInfo = event.player_list(i);
         const ServerInfo_PlayerProperties &prop = playerInfo.properties();
         const int playerId = prop.player_id();
-        QString playerName = QString::fromStdString(prop.user_info().name());
-        emit addPlayerToAutoCompleteList("@" + playerName);
+        QString playerName = "@" + QString::fromStdString(prop.user_info().name());
+        emit addPlayerToAutoCompleteList(playerName);
         if (prop.spectator()) {
             if (!game->getPlayerManager()->getSpectators().contains(playerId)) {
                 game->getPlayerManager()->addSpectator(playerId, prop);
                 emit spectatorJoined(prop);
+                emit logJoinSpectator(playerName);
             }
         } else {
             Player *player = game->getPlayerManager()->getPlayers().value(playerId, 0);
             if (!player) {
                 player = game->getPlayerManager()->addPlayer(playerId, prop.user_info());
                 emit playerJoined(prop);
+                emit logJoinPlayer(player);
             }
             player->processPlayerInfo(playerInfo);
             if (player->getPlayerInfo()->getLocal()) {
@@ -429,13 +431,13 @@ void GameEventHandler::eventLeave(const Event_Leave &event, int eventPlayerId, c
     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
diff --git a/cockatrice/src/game/game_event_handler.h b/cockatrice/src/game/game_event_handler.h
index 302e7a6ff..4270bed74 100644
--- a/cockatrice/src/game/game_event_handler.h
+++ b/cockatrice/src/game/game_event_handler.h
@@ -1,18 +1,12 @@
-/**
- * @file game_event_handler.h
- * @ingroup GameLogic
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_GAME_EVENT_HANDLER_H
 #define COCKATRICE_GAME_EVENT_HANDLER_H
 
+#include "pb/event_leave.pb.h"
+#include "pb/serverinfo_player.pb.h"
 #include "player/event_processing_options.h"
 
 #include <QLoggingCategory>
 #include <QObject>
-#include <libcockatrice/protocol/pb/event_leave.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 
 class AbstractClient;
 class Response;
@@ -40,7 +34,7 @@ class AbstractGame;
 class PendingCommand;
 class Player;
 
-inline Q_LOGGING_CATEGORY(GameEventHandlerLog, "game_event_handler");
+inline Q_LOGGING_CATEGORY(GameEventHandlerLog, "tab_game");
 
 class GameEventHandler : public QObject
 {
diff --git a/cockatrice/src/game/game_meta_info.h b/cockatrice/src/game/game_meta_info.h
index b5f5bfe4f..dbf193e0c 100644
--- a/cockatrice/src/game/game_meta_info.h
+++ b/cockatrice/src/game/game_meta_info.h
@@ -1,15 +1,10 @@
-/**
- * @file game_meta_info.h
- * @ingroup GameLogic
- * @brief TODO: Document this.
- */
-
 #ifndef GAME_META_INFO_H
 #define GAME_META_INFO_H
 
+#include "pb/serverinfo_game.pb.h"
+
 #include <QMap>
 #include <QObject>
-#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 
 // Translation layer class to expose protobuf safely and hook it up to Qt Signals.
 // This class de-couples the domain object (i.e. the GameMetaInfo) from the network object.
diff --git a/cockatrice/src/game/game_scene.cpp b/cockatrice/src/game/game_scene.cpp
index 034ff6947..4316e67bf 100644
--- a/cockatrice/src/game/game_scene.cpp
+++ b/cockatrice/src/game/game_scene.cpp
@@ -1,6 +1,6 @@
 #include "game_scene.h"
 
-#include "../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 #include "board/card_item.h"
 #include "phases_toolbar.h"
 #include "player/player.h"
@@ -8,13 +8,13 @@
 #include "zones/view_zone.h"
 #include "zones/view_zone_widget.h"
 
+#include <QAction>
 #include <QBasicTimer>
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
 #include <QSet>
 #include <QtMath>
-#include <libcockatrice/utility/zone_names.h>
 #include <numeric>
 
 /**
@@ -411,9 +411,9 @@ void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numb
     connect(item, &ZoneViewWidget::closePressed, this, &GameScene::removeZoneView);
     addItem(item);
 
-    if (zoneName == ZoneNames::GRAVE)
+    if (zoneName == "grave")
         item->setPos(360, 100);
-    else if (zoneName == ZoneNames::EXILE)
+    else if (zoneName == "rfg")
         item->setPos(380, 120);
     else
         item->setPos(340, 80);
@@ -521,9 +521,9 @@ void GameScene::startRubberBand(const QPointF &selectionOrigin)
     emit sigStartRubberBand(selectionOrigin);
 }
 
-void GameScene::resizeRubberBand(const QPointF &cursorPoint, int selectedCount)
+void GameScene::resizeRubberBand(const QPointF &cursorPoint)
 {
-    emit sigResizeRubberBand(cursorPoint, selectedCount);
+    emit sigResizeRubberBand(cursorPoint);
 }
 
 void GameScene::stopRubberBand()
diff --git a/cockatrice/src/game/game_scene.h b/cockatrice/src/game/game_scene.h
index f08e83aa4..0ee3b1a81 100644
--- a/cockatrice/src/game/game_scene.h
+++ b/cockatrice/src/game/game_scene.h
@@ -24,7 +24,6 @@ class QBasicTimer;
 
 /**
  * @class GameScene
- * @ingroup GameGraphics
  * @brief Manages the game board display including players, zones, cards, and animations.
  *
  * GameScene handles:
@@ -163,7 +162,7 @@ public:
     /** Unregisters a card from animation updates. */
     void unregisterAnimationItem(AbstractCardItem *card);
     void startRubberBand(const QPointF &selectionOrigin);
-    void resizeRubberBand(const QPointF &cursorPoint, int selectedCount);
+    void resizeRubberBand(const QPointF &cursorPoint);
     void stopRubberBand();
 
 public slots:
@@ -196,7 +195,7 @@ protected:
 
 signals:
     void sigStartRubberBand(const QPointF &selectionOrigin);
-    void sigResizeRubberBand(const QPointF &cursorPoint, int selectedCount);
+    void sigResizeRubberBand(const QPointF &cursorPoint);
     void sigStopRubberBand();
 };
 
diff --git a/cockatrice/src/game/game_state.h b/cockatrice/src/game/game_state.h
index 54f6d9276..6edf579b0 100644
--- a/cockatrice/src/game/game_state.h
+++ b/cockatrice/src/game/game_state.h
@@ -1,14 +1,11 @@
-/**
- * @file game_state.h
- * @ingroup GameLogic
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_GAME_STATE_H
 #define COCKATRICE_GAME_STATE_H
 
+#include "../server/abstract_client.h"
+#include "pb/serverinfo_game.pb.h"
+
+#include <QObject>
 #include <QTimer>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
 
 class AbstractGame;
 class ServerInfo_PlayerProperties;
diff --git a/cockatrice/src/game/game_view.cpp b/cockatrice/src/game/game_view.cpp
index ce53828a7..969e26e14 100644
--- a/cockatrice/src/game/game_view.cpp
+++ b/cockatrice/src/game/game_view.cpp
@@ -1,35 +1,12 @@
 #include "game_view.h"
 
-#include "../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 #include "game_scene.h"
 
 #include <QAction>
-#include <QLabel>
 #include <QResizeEvent>
 #include <QRubberBand>
 
-// QRubberBand calls raise() in showEvent() and changeEvent() to stay on top of siblings.
-// This subclass disables that behavior so dragCountLabel can appear above it.
-class SelectionRubberBand : public QRubberBand
-{
-public:
-    using QRubberBand::QRubberBand;
-
-protected:
-    void showEvent(QShowEvent *event) override
-    {
-        QWidget::showEvent(event); // Skip QRubberBand's raise()
-    }
-
-    void changeEvent(QEvent *event) override
-    {
-        if (event->type() == QEvent::ZOrderChange) {
-            return; // Skip QRubberBand's raise() on z-order changes
-        }
-        QRubberBand::changeEvent(event);
-    }
-};
-
 GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, parent), rubberBand(0)
 {
     setBackgroundBrush(QBrush(QColor(0, 0, 0)));
@@ -42,7 +19,6 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par
     connect(scene, &GameScene::sigStartRubberBand, this, &GameView::startRubberBand);
     connect(scene, &GameScene::sigResizeRubberBand, this, &GameView::resizeRubberBand);
     connect(scene, &GameScene::sigStopRubberBand, this, &GameView::stopRubberBand);
-    connect(scene, &QGraphicsScene::selectionChanged, this, [this]() { updateTotalSelectionCount(); });
 
     aCloseMostRecentZoneView = new QAction(this);
 
@@ -51,23 +27,7 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par
     connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
             &GameView::refreshShortcuts);
     refreshShortcuts();
-    rubberBand = new SelectionRubberBand(QRubberBand::Rectangle, this);
-
-    const QString countLabelStyle = "color: white; "
-                                    "font-size: 14px; "
-                                    "font-weight: bold; "
-                                    "background-color: rgba(0, 0, 0, 160); "
-                                    "border-radius: 3px; "
-                                    "padding: 1px 2px;";
-
-    dragCountLabel = new QLabel(this);
-    dragCountLabel->setStyleSheet(countLabelStyle);
-    dragCountLabel->hide();
-    dragCountLabel->raise();
-
-    totalCountLabel = new QLabel(this);
-    totalCountLabel->setStyleSheet(countLabelStyle);
-    totalCountLabel->hide();
+    rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
 }
 
 void GameView::resizeEvent(QResizeEvent *event)
@@ -79,7 +39,6 @@ void GameView::resizeEvent(QResizeEvent *event)
         s->processViewSizeChange(event->size());
 
     updateSceneRect(scene()->sceneRect());
-    updateTotalSelectionCount(event->size());
 }
 
 void GameView::updateSceneRect(const QRectF &rect)
@@ -89,67 +48,20 @@ void GameView::updateSceneRect(const QRectF &rect)
 
 void GameView::startRubberBand(const QPointF &_selectionOrigin)
 {
-    if (!rubberBand)
-        return;
-
     selectionOrigin = _selectionOrigin;
     rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), QSize(0, 0)));
     rubberBand->show();
 }
 
-void GameView::resizeRubberBand(const QPointF &cursorPoint, int selectedCount)
+void GameView::resizeRubberBand(const QPointF &cursorPoint)
 {
-    if (!rubberBand)
-        return;
-
-    constexpr int kLabelPaddingInPixels = 4;
-
-    QPoint cursor = cursorPoint.toPoint();
-    QRect rect = QRect(mapFromScene(selectionOrigin), cursor).normalized();
-    rubberBand->setGeometry(rect);
-
-    if (!SettingsCache::instance().getShowDragSelectionCount()) {
-        dragCountLabel->hide();
-        return;
-    }
-
-    if (selectedCount > 0) {
-        dragCountLabel->setText(QString::number(selectedCount));
-        dragCountLabel->adjustSize();
-        QSize labelSize = dragCountLabel->size();
-
-        if (rect.width() < labelSize.width() + 2 * kLabelPaddingInPixels ||
-            rect.height() < labelSize.height() + 2 * kLabelPaddingInPixels) {
-            dragCountLabel->hide();
-            return;
-        }
-
-        const int minX = rect.left() + kLabelPaddingInPixels;
-        const int minY = rect.top() + kLabelPaddingInPixels;
-
-        int x = qMax(minX, cursor.x() - labelSize.width() - kLabelPaddingInPixels);
-        int y = qMax(minY, cursor.y() - labelSize.height() - kLabelPaddingInPixels);
-
-        bool isAtTopLeftCorner = (x == minX) && (y == minY);
-        if (isAtTopLeftCorner) {
-            constexpr int kCursorClearanceInPixels = 16;
-            x = qMin(cursor.x() + kCursorClearanceInPixels, rect.right() - labelSize.width() - kLabelPaddingInPixels);
-        }
-
-        dragCountLabel->move(x, y);
-        dragCountLabel->show();
-    } else {
-        dragCountLabel->hide();
-    }
+    if (rubberBand)
+        rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), cursorPoint.toPoint()).normalized());
 }
 
 void GameView::stopRubberBand()
 {
-    if (!rubberBand)
-        return;
-
     rubberBand->hide();
-    dragCountLabel->hide();
 }
 
 void GameView::refreshShortcuts()
@@ -157,28 +69,3 @@ void GameView::refreshShortcuts()
     aCloseMostRecentZoneView->setShortcuts(
         SettingsCache::instance().shortcuts().getShortcut("Player/aCloseMostRecentZoneView"));
 }
-
-void GameView::updateTotalSelectionCount(const QSize &viewSize)
-{
-    if (!SettingsCache::instance().getShowTotalSelectionCount()) {
-        totalCountLabel->hide();
-        return;
-    }
-
-    int count = scene()->selectedItems().count();
-
-    if (count > 1) {
-        totalCountLabel->setText(QString::number(count));
-        totalCountLabel->adjustSize();
-
-        constexpr int kMarginInPixels = 10;
-        int availableWidth = viewSize.isValid() ? viewSize.width() : viewport()->width();
-        int availableHeight = viewSize.isValid() ? viewSize.height() : viewport()->height();
-        int x = availableWidth - totalCountLabel->width() - kMarginInPixels;
-        int y = availableHeight - totalCountLabel->height() - kMarginInPixels;
-        totalCountLabel->move(x, y);
-        totalCountLabel->show();
-    } else {
-        totalCountLabel->hide();
-    }
-}
diff --git a/cockatrice/src/game/game_view.h b/cockatrice/src/game/game_view.h
index a77ab9257..19771298d 100644
--- a/cockatrice/src/game/game_view.h
+++ b/cockatrice/src/game/game_view.h
@@ -1,16 +1,9 @@
-/**
- * @file game_view.h
- * @ingroup GameGraphics
- * @brief TODO: Document this.
- */
-
 #ifndef GAMEVIEW_H
 #define GAMEVIEW_H
 
 #include <QGraphicsView>
 
 class GameScene;
-class QLabel;
 class QRubberBand;
 
 class GameView : public QGraphicsView
@@ -19,18 +12,15 @@ class GameView : public QGraphicsView
 private:
     QAction *aCloseMostRecentZoneView;
     QRubberBand *rubberBand;
-    QLabel *dragCountLabel;
-    QLabel *totalCountLabel;
     QPointF selectionOrigin;
 
 protected:
     void resizeEvent(QResizeEvent *event) override;
 private slots:
     void startRubberBand(const QPointF &selectionOrigin);
-    void resizeRubberBand(const QPointF &cursorPoint, int selectedCount);
+    void resizeRubberBand(const QPointF &cursorPoint);
     void stopRubberBand();
     void refreshShortcuts();
-    void updateTotalSelectionCount(const QSize &viewSize = QSize());
 public slots:
     void updateSceneRect(const QRectF &rect);
 
diff --git a/cockatrice/src/game/hand_counter.h b/cockatrice/src/game/hand_counter.h
index 2c0175ecc..d1879b03d 100644
--- a/cockatrice/src/game/hand_counter.h
+++ b/cockatrice/src/game/hand_counter.h
@@ -1,14 +1,8 @@
-/**
- * @file hand_counter.h
- * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef HANDCOUNTER_H
 #define HANDCOUNTER_H
 
-#include "../game_graphics/board/abstract_graphics_item.h"
-#include "../game_graphics/board/graphics_item_type.h"
+#include "board/abstract_graphics_item.h"
+#include "board/graphics_item_type.h"
 
 #include <QString>
 
diff --git a/cockatrice/src/game/log/message_log_widget.cpp b/cockatrice/src/game/log/message_log_widget.cpp
index 09f6e656b..ed8a4e49c 100644
--- a/cockatrice/src/game/log/message_log_widget.cpp
+++ b/cockatrice/src/game/log/message_log_widget.cpp
@@ -1,18 +1,27 @@
 #include "message_log_widget.h"
 
 #include "../../client/sound_engine.h"
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../settings/card_counter_settings.h"
+#include "../../tabs/tab_game.h"
 #include "../board/card_item.h"
 #include "../board/translate_counter_name.h"
 #include "../phase.h"
 #include "../player/player.h"
+#include "../zones/card_zone.h"
+#include "pb/context_move_card.pb.h"
+#include "pb/context_mulligan.pb.h"
+#include "pb/serverinfo_user.pb.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>
 #include <utility>
 
+static const QString TABLE_ZONE_NAME = "table";
+static const QString GRAVE_ZONE_NAME = "grave";
+static const QString EXILE_ZONE_NAME = "rfg";
+static const QString HAND_ZONE_NAME = "hand";
+static const QString DECK_ZONE_NAME = "deck";
+static const QString SIDEBOARD_ZONE_NAME = "sb";
+static const QString STACK_ZONE_NAME = "stack";
+
 static QString sanitizeHtml(QString dirty)
 {
     return dirty.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;");
@@ -30,15 +39,15 @@ MessageLogWidget::getFromStr(CardZoneLogic *zone, QString cardName, int position
     QString fromStr;
     QString zoneName = zone->getName();
 
-    if (zoneName == ZoneNames::TABLE) {
+    if (zoneName == TABLE_ZONE_NAME) {
         fromStr = tr(" from play");
-    } else if (zoneName == ZoneNames::GRAVE) {
+    } else if (zoneName == GRAVE_ZONE_NAME) {
         fromStr = tr(" from their graveyard");
-    } else if (zoneName == ZoneNames::EXILE) {
+    } else if (zoneName == EXILE_ZONE_NAME) {
         fromStr = tr(" from exile");
-    } else if (zoneName == ZoneNames::HAND) {
+    } else if (zoneName == HAND_ZONE_NAME) {
         fromStr = tr(" from their hand");
-    } else if (zoneName == ZoneNames::DECK) {
+    } else if (zoneName == DECK_ZONE_NAME) {
         if (position == 0) {
             if (cardName.isEmpty()) {
                 if (ownerChange) {
@@ -54,7 +63,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());
@@ -76,9 +85,9 @@ MessageLogWidget::getFromStr(CardZoneLogic *zone, QString cardName, int position
                 fromStr = tr(" from their library");
             }
         }
-    } else if (zoneName == ZoneNames::SIDEBOARD) {
+    } else if (zoneName == SIDEBOARD_ZONE_NAME) {
         fromStr = tr(" from sideboard");
-    } else if (zoneName == ZoneNames::STACK) {
+    } else if (zoneName == STACK_ZONE_NAME) {
         fromStr = tr(" from the stack");
     } else {
         fromStr = tr(" from custom zone '%1'").arg(zoneName);
@@ -268,9 +277,9 @@ void MessageLogWidget::logMoveCard(Player *player,
     bool ownerChanged = startZone->getPlayer() != targetZone->getPlayer();
 
     // do not log if moved within the same zone
-    if ((startZoneName == ZoneNames::TABLE && targetZoneName == ZoneNames::TABLE && !ownerChanged) ||
-        (startZoneName == ZoneNames::HAND && targetZoneName == ZoneNames::HAND) ||
-        (startZoneName == ZoneNames::EXILE && targetZoneName == ZoneNames::EXILE)) {
+    if ((startZoneName == TABLE_ZONE_NAME && targetZoneName == TABLE_ZONE_NAME && !ownerChanged) ||
+        (startZoneName == HAND_ZONE_NAME && targetZoneName == HAND_ZONE_NAME) ||
+        (startZoneName == EXILE_ZONE_NAME && targetZoneName == EXILE_ZONE_NAME)) {
         return;
     }
 
@@ -299,28 +308,20 @@ void MessageLogWidget::logMoveCard(Player *player,
 
     QString finalStr;
     std::optional<QString> fourthArg;
-    if (targetZoneName == ZoneNames::TABLE) {
+    if (targetZoneName == TABLE_ZONE_NAME) {
         soundEngine->playSound("play_card");
         if (card->getFaceDown()) {
             finalStr = tr("%1 puts %2 into play%3 face down.");
         } else {
             finalStr = tr("%1 puts %2 into play%3.");
         }
-    } else if (targetZoneName == ZoneNames::GRAVE) {
-        if (card->getFaceDown()) {
-            finalStr = tr("%1 puts %2%3 into their graveyard face down.");
-        } else {
-            finalStr = tr("%1 puts %2%3 into their graveyard.");
-        }
-    } else if (targetZoneName == ZoneNames::EXILE) {
-        if (card->getFaceDown()) {
-            finalStr = tr("%1 exiles %2%3 face down.");
-        } else {
-            finalStr = tr("%1 exiles %2%3.");
-        }
-    } else if (targetZoneName == ZoneNames::HAND) {
+    } else if (targetZoneName == GRAVE_ZONE_NAME) {
+        finalStr = tr("%1 puts %2%3 into their graveyard.");
+    } else if (targetZoneName == EXILE_ZONE_NAME) {
+        finalStr = tr("%1 exiles %2%3.");
+    } else if (targetZoneName == HAND_ZONE_NAME) {
         finalStr = tr("%1 moves %2%3 to their hand.");
-    } else if (targetZoneName == ZoneNames::DECK) {
+    } else if (targetZoneName == DECK_ZONE_NAME) {
         if (newX == -1) {
             finalStr = tr("%1 puts %2%3 into their library.");
         } else if (newX >= targetZone->getCards().size()) {
@@ -332,22 +333,14 @@ void MessageLogWidget::logMoveCard(Player *player,
             fourthArg = QString::number(newX);
             finalStr = tr("%1 puts %2%3 into their library %4 cards from the top.");
         }
-    } else if (targetZoneName == ZoneNames::SIDEBOARD) {
+    } else if (targetZoneName == SIDEBOARD_ZONE_NAME) {
         finalStr = tr("%1 moves %2%3 to sideboard.");
-    } else if (targetZoneName == ZoneNames::STACK) {
+    } else if (targetZoneName == STACK_ZONE_NAME) {
         soundEngine->playSound("play_card");
-        if (card->getFaceDown()) {
-            finalStr = tr("%1 plays %2%3 face down.");
-        } else {
-            finalStr = tr("%1 plays %2%3.");
-        }
+        finalStr = tr("%1 plays %2%3.");
     } else {
         fourthArg = targetZoneName;
-        if (card->getFaceDown()) {
-            finalStr = tr("%1 moves %2%3 to custom zone '%4' face down.");
-        } else {
-            finalStr = tr("%1 moves %2%3 to custom zone '%4'.");
-        }
+        finalStr = tr("%1 moves %2%3 to custom zone '%4'.");
     }
 
     QString message = finalStr.arg(sanitizeHtml(player->getPlayerInfo()->getName()), cardStr, nameFrom.second);
diff --git a/cockatrice/src/game/log/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h
index 369debd33..b7b1c7902 100644
--- a/cockatrice/src/game/log/message_log_widget.h
+++ b/cockatrice/src/game/log/message_log_widget.h
@@ -1,14 +1,10 @@
-/**
- * @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 "../../client/translation.h"
+#include "../../server/chat_view/chat_view.h"
 #include "../zones/logic/card_zone_logic.h"
+#include "user_level.h"
 
 class AbstractGame;
 class CardItem;
diff --git a/cockatrice/src/game/phase.cpp b/cockatrice/src/game/phase.cpp
index 7fb1700a5..32c9060ee 100644
--- a/cockatrice/src/game/phase.cpp
+++ b/cockatrice/src/game/phase.cpp
@@ -22,28 +22,6 @@ Phase Phases::getPhase(int phase)
     }
 }
 
-int Phases::getLastSubphase(int phase)
-{
-    if (0 <= phase && phase < Phases::phaseTypesCount) {
-        return subPhasesEnd[phase];
-    } else {
-        return phase;
-    }
-}
-
-QVector<int> getSubPhasesEnd()
-{
-    QVector<int> array(Phases::phaseTypesCount);
-    for (int phaseEnd = Phases::phaseTypesCount - 1; phaseEnd >= 0;) {
-        int subPhase = phaseEnd;
-        for (; subPhase >= 0 && Phases::phases[phaseEnd].color == Phases::phases[subPhase].color; --subPhase) {
-            array[subPhase] = phaseEnd;
-        }
-        phaseEnd = subPhase;
-    }
-    return array;
-}
-
 const Phase Phases::unknownPhase(QT_TRANSLATE_NOOP("Phase", "Unknown Phase"), "black", "unknown_phase");
 const Phase Phases::phases[Phases::phaseTypesCount] = {
     {QT_TRANSLATE_NOOP("Phase", "Untap"), "green", "untap_step"},
@@ -57,4 +35,3 @@ const Phase Phases::phases[Phases::phaseTypesCount] = {
     {QT_TRANSLATE_NOOP("Phase", "End of Combat"), "red", "end_combat"},
     {QT_TRANSLATE_NOOP("Phase", "Second Main"), "blue", "main_2"},
     {QT_TRANSLATE_NOOP("Phase", "End/Cleanup"), "green", "end_step"}};
-const QVector<int> Phases::subPhasesEnd = getSubPhasesEnd();
diff --git a/cockatrice/src/game/phase.h b/cockatrice/src/game/phase.h
index 2e712932f..217f13f0f 100644
--- a/cockatrice/src/game/phase.h
+++ b/cockatrice/src/game/phase.h
@@ -1,9 +1,3 @@
-/**
- * @file phase.h
- * @ingroup GameLogic
- * @brief TODO: Document this.
- */
-
 #ifndef PHASE_H
 #define PHASE_H
 
@@ -28,10 +22,8 @@ struct Phases
     const static int phaseTypesCount = 11;
     const static Phase unknownPhase;
     const static Phase phases[phaseTypesCount];
-    const static QVector<int> subPhasesEnd;
 
     static Phase getPhase(int);
-    static int getLastSubphase(int phase);
 };
 
 #endif // PHASE_H
diff --git a/cockatrice/src/game/phases_toolbar.cpp b/cockatrice/src/game/phases_toolbar.cpp
index 2341a1d7f..2fef5321c 100644
--- a/cockatrice/src/game/phases_toolbar.cpp
+++ b/cockatrice/src/game/phases_toolbar.cpp
@@ -1,17 +1,16 @@
 #include "phases_toolbar.h"
 
 #include "../interface/pixel_map_generator.h"
+#include "pb/command_draw_cards.pb.h"
+#include "pb/command_next_turn.pb.h"
+#include "pb/command_set_active_phase.pb.h"
+#include "pb/command_set_card_attr.pb.h"
 
 #include <QAction>
 #include <QDebug>
 #include <QPainter>
 #include <QPen>
 #include <QTimer>
-#include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
-#include <libcockatrice/protocol/pb/command_next_turn.pb.h>
-#include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
-#include <libcockatrice/utility/zone_names.h>
 
 PhaseButton::PhaseButton(const QString &_name, QGraphicsItem *parent, QAction *_doubleClickAction, bool _highlightable)
     : QObject(), QGraphicsItem(parent), name(_name), active(false), highlightable(_highlightable),
@@ -260,7 +259,7 @@ void PhasesToolbar::actNextTurn()
 void PhasesToolbar::actUntapAll()
 {
     Command_SetCardAttr cmd;
-    cmd.set_zone(ZoneNames::TABLE);
+    cmd.set_zone("table");
     cmd.set_attribute(AttrTapped);
     cmd.set_attr_value("0");
 
diff --git a/cockatrice/src/game/phases_toolbar.h b/cockatrice/src/game/phases_toolbar.h
index 215a97dd1..1191d6a79 100644
--- a/cockatrice/src/game/phases_toolbar.h
+++ b/cockatrice/src/game/phases_toolbar.h
@@ -1,14 +1,7 @@
-/**
- * @file phases_toolbar.h
- * @ingroup GameGraphics
- * @ingroup GameWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef PHASESTOOLBAR_H
 #define PHASESTOOLBAR_H
 
-#include "../game_graphics/board/abstract_graphics_item.h"
+#include "board/abstract_graphics_item.h"
 
 #include <QFrame>
 #include <QGraphicsObject>
@@ -45,10 +38,10 @@ public:
                          QGraphicsItem *parent = nullptr,
                          QAction *_doubleClickAction = nullptr,
                          bool _highlightable = true);
-    [[nodiscard]] QRectF boundingRect() const override;
+    QRectF boundingRect() const override;
     void setWidth(double _width);
     void setActive(bool _active);
-    [[nodiscard]] bool getActive() const
+    bool getActive() const
     {
         return active;
     }
@@ -77,18 +70,18 @@ private:
 
 public:
     explicit PhasesToolbar(QGraphicsItem *parent = nullptr);
-    [[nodiscard]] QRectF boundingRect() const override;
+    QRectF boundingRect() const override;
     void retranslateUi();
     void setHeight(double _height);
-    [[nodiscard]] double getWidth() const
+    double getWidth() const
     {
         return width;
     }
-    [[nodiscard]] int phaseCount() const
+    int phaseCount() const
     {
         return buttonList.size();
     }
-    [[nodiscard]] QString getLongPhaseName(int phase) const;
+    QString getLongPhaseName(int phase) const;
 public slots:
     void setActivePhase(int phase);
     void triggerPhaseAction(int phase);
diff --git a/cockatrice/src/game/player/card_menu_action_type.h b/cockatrice/src/game/player/card_menu_action_type.h
index 1b63674fa..157164024 100644
--- a/cockatrice/src/game/player/card_menu_action_type.h
+++ b/cockatrice/src/game/player/card_menu_action_type.h
@@ -1,28 +1,19 @@
-/**
- * @file card_menu_action_type.h
- * @ingroup GameMenusPlayers
- * @brief TODO: Document this.
- */
-
 #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 3e743bdb3..c5c345ebc 100644
--- a/cockatrice/src/game/player/event_processing_options.h
+++ b/cockatrice/src/game/player/event_processing_options.h
@@ -1,9 +1,3 @@
-/**
- * @file event_processing_options.h
- * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_EVENT_PROCESSING_OPTIONS_H
 #define COCKATRICE_EVENT_PROCESSING_OPTIONS_H
 
diff --git a/cockatrice/src/game/player/menu/abstract_player_component.h b/cockatrice/src/game/player/menu/abstract_player_component.h
deleted file mode 100644
index 989300d41..000000000
--- a/cockatrice/src/game/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;
-
-    /// Bind keyboard shortcuts. Called when this player gains focus.
-    virtual void setShortcutsActive() = 0;
-
-    /// Unbind keyboard shortcuts. Called when this player loses focus.
-    virtual void setShortcutsInactive() = 0;
-
-    /// Retranslate all user-visible strings. Called on language change.
-    virtual void retranslateUi() = 0;
-};
-
-#endif // COCKATRICE_ABSTRACT_PLAYER_COMPONENT_H
diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp
index 66ca5e46b..2a669b32d 100644
--- a/cockatrice/src/game/player/menu/card_menu.cpp
+++ b/cockatrice/src/game/player/menu/card_menu.cpp
@@ -1,7 +1,8 @@
 #include "card_menu.h"
 
-#include "../../../client/settings/card_counter_settings.h"
-#include "../../../interface/widgets/tabs/tab_game.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../settings/card_counter_settings.h"
+#include "../../../tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../zones/logic/view_zone_logic.h"
 #include "../card_menu_action_type.h"
@@ -10,10 +11,6 @@
 #include "move_menu.h"
 #include "pt_menu.h"
 
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/relation/card_relation.h>
-#include <libcockatrice/utility/zone_names.h>
-
 CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive)
     : player(_player), card(_card), shortcutsActive(_shortcutsActive)
 {
@@ -35,8 +32,6 @@ CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive
     connect(aTap, &QAction::triggered, playerActions, &PlayerActions::cardMenuAction);
     aDoesntUntap = new QAction(this);
     aDoesntUntap->setData(cmDoesntUntap);
-    aDoesntUntap->setCheckable(true);
-    aDoesntUntap->setChecked(card != nullptr && card->getDoesntUntap());
     connect(aDoesntUntap, &QAction::triggered, playerActions, &PlayerActions::cardMenuAction);
     aAttach = new QAction(this);
     connect(aAttach, &QAction::triggered, playerActions, &PlayerActions::actAttach);
@@ -69,8 +64,6 @@ CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive
     aPlayFacedown = new QAction(this);
     connect(aPlayFacedown, &QAction::triggered, playerActions, &PlayerActions::actPlayFacedown);
 
-    aRevealToAll = new QAction(this);
-
     mCardCounters = new QMenu;
 
     for (int i = 0; i < 6; ++i) {
@@ -110,26 +103,36 @@ CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive
 
     if (revealedCard) {
         addAction(aHide);
-        addSeparator();
         addAction(aClone);
         addSeparator();
         addAction(aSelectAll);
         addAction(aSelectColumn);
         addRelatedCardView();
-    } else {
+    } else if (writeableCard) {
+
         if (card->getZone()) {
-            if (card->getZone()->getName() == ZoneNames::TABLE) {
-                createTableMenu(writeableCard);
-            } else if (card->getZone()->getName() == ZoneNames::STACK) {
-                createStackMenu(writeableCard);
-            } else if (card->getZone()->getName() == ZoneNames::EXILE ||
-                       card->getZone()->getName() == ZoneNames::GRAVE) {
-                createGraveyardOrExileMenu(writeableCard);
+            if (card->getZone()->getName() == "table") {
+                createTableMenu();
+            } else if (card->getZone()->getName() == "stack") {
+                createStackMenu();
+            } else if (card->getZone()->getName() == "rfg" || card->getZone()->getName() == "grave") {
+                createGraveyardOrExileMenu();
             } else {
-                createHandOrCustomZoneMenu(writeableCard);
+                createHandOrCustomZoneMenu();
             }
         } else {
-            createZonelessMenu(writeableCard);
+            addMenu(new MoveMenu(player));
+        }
+    } else {
+        if (card->getZone() && card->getZone()->getName() != "hand") {
+            addAction(aDrawArrow);
+            addSeparator();
+            addRelatedCardView();
+            addRelatedCardActions();
+            addSeparator();
+            addAction(aClone);
+            addSeparator();
+            addAction(aSelectAll);
         }
     }
 }
@@ -145,18 +148,22 @@ void CardMenu::removePlayer(Player *playerToRemove)
     }
 }
 
-void CardMenu::createTableMenu(bool canModifyCard)
+void CardMenu::createTableMenu()
 {
     // Card is on the battlefield
+    bool canModifyCard = player->getPlayerInfo()->judge || card->getOwner() == player;
+
     if (!canModifyCard) {
+        addRelatedCardView();
+        addRelatedCardActions();
+
+        addSeparator();
         addAction(aDrawArrow);
         addSeparator();
         addAction(aClone);
         addSeparator();
         addAction(aSelectAll);
         addAction(aSelectRow);
-        addRelatedCardView();
-        addRelatedCardActions();
         return;
     }
 
@@ -166,9 +173,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()) {
@@ -179,6 +187,9 @@ void CardMenu::createTableMenu(bool canModifyCard)
     addMenu(new PtMenu(player));
     addAction(aSetAnnotation);
     addSeparator();
+    addAction(aClone);
+    addMenu(new MoveMenu(player));
+    addSeparator();
     addAction(aSelectAll);
     addAction(aSelectRow);
 
@@ -194,88 +205,74 @@ void CardMenu::createTableMenu(bool canModifyCard)
     }
     addSeparator();
     addMenu(mCardCounters);
-    addRelatedCardView();
-    addRelatedCardActions();
 }
 
-void CardMenu::createStackMenu(bool canModifyCard)
+void CardMenu::createStackMenu()
 {
+    bool canModifyCard = player->getPlayerInfo()->judge || card->getOwner() == player;
+
     // 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();
 }
 
-void CardMenu::createGraveyardOrExileMenu(bool canModifyCard)
+void CardMenu::createGraveyardOrExileMenu()
 {
+    bool canModifyCard = player->getPlayerInfo()->judge || card->getOwner() == player;
+
     // 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();
 }
 
-void CardMenu::createHandOrCustomZoneMenu(bool canModifyCard)
+void CardMenu::createHandOrCustomZoneMenu()
 {
-    if (!canModifyCard) {
-        addAction(aDrawArrow);
-        addSeparator();
-        addAction(aClone);
-        addSeparator();
-        addAction(aSelectAll);
-        addRelatedCardView();
-        addRelatedCardActions();
-        return;
-    }
-
     // Card is in hand or a custom zone specified by server
     addAction(aPlay);
     addAction(aPlayFacedown);
 
     QMenu *revealMenu = addMenu(tr("Re&veal to..."));
 
-    initContextualPlayersMenu(revealMenu, aRevealToAll);
+    initContextualPlayersMenu(revealMenu);
 
     connect(revealMenu, &QMenu::triggered, player->getPlayerActions(), &PlayerActions::actReveal);
 
@@ -284,7 +281,7 @@ void CardMenu::createHandOrCustomZoneMenu(bool canModifyCard)
     addMenu(new MoveMenu(player));
 
     // actions that are really wonky when done from deck or sideboard
-    if (card->getZone()->getName() == ZoneNames::HAND) {
+    if (card->getZone()->getName() == "hand") {
         addSeparator();
         addAction(aAttach);
         addAction(aDrawArrow);
@@ -297,31 +294,14 @@ void CardMenu::createHandOrCustomZoneMenu(bool canModifyCard)
     }
 
     addRelatedCardView();
-    if (card->getZone()->getName() == ZoneNames::HAND) {
+    if (card->getZone()->getName() == "hand") {
         addRelatedCardActions();
     }
 }
 
-void CardMenu::createZonelessMenu(bool canModifyCard)
+void CardMenu::initContextualPlayersMenu(QMenu *menu)
 {
-    if (canModifyCard) {
-        addMenu(new MoveMenu(player));
-    }
-}
-
-/**
- * @brief Populates the menu with an action for each active player.
- *
- * The "all players" action is created separately, so it has to be passed into this function.
- * It will be put at the top of the menu.
- *
- * @param menu The menu to add the player actions to.
- * @param allPlayersAction The action for "all players".
- */
-void CardMenu::initContextualPlayersMenu(QMenu *menu, QAction *allPlayersAction)
-{
-    allPlayersAction->setData(-1);
-    menu->addAction(allPlayersAction);
+    menu->addAction(tr("&All players"))->setData(-1);
     menu->addSeparator();
 
     for (const auto &playerInfo : playersInfo) {
@@ -449,10 +429,9 @@ void CardMenu::retranslateUi()
     aPlay->setText(tr("&Play"));
     aHide->setText(tr("&Hide"));
     aPlayFacedown->setText(tr("Play &Face Down"));
-    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
@@ -485,9 +464,6 @@ void CardMenu::setShortcutsActive()
 
     aHide->setShortcuts(shortcuts.getShortcut("Player/aHide"));
     aPlay->setShortcuts(shortcuts.getShortcut("Player/aPlay"));
-    aPlayFacedown->setShortcuts(shortcuts.getShortcut("Player/aPlayFacedown"));
-    aRevealToAll->setShortcuts(shortcuts.getShortcut("Player/aRevealToAll"));
-
     aTap->setShortcuts(shortcuts.getShortcut("Player/aTap"));
     aDoesntUntap->setShortcuts(shortcuts.getShortcut("Player/aDoesntUntap"));
     aFlip->setShortcuts(shortcuts.getShortcut("Player/aFlip"));
@@ -502,10 +478,21 @@ void CardMenu::setShortcutsActive()
     aSelectRow->setShortcuts(shortcuts.getShortcut("Player/aSelectRow"));
     aSelectColumn->setShortcuts(shortcuts.getShortcut("Player/aSelectColumn"));
 
+    aPlayFacedown->setShortcuts(shortcuts.getShortcut("Player/aPlayFacedown"));
+    aPlay->setShortcuts(shortcuts.getShortcut("Player/aPlay"));
+
     static const QStringList colorWords = {"Red", "Yellow", "Green", "Cyan", "Purple", "Magenta"};
     for (int i = 0; i < aAddCounter.size(); i++) {
         aAddCounter[i]->setShortcuts(shortcuts.getShortcut("Player/aCC" + colorWords[i]));
         aRemoveCounter[i]->setShortcuts(shortcuts.getShortcut("Player/aRC" + colorWords[i]));
         aSetCounter[i]->setShortcuts(shortcuts.getShortcut("Player/aSC" + colorWords[i]));
     }
+
+    // Don't enable always-active shortcuts in local games, since it causes keyboard shortcuts to work inconsistently
+    // when there are more than 1 player.
+    if (!player->getGame()->getGameState()->getIsLocalGame()) {
+        // unattach action is only active in card menu if the active card is attached.
+        // make unattach shortcut always active so that it consistently works when multiple cards are selected.
+        player->getGame()->getTab()->addAction(aUnattach);
+    }
 }
\ No newline at end of file
diff --git a/cockatrice/src/game/player/menu/card_menu.h b/cockatrice/src/game/player/menu/card_menu.h
index b7f2f8241..931d0249f 100644
--- a/cockatrice/src/game/player/menu/card_menu.h
+++ b/cockatrice/src/game/player/menu/card_menu.h
@@ -1,9 +1,3 @@
-/**
- * @file card_menu.h
- * @ingroup GameMenusCards
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_CARD_MENU_H
 #define COCKATRICE_CARD_MENU_H
 
@@ -18,16 +12,14 @@ class CardMenu : public QMenu
 public:
     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);
-    void createHandOrCustomZoneMenu(bool canModifyCard);
-    void createZonelessMenu(bool canModifyCard);
+    void createTableMenu();
+    void createStackMenu();
+    void createGraveyardOrExileMenu();
+    void createHandOrCustomZoneMenu();
 
     QMenu *mCardCounters;
 
     QAction *aPlay, *aPlayFacedown;
-    QAction *aRevealToAll;
     QAction *aHide;
     QAction *aClone;
     QAction *aSelectAll, *aSelectRow, *aSelectColumn;
@@ -47,7 +39,7 @@ private:
 
     void addRelatedCardActions();
     void retranslateUi();
-    void initContextualPlayersMenu(QMenu *menu, QAction *allPlayersAction);
+    void initContextualPlayersMenu(QMenu *menu);
     void setShortcutsActive();
     void addRelatedCardView();
 };
diff --git a/cockatrice/src/game/player/menu/custom_zone_menu.h b/cockatrice/src/game/player/menu/custom_zone_menu.h
index c4e66754e..cf7b13f23 100644
--- a/cockatrice/src/game/player/menu/custom_zone_menu.h
+++ b/cockatrice/src/game/player/menu/custom_zone_menu.h
@@ -1,29 +1,15 @@
-/**
- * @file custom_zone_menu.h
- * @ingroup GameMenusZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_CUSTOM_ZONE_MENU_H
 #define COCKATRICE_CUSTOM_ZONE_MENU_H
 
-#include "abstract_player_component.h"
-
 #include <QMenu>
 
 class Player;
-class CustomZoneMenu : public QMenu, public AbstractPlayerComponent
+class CustomZoneMenu : public QMenu
 {
     Q_OBJECT
 public:
     explicit CustomZoneMenu(Player *player);
-    void retranslateUi() override;
-    void setShortcutsActive() override
-    {
-    }
-    void setShortcutsInactive() override
-    {
-    }
+    void retranslateUi();
 
 private:
     Player *player;
diff --git a/cockatrice/src/game/player/menu/grave_menu.cpp b/cockatrice/src/game/player/menu/grave_menu.cpp
index 2af62c08a..69cf537bf 100644
--- a/cockatrice/src/game/player/menu/grave_menu.cpp
+++ b/cockatrice/src/game/player/menu/grave_menu.cpp
@@ -1,13 +1,8 @@
 #include "grave_menu.h"
 
-#include "../../abstract_game.h"
 #include "../player.h"
 #include "../player_actions.h"
 
-#include <QAction>
-#include <QMenu>
-#include <libcockatrice/utility/zone_names.h>
-
 GraveyardMenu::GraveyardMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createMoveActions();
@@ -17,11 +12,14 @@ GraveyardMenu::GraveyardMenu(Player *_player, QWidget *parent) : TearOffMenu(par
 
     if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
         mRevealRandomGraveyardCard = addMenu(QString());
-        connect(mRevealRandomGraveyardCard, &QMenu::aboutToShow, this,
-                &GraveyardMenu::populateRevealRandomMenuWithActivePlayers);
+        QAction *newAction = mRevealRandomGraveyardCard->addAction(QString());
+        newAction->setData(-1);
+        connect(newAction, &QAction::triggered, player->getPlayerActions(),
+                &PlayerActions::actRevealRandomGraveyardCard);
+        emit newPlayerActionCreated(newAction);
+        mRevealRandomGraveyardCard->addSeparator();
 
         addSeparator();
-
         moveGraveMenu = addTearOffMenu(QString());
         moveGraveMenu->addAction(aMoveGraveToTopLibrary);
         moveGraveMenu->addAction(aMoveGraveToBottomLibrary);
@@ -40,16 +38,13 @@ void GraveyardMenu::createMoveActions()
 
     if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
         aMoveGraveToTopLibrary = new QAction(this);
-        aMoveGraveToTopLibrary->setData(QList<QVariant>() << ZoneNames::DECK << 0);
-
+        aMoveGraveToTopLibrary->setData(QList<QVariant>() << "deck" << 0);
         aMoveGraveToBottomLibrary = new QAction(this);
-        aMoveGraveToBottomLibrary->setData(QList<QVariant>() << ZoneNames::DECK << -1);
-
+        aMoveGraveToBottomLibrary->setData(QList<QVariant>() << "deck" << -1);
         aMoveGraveToHand = new QAction(this);
-        aMoveGraveToHand->setData(QList<QVariant>() << ZoneNames::HAND << 0);
-
+        aMoveGraveToHand->setData(QList<QVariant>() << "hand" << 0);
         aMoveGraveToRfg = new QAction(this);
-        aMoveGraveToRfg->setData(QList<QVariant>() << ZoneNames::EXILE << 0);
+        aMoveGraveToRfg->setData(QList<QVariant>() << "rfg" << 0);
 
         connect(aMoveGraveToTopLibrary, &QAction::triggered, grave, &PileZoneLogic::moveAllToZone);
         connect(aMoveGraveToBottomLibrary, &QAction::triggered, grave, &PileZoneLogic::moveAllToZone);
@@ -66,33 +61,6 @@ void GraveyardMenu::createViewActions()
     connect(aViewGraveyard, &QAction::triggered, playerActions, &PlayerActions::actViewGraveyard);
 }
 
-void GraveyardMenu::populateRevealRandomMenuWithActivePlayers()
-{
-    mRevealRandomGraveyardCard->clear();
-
-    QAction *allPlayers = mRevealRandomGraveyardCard->addAction(tr("&All players"));
-    allPlayers->setData(-1);
-    connect(allPlayers, &QAction::triggered, this, &GraveyardMenu::onRevealRandomTriggered);
-
-    mRevealRandomGraveyardCard->addSeparator();
-
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
-    for (auto *other : players) {
-        if (other == player)
-            continue;
-        QAction *a = mRevealRandomGraveyardCard->addAction(other->getPlayerInfo()->getName());
-        a->setData(other->getPlayerInfo()->getId());
-        connect(a, &QAction::triggered, this, &GraveyardMenu::onRevealRandomTriggered);
-    }
-}
-
-void GraveyardMenu::onRevealRandomTriggered()
-{
-    if (auto *a = qobject_cast<QAction *>(sender())) {
-        player->getPlayerActions()->actRevealRandomGraveyardCard(a->data().toInt());
-    }
-}
-
 void GraveyardMenu::retranslateUi()
 {
     setTitle(tr("&Graveyard"));
@@ -105,7 +73,6 @@ void GraveyardMenu::retranslateUi()
         aMoveGraveToBottomLibrary->setText(tr("&Bottom of library"));
         aMoveGraveToHand->setText(tr("&Hand"));
         aMoveGraveToRfg->setText(tr("&Exile"));
-
         mRevealRandomGraveyardCard->setTitle(tr("Reveal random card to..."));
     }
 }
@@ -113,10 +80,11 @@ void GraveyardMenu::retranslateUi()
 void GraveyardMenu::setShortcutsActive()
 {
     ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
+
     aViewGraveyard->setShortcuts(shortcuts.getShortcut("Player/aViewGraveyard"));
 }
 
 void GraveyardMenu::setShortcutsInactive()
 {
     aViewGraveyard->setShortcut(QKeySequence());
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/player/menu/grave_menu.h b/cockatrice/src/game/player/menu/grave_menu.h
index 429173afa..1f5ea5966 100644
--- a/cockatrice/src/game/player/menu/grave_menu.h
+++ b/cockatrice/src/game/player/menu/grave_menu.h
@@ -1,20 +1,13 @@
-/**
- * @file grave_menu.h
- * @ingroup GameMenusZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_GRAVE_MENU_H
 #define COCKATRICE_GRAVE_MENU_H
 
-#include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "abstract_player_component.h"
+#include "../../../interface/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>
 
 class Player;
-class GraveyardMenu : public TearOffMenu, public AbstractPlayerComponent
+class GraveyardMenu : public TearOffMenu
 {
     Q_OBJECT
 signals:
@@ -24,11 +17,9 @@ public:
     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;
diff --git a/cockatrice/src/game/player/menu/hand_menu.cpp b/cockatrice/src/game/player/menu/hand_menu.cpp
index d65c136bf..77b1e3a27 100644
--- a/cockatrice/src/game/player/menu/hand_menu.cpp
+++ b/cockatrice/src/game/player/menu/hand_menu.cpp
@@ -1,16 +1,8 @@
 #include "hand_menu.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../../client/settings/shortcuts_settings.h"
-#include "../../abstract_game.h"
-#include "../../zones/hand_zone.h"
 #include "../player.h"
 #include "../player_actions.h"
 
-#include <QAction>
-#include <QMenu>
-#include <libcockatrice/utility/zone_names.h>
-
 HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
@@ -18,72 +10,32 @@ HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : T
         connect(aViewHand, &QAction::triggered, actions, &PlayerActions::actViewHand);
         addAction(aViewHand);
 
-        mSortHand = addMenu(QString());
-
-        aSortHandByName = new QAction(this);
-        aSortHandByName->setData(CardList::SortByName);
-        aSortHandByType = new QAction(this);
-        aSortHandByType->setData(CardList::SortByMainType);
-        aSortHandByManaValue = new QAction(this);
-        aSortHandByManaValue->setData(CardList::SortByManaValue);
-
-        connect(aSortHandByType, &QAction::triggered, actions, &PlayerActions::actSortHand);
-        connect(aSortHandByName, &QAction::triggered, actions, &PlayerActions::actSortHand);
-        connect(aSortHandByManaValue, &QAction::triggered, actions, &PlayerActions::actSortHand);
-
-        mSortHand->addAction(aSortHandByName);
-        mSortHand->addAction(aSortHandByType);
-        mSortHand->addAction(aSortHandByManaValue);
+        aSortHand = new QAction(this);
+        connect(aSortHand, &QAction::triggered, actions, &PlayerActions::actSortHand);
+        addAction(aSortHand);
     }
 
     mRevealHand = addMenu(QString());
-    connect(mRevealHand, &QMenu::aboutToShow, this, &HandMenu::populateRevealHandMenuWithActivePlayers);
-
-    aRevealHandToAll = new QAction(this);
-    aRevealHandToAll->setData(-1);
-    connect(aRevealHandToAll, &QAction::triggered, this, &HandMenu::onRevealHandTriggered);
-
     mRevealRandomHandCard = addMenu(QString());
-    connect(mRevealRandomHandCard, &QMenu::aboutToShow, this,
-            &HandMenu::populateRevealRandomHandCardMenuWithActivePlayers);
-
-    aRevealRandomHandCardToAll = new QAction(this);
-    aRevealRandomHandCardToAll->setData(-1);
-    connect(aRevealRandomHandCardToAll, &QAction::triggered, this, &HandMenu::onRevealRandomHandCardTriggered);
-
-    // We still need to add these actions to menu here so that the shortcuts are active right away
-    mRevealHand->addAction(aRevealHandToAll);
-    mRevealRandomHandCard->addAction(aRevealRandomHandCardToAll);
-
     addSeparator();
 
     aMulligan = new QAction(this);
     connect(aMulligan, &QAction::triggered, actions, &PlayerActions::actMulligan);
     addAction(aMulligan);
 
-    // Mulligan same size
-    aMulliganSame = new QAction(this);
-    connect(aMulliganSame, &QAction::triggered, actions, &PlayerActions::actMulliganSameSize);
-    addAction(aMulliganSame);
-
-    // Mulligan -1
-    aMulliganMinusOne = new QAction(this);
-    connect(aMulliganMinusOne, &QAction::triggered, actions, &PlayerActions::actMulliganMinusOne);
-    addAction(aMulliganMinusOne);
-
     addSeparator();
 
     mMoveHandMenu = addTearOffMenu(QString());
 
     if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
         aMoveHandToTopLibrary = new QAction(this);
-        aMoveHandToTopLibrary->setData(QList<QVariant>() << ZoneNames::DECK << 0);
+        aMoveHandToTopLibrary->setData(QList<QVariant>() << "deck" << 0);
         aMoveHandToBottomLibrary = new QAction(this);
-        aMoveHandToBottomLibrary->setData(QList<QVariant>() << ZoneNames::DECK << -1);
+        aMoveHandToBottomLibrary->setData(QList<QVariant>() << "deck" << -1);
         aMoveHandToGrave = new QAction(this);
-        aMoveHandToGrave->setData(QList<QVariant>() << ZoneNames::GRAVE << 0);
+        aMoveHandToGrave->setData(QList<QVariant>() << "grave" << 0);
         aMoveHandToRfg = new QAction(this);
-        aMoveHandToRfg->setData(QList<QVariant>() << ZoneNames::EXILE << 0);
+        aMoveHandToRfg->setData(QList<QVariant>() << "rfg" << 0);
 
         auto hand = player->getHandZone();
 
@@ -109,15 +61,8 @@ void HandMenu::retranslateUi()
 
     if (player->getPlayerInfo()->getLocalOrJudge()) {
         aViewHand->setText(tr("&View hand"));
-
-        mSortHand->setTitle(tr("Sort hand by..."));
-        aSortHandByName->setText(tr("Name"));
-        aSortHandByType->setText(tr("Type"));
-        aSortHandByManaValue->setText(tr("Mana Value"));
-
-        aMulligan->setText(tr("Take &mulligan (Choose hand size)"));
-        aMulliganSame->setText(tr("Take mulligan (Same hand size)"));
-        aMulliganMinusOne->setText(tr("Take mulligan (Hand size - 1)"));
+        aSortHand->setText(tr("&Sort hand"));
+        aMulligan->setText(tr("Take &mulligan"));
 
         mMoveHandMenu->setTitle(tr("&Move hand to..."));
         aMoveHandToTopLibrary->setText(tr("&Top of library"));
@@ -126,90 +71,22 @@ void HandMenu::retranslateUi()
         aMoveHandToRfg->setText(tr("&Exile"));
 
         mRevealHand->setTitle(tr("&Reveal hand to..."));
-        aRevealHandToAll->setText(tr("All players"));
-
         mRevealRandomHandCard->setTitle(tr("Reveal r&andom card to..."));
-        aRevealRandomHandCardToAll->setText(tr("All players"));
     }
 }
 
 void HandMenu::setShortcutsActive()
 {
     ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
+
     aViewHand->setShortcuts(shortcuts.getShortcut("Player/aViewHand"));
-    aSortHandByName->setShortcuts(shortcuts.getShortcut("Player/aSortHandByName"));
-    aSortHandByType->setShortcuts(shortcuts.getShortcut("Player/aSortHandByType"));
-    aSortHandByManaValue->setShortcuts(shortcuts.getShortcut("Player/aSortHandByManaValue"));
+    aSortHand->setShortcuts(shortcuts.getShortcut("Player/aSortHand"));
     aMulligan->setShortcuts(shortcuts.getShortcut("Player/aMulligan"));
-    aMulliganSame->setShortcuts(shortcuts.getShortcut("Player/aMulliganSame"));
-    aMulliganMinusOne->setShortcuts(shortcuts.getShortcut("Player/aMulliganMinusOne"));
-    aRevealHandToAll->setShortcuts(shortcuts.getShortcut("Player/aRevealHandToAll"));
-    aRevealRandomHandCardToAll->setShortcuts(shortcuts.getShortcut("Player/aRevealRandomHandCardToAll"));
 }
 
 void HandMenu::setShortcutsInactive()
 {
     aViewHand->setShortcut(QKeySequence());
-    aSortHandByName->setShortcut(QKeySequence());
-    aSortHandByType->setShortcut(QKeySequence());
-    aSortHandByManaValue->setShortcut(QKeySequence());
+    aSortHand->setShortcut(QKeySequence());
     aMulligan->setShortcut(QKeySequence());
-    aRevealHandToAll->setShortcut(QKeySequence());
-    aRevealRandomHandCardToAll->setShortcut(QKeySequence());
-}
-
-void HandMenu::populateRevealHandMenuWithActivePlayers()
-{
-    mRevealHand->clear();
-
-    mRevealHand->addAction(aRevealHandToAll);
-
-    mRevealHand->addSeparator();
-
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
-    for (auto *other : players) {
-        if (other == player)
-            continue;
-        QAction *a = mRevealHand->addAction(other->getPlayerInfo()->getName());
-        a->setData(other->getPlayerInfo()->getId());
-        connect(a, &QAction::triggered, this, &HandMenu::onRevealHandTriggered);
-    }
-}
-
-void HandMenu::populateRevealRandomHandCardMenuWithActivePlayers()
-{
-    mRevealRandomHandCard->clear();
-
-    mRevealRandomHandCard->addAction(aRevealRandomHandCardToAll);
-
-    mRevealRandomHandCard->addSeparator();
-
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
-    for (auto *other : players) {
-        if (other == player)
-            continue;
-        QAction *a = mRevealRandomHandCard->addAction(other->getPlayerInfo()->getName());
-        a->setData(other->getPlayerInfo()->getId());
-        connect(a, &QAction::triggered, this, &HandMenu::onRevealRandomHandCardTriggered);
-    }
-}
-
-void HandMenu::onRevealHandTriggered()
-{
-    auto *action = qobject_cast<QAction *>(sender());
-    if (!action)
-        return;
-
-    const int targetId = action->data().toInt();
-    player->getPlayerActions()->actRevealHand(targetId);
-}
-
-void HandMenu::onRevealRandomHandCardTriggered()
-{
-    auto *action = qobject_cast<QAction *>(sender());
-    if (!action)
-        return;
-
-    const int targetId = action->data().toInt();
-    player->getPlayerActions()->actRevealRandomHandCard(targetId);
 }
diff --git a/cockatrice/src/game/player/menu/hand_menu.h b/cockatrice/src/game/player/menu/hand_menu.h
index 76434cc98..968832cc6 100644
--- a/cockatrice/src/game/player/menu/hand_menu.h
+++ b/cockatrice/src/game/player/menu/hand_menu.h
@@ -1,14 +1,7 @@
-/**
- * @file hand_menu.h
- * @ingroup GameMenusZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_HAND_MENU_H
 #define COCKATRICE_HAND_MENU_H
 
-#include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "abstract_player_component.h"
+#include "../../../interface/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>
@@ -16,13 +9,16 @@
 class Player;
 class PlayerActions;
 
-class HandMenu : public TearOffMenu, public AbstractPlayerComponent
+class HandMenu : public TearOffMenu
 {
     Q_OBJECT
-
 public:
-    HandMenu(Player *player, PlayerActions *actions, QWidget *parent = nullptr);
+    explicit HandMenu(Player *player, PlayerActions *actions, QWidget *parent = nullptr);
+    void retranslateUi();
+    void setShortcutsActive();
+    void setShortcutsInactive();
 
+    // expose useful actions/menus if PlayerMenu needs them
     QMenu *revealHandMenu() const
     {
         return mRevealHand;
@@ -31,37 +27,22 @@ public:
     {
         return mRevealRandomHandCard;
     }
-
-    void retranslateUi() override;
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
-
-private slots:
-    void populateRevealHandMenuWithActivePlayers();
-    void populateRevealRandomHandCardMenuWithActivePlayers();
-    void onRevealHandTriggered();
-    void onRevealRandomHandCardTriggered();
+    QMenu *moveHandMenu() const
+    {
+        return mMoveHandMenu;
+    }
 
 private:
     Player *player;
 
     QAction *aViewHand = nullptr;
+    QAction *aSortHand = nullptr;
     QAction *aMulligan = nullptr;
-    QAction *aMulliganSame = nullptr;
-    QAction *aMulliganMinusOne = nullptr;
-
-    QMenu *mSortHand = nullptr;
-    QAction *aSortHandByName = nullptr;
-    QAction *aSortHandByType = nullptr;
-    QAction *aSortHandByManaValue = nullptr;
 
     QMenu *mRevealHand = nullptr;
-    QAction *aRevealHandToAll = nullptr;
-
     QMenu *mRevealRandomHandCard = nullptr;
-    QAction *aRevealRandomHandCardToAll = nullptr;
-
     QMenu *mMoveHandMenu = nullptr;
+
     QAction *aMoveHandToTopLibrary = nullptr;
     QAction *aMoveHandToBottomLibrary = nullptr;
     QAction *aMoveHandToGrave = nullptr;
diff --git a/cockatrice/src/game/player/menu/library_menu.cpp b/cockatrice/src/game/player/menu/library_menu.cpp
index 1bb647d06..260ae09ab 100644
--- a/cockatrice/src/game/player/menu/library_menu.cpp
+++ b/cockatrice/src/game/player/menu/library_menu.cpp
@@ -1,15 +1,8 @@
 #include "library_menu.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../../client/settings/shortcuts_settings.h"
-#include "../../../interface/widgets/tabs/tab_game.h"
-#include "../../abstract_game.h"
 #include "../player.h"
 #include "../player_actions.h"
 
-#include <QAction>
-#include <QMenu>
-
 LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createDrawActions();
@@ -27,16 +20,9 @@ LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent)
     addAction(aViewTopCards);
     addAction(aViewBottomCards);
     addSeparator();
-
     mRevealLibrary = addMenu(QString());
-    connect(mRevealLibrary, &QMenu::aboutToShow, this, &LibraryMenu::populateRevealLibraryMenuWithActivePlayers);
-
     mLendLibrary = addMenu(QString());
-    connect(mLendLibrary, &QMenu::aboutToShow, this, &LibraryMenu::populateLendLibraryMenuWithActivePlayers);
-
     mRevealTopCard = addMenu(QString());
-    connect(mRevealTopCard, &QMenu::aboutToShow, this, &LibraryMenu::populateRevealTopCardMenuWithActivePlayers);
-
     addAction(aAlwaysRevealTopCard);
     addAction(aAlwaysLookAtTopCard);
     addSeparator();
@@ -44,17 +30,14 @@ LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent)
     bottomLibraryMenu = addTearOffMenu(QString());
     addSeparator();
     addAction(aOpenDeckInDeckEditor);
-
     topLibraryMenu->addAction(aMoveTopToPlay);
     topLibraryMenu->addAction(aMoveTopToPlayFaceDown);
     topLibraryMenu->addAction(aMoveTopCardToBottom);
     topLibraryMenu->addSeparator();
     topLibraryMenu->addAction(aMoveTopCardToGraveyard);
     topLibraryMenu->addAction(aMoveTopCardsToGraveyard);
-    topLibraryMenu->addAction(aMoveTopCardsToGraveyardFaceDown);
     topLibraryMenu->addAction(aMoveTopCardToExile);
     topLibraryMenu->addAction(aMoveTopCardsToExile);
-    topLibraryMenu->addAction(aMoveTopCardsToExileFaceDown);
     topLibraryMenu->addAction(aMoveTopCardsUntil);
     topLibraryMenu->addSeparator();
     topLibraryMenu->addAction(aShuffleTopCards);
@@ -68,10 +51,8 @@ LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent)
     bottomLibraryMenu->addSeparator();
     bottomLibraryMenu->addAction(aMoveBottomCardToGraveyard);
     bottomLibraryMenu->addAction(aMoveBottomCardsToGraveyard);
-    bottomLibraryMenu->addAction(aMoveBottomCardsToGraveyardFaceDown);
     bottomLibraryMenu->addAction(aMoveBottomCardToExile);
     bottomLibraryMenu->addAction(aMoveBottomCardsToExile);
-    bottomLibraryMenu->addAction(aMoveBottomCardsToExileFaceDown);
     bottomLibraryMenu->addSeparator();
     bottomLibraryMenu->addAction(aShuffleBottomCards);
 
@@ -140,14 +121,8 @@ void LibraryMenu::createMoveActions()
         connect(aMoveTopCardToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardToExile);
         aMoveTopCardsToGraveyard = new QAction(this);
         connect(aMoveTopCardsToGraveyard, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsToGrave);
-        aMoveTopCardsToGraveyardFaceDown = new QAction(this);
-        connect(aMoveTopCardsToGraveyardFaceDown, &QAction::triggered, playerActions,
-                &PlayerActions::actMoveTopCardsToGraveFaceDown);
         aMoveTopCardsToExile = new QAction(this);
         connect(aMoveTopCardsToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsToExile);
-        aMoveTopCardsToExileFaceDown = new QAction(this);
-        connect(aMoveTopCardsToExileFaceDown, &QAction::triggered, playerActions,
-                &PlayerActions::actMoveTopCardsToExileFaceDown);
         aMoveTopCardsUntil = new QAction(this);
         connect(aMoveTopCardsUntil, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsUntil);
         aMoveTopCardToBottom = new QAction(this);
@@ -166,14 +141,8 @@ void LibraryMenu::createMoveActions()
         aMoveBottomCardsToGraveyard = new QAction(this);
         connect(aMoveBottomCardsToGraveyard, &QAction::triggered, playerActions,
                 &PlayerActions::actMoveBottomCardsToGrave);
-        aMoveBottomCardsToGraveyardFaceDown = new QAction(this);
-        connect(aMoveBottomCardsToGraveyardFaceDown, &QAction::triggered, playerActions,
-                &PlayerActions::actMoveBottomCardsToGraveFaceDown);
         aMoveBottomCardsToExile = new QAction(this);
         connect(aMoveBottomCardsToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveBottomCardsToExile);
-        aMoveBottomCardsToExileFaceDown = new QAction(this);
-        connect(aMoveBottomCardsToExileFaceDown, &QAction::triggered, playerActions,
-                &PlayerActions::actMoveBottomCardsToExileFaceDown);
         aMoveBottomCardToTop = new QAction(this);
         connect(aMoveBottomCardToTop, &QAction::triggered, playerActions, &PlayerActions::actMoveBottomCardToTop);
     }
@@ -232,9 +201,7 @@ void LibraryMenu::retranslateUi()
         aMoveTopCardToGraveyard->setText(tr("Move top card to grave&yard"));
         aMoveTopCardToExile->setText(tr("Move top card to e&xile"));
         aMoveTopCardsToGraveyard->setText(tr("Move top cards to &graveyard..."));
-        aMoveTopCardsToGraveyardFaceDown->setText(tr("Move top cards to graveyard face down..."));
         aMoveTopCardsToExile->setText(tr("Move top cards to &exile..."));
-        aMoveTopCardsToExileFaceDown->setText(tr("Move top cards to exile face down..."));
         aMoveTopCardsUntil->setText(tr("Put top cards on stack &until..."));
         aShuffleTopCards->setText(tr("Shuffle top cards..."));
 
@@ -245,97 +212,12 @@ void LibraryMenu::retranslateUi()
         aMoveBottomCardToGraveyard->setText(tr("Move bottom card to grave&yard"));
         aMoveBottomCardToExile->setText(tr("Move bottom card to e&xile"));
         aMoveBottomCardsToGraveyard->setText(tr("Move bottom cards to &graveyard..."));
-        aMoveBottomCardsToGraveyardFaceDown->setText(tr("Move bottom cards to graveyard face down..."));
         aMoveBottomCardsToExile->setText(tr("Move bottom cards to &exile..."));
-        aMoveBottomCardsToExileFaceDown->setText(tr("Move bottom cards to exile face down..."));
         aMoveBottomCardToTop->setText(tr("Put bottom card on &top"));
         aShuffleBottomCards->setText(tr("Shuffle bottom cards..."));
     }
 }
 
-void LibraryMenu::populateRevealLibraryMenuWithActivePlayers()
-{
-    mRevealLibrary->clear();
-
-    QAction *allPlayers = mRevealLibrary->addAction(tr("&All players"));
-    allPlayers->setData(-1);
-    connect(allPlayers, &QAction::triggered, this, &LibraryMenu::onRevealLibraryTriggered);
-
-    mRevealLibrary->addSeparator();
-
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
-    for (auto *other : players) {
-        if (other == player)
-            continue;
-        QAction *a = mRevealLibrary->addAction(other->getPlayerInfo()->getName());
-        a->setData(other->getPlayerInfo()->getId());
-        connect(a, &QAction::triggered, this, &LibraryMenu::onRevealLibraryTriggered);
-    }
-}
-
-void LibraryMenu::populateLendLibraryMenuWithActivePlayers()
-{
-    mLendLibrary->clear();
-
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
-    for (auto *other : players) {
-        if (other == player)
-            continue;
-        QAction *a = mLendLibrary->addAction(other->getPlayerInfo()->getName());
-        a->setData(other->getPlayerInfo()->getId());
-        connect(a, &QAction::triggered, this, &LibraryMenu::onLendLibraryTriggered);
-    }
-}
-
-void LibraryMenu::populateRevealTopCardMenuWithActivePlayers()
-{
-    mRevealTopCard->clear();
-
-    QAction *allPlayers = mRevealTopCard->addAction(tr("&All players"));
-    allPlayers->setData(-1);
-    connect(allPlayers, &QAction::triggered, this, &LibraryMenu::onRevealTopCardTriggered);
-
-    mRevealTopCard->addSeparator();
-
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
-    for (auto *other : players) {
-        if (other == player)
-            continue;
-        QAction *a = mRevealTopCard->addAction(other->getPlayerInfo()->getName());
-        a->setData(other->getPlayerInfo()->getId());
-        connect(a, &QAction::triggered, this, &LibraryMenu::onRevealTopCardTriggered);
-    }
-}
-
-void LibraryMenu::onRevealLibraryTriggered()
-{
-    if (auto *a = qobject_cast<QAction *>(sender())) {
-        player->getPlayerActions()->actRevealLibrary(a->data().toInt());
-    }
-}
-
-void LibraryMenu::onLendLibraryTriggered()
-{
-    if (auto *a = qobject_cast<QAction *>(sender())) {
-        player->getPlayerActions()->actLendLibrary(a->data().toInt());
-    }
-}
-
-void LibraryMenu::onRevealTopCardTriggered()
-{
-    if (auto *a = qobject_cast<QAction *>(sender())) {
-        int deckSize = player->getDeckZone()->getCards().size();
-        bool ok;
-        int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Reveal top cards of library"),
-                                          tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberTopCards, 1,
-                                          deckSize, 1, &ok);
-        if (ok) {
-            player->getPlayerActions()->actRevealTopCards(a->data().toInt(), number);
-            defaultNumberTopCards = number;
-        }
-    }
-}
-
 void LibraryMenu::setShortcutsActive()
 {
     ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
@@ -355,10 +237,8 @@ void LibraryMenu::setShortcutsActive()
     aMoveTopToPlayFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveTopToPlayFaceDown"));
     aMoveTopCardToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToGraveyard"));
     aMoveTopCardsToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToGraveyard"));
-    aMoveTopCardsToGraveyardFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToGraveyardFaceDown"));
     aMoveTopCardToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToExile"));
     aMoveTopCardsToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToExile"));
-    aMoveTopCardsToExileFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToExileFaceDown"));
     aMoveTopCardsUntil->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsUntil"));
     aMoveTopCardToBottom->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToBottom"));
     aDrawBottomCard->setShortcuts(shortcuts.getShortcut("Player/aDrawBottomCard"));
@@ -367,10 +247,8 @@ void LibraryMenu::setShortcutsActive()
     aMoveBottomToPlayFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomToPlayFaceDown"));
     aMoveBottomCardToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToGrave"));
     aMoveBottomCardsToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToGrave"));
-    aMoveBottomCardsToGraveyardFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToGraveFaceDown"));
     aMoveBottomCardToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToExile"));
     aMoveBottomCardsToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToExile"));
-    aMoveBottomCardsToExileFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToExileFaceDown"));
     aMoveBottomCardToTop->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToTop"));
 }
 
@@ -391,10 +269,8 @@ void LibraryMenu::setShortcutsInactive()
     aMoveTopToPlayFaceDown->setShortcut(QKeySequence());
     aMoveTopCardToGraveyard->setShortcut(QKeySequence());
     aMoveTopCardsToGraveyard->setShortcut(QKeySequence());
-    aMoveTopCardsToGraveyardFaceDown->setShortcut(QKeySequence());
     aMoveTopCardToExile->setShortcut(QKeySequence());
     aMoveTopCardsToExile->setShortcut(QKeySequence());
-    aMoveTopCardsToExileFaceDown->setShortcut(QKeySequence());
     aMoveTopCardsUntil->setShortcut(QKeySequence());
     aDrawBottomCard->setShortcut(QKeySequence());
     aDrawBottomCards->setShortcut(QKeySequence());
@@ -402,8 +278,6 @@ void LibraryMenu::setShortcutsInactive()
     aMoveBottomToPlayFaceDown->setShortcut(QKeySequence());
     aMoveBottomCardToGraveyard->setShortcut(QKeySequence());
     aMoveBottomCardsToGraveyard->setShortcut(QKeySequence());
-    aMoveBottomCardsToGraveyardFaceDown->setShortcut(QKeySequence());
     aMoveBottomCardToExile->setShortcut(QKeySequence());
     aMoveBottomCardsToExile->setShortcut(QKeySequence());
-    aMoveBottomCardsToExileFaceDown->setShortcut(QKeySequence());
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/player/menu/library_menu.h b/cockatrice/src/game/player/menu/library_menu.h
index 444e8f516..9914a99a5 100644
--- a/cockatrice/src/game/player/menu/library_menu.h
+++ b/cockatrice/src/game/player/menu/library_menu.h
@@ -1,14 +1,7 @@
-/**
- * @file library_menu.h
- * @ingroup GameMenusZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_LIBRARY_MENU_H
 #define COCKATRICE_LIBRARY_MENU_H
 
-#include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "abstract_player_component.h"
+#include "../../../interface/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>
@@ -16,7 +9,7 @@
 class Player;
 class PlayerActions;
 
-class LibraryMenu : public TearOffMenu, public AbstractPlayerComponent
+class LibraryMenu : public TearOffMenu
 {
     Q_OBJECT
 public slots:
@@ -29,15 +22,9 @@ public:
     void createShuffleActions();
     void createMoveActions();
     void createViewActions();
-    void retranslateUi() override;
-    void populateRevealLibraryMenuWithActivePlayers();
-    void populateLendLibraryMenuWithActivePlayers();
-    void populateRevealTopCardMenuWithActivePlayers();
-    void onRevealLibraryTriggered();
-    void onLendLibraryTriggered();
-    void onRevealTopCardTriggered();
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
+    void retranslateUi();
+    void setShortcutsActive();
+    void setShortcutsInactive();
 
     [[nodiscard]] bool isAlwaysRevealTopCardChecked() const
     {
@@ -50,15 +37,15 @@ public:
     }
 
     // expose useful actions/menus if PlayerMenu needs them
-    [[nodiscard]] QMenu *revealLibrary() const
+    QMenu *revealLibrary() const
     {
         return mRevealLibrary;
     }
-    [[nodiscard]] QMenu *lendLibraryMenu() const
+    QMenu *lendLibraryMenu() const
     {
         return mLendLibrary;
     }
-    [[nodiscard]] QMenu *revealTopCardMenu() const
+    QMenu *revealTopCardMenu() const
     {
         return mRevealTopCard;
     }
@@ -89,9 +76,7 @@ public:
     QAction *aMoveTopCardToGraveyard = nullptr;
     QAction *aMoveTopCardToExile = nullptr;
     QAction *aMoveTopCardsToGraveyard = nullptr;
-    QAction *aMoveTopCardsToGraveyardFaceDown = nullptr;
     QAction *aMoveTopCardsToExile = nullptr;
-    QAction *aMoveTopCardsToExileFaceDown = nullptr;
     QAction *aMoveTopCardsUntil = nullptr;
     QAction *aShuffleTopCards = nullptr;
 
@@ -103,13 +88,9 @@ public:
     QAction *aMoveBottomCardToGraveyard = nullptr;
     QAction *aMoveBottomCardToExile = nullptr;
     QAction *aMoveBottomCardsToGraveyard = nullptr;
-    QAction *aMoveBottomCardsToGraveyardFaceDown = nullptr;
     QAction *aMoveBottomCardsToExile = nullptr;
-    QAction *aMoveBottomCardsToExileFaceDown = nullptr;
     QAction *aShuffleBottomCards = nullptr;
 
-    int defaultNumberTopCards = 1;
-
 private:
     Player *player;
 };
diff --git a/cockatrice/src/game/player/menu/move_menu.cpp b/cockatrice/src/game/player/menu/move_menu.cpp
index 91e2d8d10..d27e16009 100644
--- a/cockatrice/src/game/player/menu/move_menu.cpp
+++ b/cockatrice/src/game/player/menu/move_menu.cpp
@@ -11,8 +11,6 @@ MoveMenu::MoveMenu(Player *player) : QMenu(tr("Move to"))
     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);
@@ -24,7 +22,6 @@ MoveMenu::MoveMenu(Player *player) : QMenu(tr("Move to"))
     connect(aMoveToBottomLibrary, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
     connect(aMoveToXfromTopOfLibrary, &QAction::triggered, player->getPlayerActions(),
             &PlayerActions::actMoveCardXCardsFromTop);
-    connect(aMoveToTable, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
     connect(aMoveToHand, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
     connect(aMoveToGraveyard, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
     connect(aMoveToExile, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
@@ -33,8 +30,6 @@ MoveMenu::MoveMenu(Player *player) : QMenu(tr("Move to"))
     addAction(aMoveToXfromTopOfLibrary);
     addAction(aMoveToBottomLibrary);
     addSeparator();
-    addAction(aMoveToTable);
-    addSeparator();
     addAction(aMoveToHand);
     addSeparator();
     addAction(aMoveToGraveyard);
@@ -52,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"));
@@ -63,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/player/menu/move_menu.h b/cockatrice/src/game/player/menu/move_menu.h
index dc39cb6a5..f7780d2e8 100644
--- a/cockatrice/src/game/player/menu/move_menu.h
+++ b/cockatrice/src/game/player/menu/move_menu.h
@@ -1,9 +1,3 @@
-/**
- * @file move_menu.h
- * @ingroup GameMenusZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_MOVE_MENU_H
 #define COCKATRICE_MOVE_MENU_H
 #include <QMenu>
@@ -23,7 +17,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
index 0dc381e28..4d3f12510 100644
--- a/cockatrice/src/game/player/menu/player_menu.cpp
+++ b/cockatrice/src/game/player/menu/player_menu.cpp
@@ -1,38 +1,64 @@
 #include "player_menu.h"
 
-#include "../../../interface/widgets/tabs/tab_game.h"
+#include "../../../common/pb/command_reveal_cards.pb.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../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_action_type.h"
+#include "../player_actions.h"
 #include "card_menu.h"
 #include "hand_menu.h"
 
-#include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
-
-PlayerMenu::PlayerMenu(Player *_player) : QObject(_player), player(_player)
+PlayerMenu::PlayerMenu(Player *_player) : player(_player)
 {
+
+    if (player->getPlayerInfo()->getLocalOrJudge()) {
+        connect(player->getGame()->getPlayerManager(), &PlayerManager::playerAdded, this, &PlayerMenu::addPlayer);
+        connect(player->getGame()->getPlayerManager(), &PlayerManager::playerRemoved, this, &PlayerMenu::removePlayer);
+    }
+
+    const QList<Player *> &players = player->getGame()->getPlayerManager()->getPlayers().values();
+    for (const auto playerToAdd : players) {
+        addPlayer(playerToAdd);
+    }
+
     playerMenu = new TearOffMenu();
 
     if (player->getPlayerInfo()->getLocalOrJudge()) {
-        handMenu = addManagedMenu<HandMenu>(player, player->getPlayerActions(), playerMenu);
-        libraryMenu = addManagedMenu<LibraryMenu>(player, playerMenu);
+        handMenu = new HandMenu(player, player->getPlayerActions(), playerMenu);
+        playerMenu->addMenu(handMenu);
+        playerLists.append(handMenu->revealHandMenu());
+        playerLists.append(handMenu->revealRandomHandCardMenu());
+
+        libraryMenu = new LibraryMenu(player, playerMenu);
+        playerLists.append(libraryMenu->revealLibrary());
+        playerLists.append(libraryMenu->lendLibraryMenu());
+        playerLists.append(libraryMenu->revealTopCardMenu());
+        playerMenu->addMenu(libraryMenu);
     } else {
         handMenu = nullptr;
         libraryMenu = nullptr;
     }
 
-    graveMenu = addManagedMenu<GraveyardMenu>(player, playerMenu);
-    rfgMenu = addManagedMenu<RfgMenu>(player, playerMenu);
+    graveMenu = new GraveyardMenu(player, playerMenu);
+    connect(graveMenu, &GraveyardMenu::newPlayerActionCreated, this, &PlayerMenu::onNewPlayerListActionCreated);
+    playerMenu->addMenu(graveMenu);
+
+    rfgMenu = new RfgMenu(player, playerMenu);
+    playerMenu->addMenu(rfgMenu);
 
     if (player->getPlayerInfo()->getLocalOrJudge()) {
-        sideboardMenu = addManagedMenu<SideboardMenu>(player, playerMenu);
-        customZonesMenu = addManagedMenu<CustomZoneMenu>(player);
+        sideboardMenu = new SideboardMenu(player, playerMenu);
+        playerMenu->addMenu(sideboardMenu);
+
+        customZonesMenu = new CustomZoneMenu(player);
+        playerMenu->addMenu(customZonesMenu);
         playerMenu->addSeparator();
 
         countersMenu = playerMenu->addMenu(QString());
 
-        utilityMenu = createManagedComponent<UtilityMenu>(player, playerMenu);
+        utilityMenu = new UtilityMenu(player, playerMenu);
     } else {
         sideboardMenu = nullptr;
         customZonesMenu = nullptr;
@@ -41,11 +67,23 @@ PlayerMenu::PlayerMenu(Player *_player) : QObject(_player), player(_player)
     }
 
     if (player->getPlayerInfo()->getLocal()) {
-        sayMenu = addManagedMenu<SayMenu>(player);
+        sayMenu = new SayMenu(player);
+        playerMenu->addMenu(sayMenu);
     } else {
         sayMenu = nullptr;
     }
 
+    if (player->getPlayerInfo()->getLocalOrJudge()) {
+
+        for (auto &playerList : playerLists) {
+            QAction *newAction = playerList->addAction(QString());
+            newAction->setData(-1);
+            connect(newAction, &QAction::triggered, this, &PlayerMenu::playerListActionTriggered);
+            allPlayersActions.append(newAction);
+            playerList->addSeparator();
+        }
+    }
+
     connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
             &PlayerMenu::refreshShortcuts);
     refreshShortcuts();
@@ -65,6 +103,89 @@ void PlayerMenu::setMenusForGraphicItems()
     }
 }
 
+void PlayerMenu::addPlayer(Player *playerToAdd)
+{
+    if (playerToAdd == nullptr || playerToAdd == player) {
+        return;
+    }
+
+    for (auto &playerList : playerLists) {
+        addPlayerToList(playerList, playerToAdd);
+    }
+}
+
+void PlayerMenu::addPlayerToList(QMenu *playerList, Player *playerToAdd)
+{
+    QAction *newAction = playerList->addAction(playerToAdd->getPlayerInfo()->getName());
+    newAction->setData(playerToAdd->getPlayerInfo()->getId());
+    connect(newAction, &QAction::triggered, this, &PlayerMenu::playerListActionTriggered);
+}
+
+void PlayerMenu::removePlayer(Player *playerToRemove)
+{
+    if (playerToRemove == nullptr) {
+        return;
+    }
+
+    for (auto &playerList : playerLists) {
+        removePlayerFromList(playerList, playerToRemove);
+    }
+}
+
+void PlayerMenu::removePlayerFromList(QMenu *playerList, Player *player)
+{
+    QList<QAction *> actionList = playerList->actions();
+    for (auto &j : actionList)
+        if (j->data().toInt() == player->getPlayerInfo()->getId()) {
+            playerList->removeAction(j);
+            j->deleteLater();
+        }
+}
+
+void PlayerMenu::playerListActionTriggered()
+{
+    auto *action = static_cast<QAction *>(sender());
+    auto *menu = static_cast<QMenu *>(action->parent());
+
+    Command_RevealCards cmd;
+    const int otherPlayerId = action->data().toInt();
+    if (otherPlayerId != -1) {
+        cmd.set_player_id(otherPlayerId);
+    }
+
+    if (menu == libraryMenu->revealLibrary() || menu == libraryMenu->lendLibraryMenu()) {
+        cmd.set_zone_name("deck");
+        cmd.set_grant_write_access(menu == libraryMenu->lendLibraryMenu());
+    } else if (menu == libraryMenu->revealTopCardMenu()) {
+        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,
+                                          1, deckSize, 1, &ok);
+        if (ok) {
+            cmd.set_zone_name("deck");
+            cmd.set_top_cards(number);
+            // backward compatibility: servers before #1051 only permits to reveal the first card
+            cmd.add_card_id(0);
+            // defaultNumberTopCards = number;
+        }
+    } else if (menu == handMenu->revealHandMenu()) {
+        cmd.set_zone_name("hand");
+    } else if (menu == handMenu->revealRandomHandCardMenu()) {
+        cmd.set_zone_name("hand");
+        cmd.add_card_id(PlayerActions::RANDOM_CARD_FROM_ZONE);
+    } else {
+        return;
+    }
+
+    player->getPlayerActions()->sendGameCommand(cmd);
+}
+
+void PlayerMenu::onNewPlayerListActionCreated(QAction *action)
+{
+    allPlayersActions.append(action);
+}
+
 QMenu *PlayerMenu::updateCardMenu(const CardItem *card)
 {
     if (!card) {
@@ -89,31 +210,50 @@ void PlayerMenu::retranslateUi()
 {
     playerMenu->setTitle(tr("Player \"%1\"").arg(player->getPlayerInfo()->getName()));
 
-    for (auto *component : managedComponents) {
-        component->retranslateUi();
+    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();
+    }
+
+    for (auto &allPlayersAction : allPlayersActions) {
+        allPlayersAction->setText(tr("&All players"));
+    }
+
+    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();
+        setShortcutsActive();
     }
 }
 
@@ -121,29 +261,52 @@ void PlayerMenu::setShortcutsActive()
 {
     shortcutsActive = true;
 
-    for (auto *component : managedComponents) {
-        component->setShortcutsActive();
+    if (handMenu) {
+        handMenu->setShortcutsActive();
+    }
+    if (libraryMenu) {
+        libraryMenu->setShortcutsActive();
+    }
+    graveMenu->setShortcutsActive();
+    // No shortcuts for RfgMenu yet
+
+    if (sideboardMenu) {
+        sideboardMenu->setShortcutsActive();
     }
 
-    // Counters implement AbstractPlayerComponent but are iterated via Player::counters
-    // (the authoritative source) rather than managedComponents to avoid a redundant
-    // list that must stay in sync with the map.
     QMapIterator<int, AbstractCounter *> counterIterator(player->getCounters());
     while (counterIterator.hasNext()) {
         counterIterator.next().value()->setShortcutsActive();
     }
+
+    if (utilityMenu) {
+        utilityMenu->setShortcutsActive();
+    }
 }
 
 void PlayerMenu::setShortcutsInactive()
 {
     shortcutsActive = false;
 
-    for (auto *component : managedComponents) {
-        component->setShortcutsInactive();
+    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
index 104c5a930..a89b6a927 100644
--- a/cockatrice/src/game/player/menu/player_menu.h
+++ b/cockatrice/src/game/player/menu/player_menu.h
@@ -1,13 +1,7 @@
-/**
- * @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 "../../../interface/tearoff_menu.h"
 #include "../player.h"
 #include "custom_zone_menu.h"
 #include "grave_menu.h"
@@ -18,7 +12,6 @@
 #include "sideboard_menu.h"
 #include "utility_menu.h"
 
-#include <QList>
 #include <QMenu>
 #include <QObject>
 
@@ -34,13 +27,19 @@ public slots:
     void setMenusForGraphicItems();
 
 private slots:
+    void addPlayer(Player *playerToAdd);
+    void removePlayer(Player *playerToRemove);
+    void playerListActionTriggered();
+    void onNewPlayerListActionCreated(QAction *action);
     void refreshShortcuts();
 
 public:
-    explicit PlayerMenu(Player *player);
-    /// Lifecycle methods: delegate to all managedComponents, plus counters separately via player->getCounters().
+    PlayerMenu(Player *player);
     void retranslateUi();
 
+    void addPlayerToList(QMenu *playerList, Player *playerToAdd);
+    static void removePlayerFromList(QMenu *playerList, Player *player);
+
     QMenu *updateCardMenu(const CardItem *card);
 
     [[nodiscard]] QMenu *getPlayerMenu() const
@@ -63,14 +62,12 @@ public:
         return utilityMenu;
     }
 
-    [[nodiscard]] bool getShortcutsActive() const
+    bool getShortcutsActive() const
     {
         return shortcutsActive;
     }
 
-    /// Delegates to all managedComponents, plus counters separately.
     void setShortcutsActive();
-    /// Delegates to all managedComponents, plus counters separately.
     void setShortcutsInactive();
 
 private:
@@ -85,27 +82,12 @@ private:
     UtilityMenu *utilityMenu;
     SayMenu *sayMenu;
     CustomZoneMenu *customZonesMenu;
+    QList<QMenu *> playerLists;
+    QList<QAction *> allPlayersActions;
 
-    /// Drives AbstractPlayerComponent lifecycle delegation. Counters are iterated separately via player->getCounters().
-    QList<AbstractPlayerComponent *> managedComponents;
-    bool shortcutsActive = false;
+    bool shortcutsActive;
 
-    /// 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;
-    }
-
-    /// 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;
-    }
+    void initSayMenu();
 };
 
 #endif // COCKATRICE_PLAYER_MENU_H
diff --git a/cockatrice/src/game/player/menu/pt_menu.h b/cockatrice/src/game/player/menu/pt_menu.h
index 44112e54f..f6ceab990 100644
--- a/cockatrice/src/game/player/menu/pt_menu.h
+++ b/cockatrice/src/game/player/menu/pt_menu.h
@@ -1,9 +1,3 @@
-/**
- * @file pt_menu.h
- * @ingroup GameMenusCards
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_PT_MENU_H
 #define COCKATRICE_PT_MENU_H
 #include <QMenu>
diff --git a/cockatrice/src/game/player/menu/rfg_menu.cpp b/cockatrice/src/game/player/menu/rfg_menu.cpp
index 8a101c04c..25e162581 100644
--- a/cockatrice/src/game/player/menu/rfg_menu.cpp
+++ b/cockatrice/src/game/player/menu/rfg_menu.cpp
@@ -3,8 +3,6 @@
 #include "../player.h"
 #include "../player_actions.h"
 
-#include <libcockatrice/utility/zone_names.h>
-
 RfgMenu::RfgMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createMoveActions();
@@ -32,13 +30,13 @@ void RfgMenu::createMoveActions()
         auto rfg = player->getRfgZone();
 
         aMoveRfgToTopLibrary = new QAction(this);
-        aMoveRfgToTopLibrary->setData(QList<QVariant>() << ZoneNames::DECK << 0);
+        aMoveRfgToTopLibrary->setData(QList<QVariant>() << "deck" << 0);
         aMoveRfgToBottomLibrary = new QAction(this);
-        aMoveRfgToBottomLibrary->setData(QList<QVariant>() << ZoneNames::DECK << -1);
+        aMoveRfgToBottomLibrary->setData(QList<QVariant>() << "deck" << -1);
         aMoveRfgToHand = new QAction(this);
-        aMoveRfgToHand->setData(QList<QVariant>() << ZoneNames::HAND << 0);
+        aMoveRfgToHand->setData(QList<QVariant>() << "hand" << 0);
         aMoveRfgToGrave = new QAction(this);
-        aMoveRfgToGrave->setData(QList<QVariant>() << ZoneNames::GRAVE << 0);
+        aMoveRfgToGrave->setData(QList<QVariant>() << "grave" << 0);
 
         connect(aMoveRfgToTopLibrary, &QAction::triggered, rfg, &PileZoneLogic::moveAllToZone);
         connect(aMoveRfgToBottomLibrary, &QAction::triggered, rfg, &PileZoneLogic::moveAllToZone);
diff --git a/cockatrice/src/game/player/menu/rfg_menu.h b/cockatrice/src/game/player/menu/rfg_menu.h
index 8f79b2f4a..0d9700f39 100644
--- a/cockatrice/src/game/player/menu/rfg_menu.h
+++ b/cockatrice/src/game/player/menu/rfg_menu.h
@@ -1,33 +1,20 @@
-/**
- * @file rfg_menu.h
- * @ingroup GameMenusZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_RFG_MENU_H
 #define COCKATRICE_RFG_MENU_H
 
-#include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "abstract_player_component.h"
+#include "../../../interface/tearoff_menu.h"
 
 #include <QAction>
 #include <QMenu>
 
 class Player;
-class RfgMenu : public TearOffMenu, public AbstractPlayerComponent
+class RfgMenu : public TearOffMenu
 {
     Q_OBJECT
 public:
     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;
 
diff --git a/cockatrice/src/game/player/menu/say_menu.cpp b/cockatrice/src/game/player/menu/say_menu.cpp
index 116fba49a..3598a1c66 100644
--- a/cockatrice/src/game/player/menu/say_menu.cpp
+++ b/cockatrice/src/game/player/menu/say_menu.cpp
@@ -1,6 +1,6 @@
 #include "say_menu.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../settings/cache_settings.h"
 #include "../player.h"
 #include "../player_actions.h"
 
@@ -8,31 +8,6 @@ SayMenu::SayMenu(Player *_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()
@@ -44,11 +19,10 @@ void SayMenu::initSayMenu()
 
     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);
     }
-
-    if (shortcutsActive) {
-        setShortcutsActive();
-    }
-}
+}
\ 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
index fadf5f368..2df84e78a 100644
--- a/cockatrice/src/game/player/menu/say_menu.h
+++ b/cockatrice/src/game/player/menu/say_menu.h
@@ -1,33 +1,18 @@
-/**
- * @file say_menu.h
- * @ingroup GameMenusPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_SAY_MENU_H
 #define COCKATRICE_SAY_MENU_H
 
-#include "abstract_player_component.h"
-
 #include <QMenu>
 
 class Player;
-class SayMenu : public QMenu, public AbstractPlayerComponent
+class SayMenu : public QMenu
 {
     Q_OBJECT
 public:
     explicit SayMenu(Player *player);
-
-    void retranslateUi() override;
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
-
-private slots:
     void initSayMenu();
 
 private:
     Player *player;
-    bool shortcutsActive = false;
 };
 
 #endif // COCKATRICE_SAY_MENU_H
diff --git a/cockatrice/src/game/player/menu/sideboard_menu.cpp b/cockatrice/src/game/player/menu/sideboard_menu.cpp
index beaabfcc6..bfc40cfd3 100644
--- a/cockatrice/src/game/player/menu/sideboard_menu.cpp
+++ b/cockatrice/src/game/player/menu/sideboard_menu.cpp
@@ -1,7 +1,6 @@
 #include "sideboard_menu.h"
 
 #include "../player.h"
-#include "../player_actions.h"
 
 SideboardMenu::SideboardMenu(Player *player, QMenu *playerMenu) : QMenu(playerMenu)
 {
diff --git a/cockatrice/src/game/player/menu/sideboard_menu.h b/cockatrice/src/game/player/menu/sideboard_menu.h
index 4a77d1b52..a2e85776e 100644
--- a/cockatrice/src/game/player/menu/sideboard_menu.h
+++ b/cockatrice/src/game/player/menu/sideboard_menu.h
@@ -1,26 +1,18 @@
-/**
- * @file sideboard_menu.h
- * @ingroup GameMenusZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_SIDEBOARD_MENU_H
 #define COCKATRICE_SIDEBOARD_MENU_H
 
-#include "abstract_player_component.h"
-
 #include <QMenu>
 
 class Player;
-class SideboardMenu : public QMenu, public AbstractPlayerComponent
+class SideboardMenu : public QMenu
 {
     Q_OBJECT
 
 public:
     explicit SideboardMenu(Player *player, QMenu *playerMenu);
-    void retranslateUi() override;
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
+    void retranslateUi();
+    void setShortcutsActive();
+    void setShortcutsInactive();
 
 private:
     Player *player;
diff --git a/cockatrice/src/game/player/menu/utility_menu.cpp b/cockatrice/src/game/player/menu/utility_menu.cpp
index 37bdcbbaf..fa41579a5 100644
--- a/cockatrice/src/game/player/menu/utility_menu.cpp
+++ b/cockatrice/src/game/player/menu/utility_menu.cpp
@@ -1,13 +1,9 @@
 #include "utility_menu.h"
 
-#include "../../../interface/deck_loader/deck_loader.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(Player *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
 {
     PlayerActions *playerActions = player->getPlayerActions();
@@ -60,19 +56,20 @@ void UtilityMenu::populatePredefinedTokensMenu()
     clear();
     setEnabled(false);
     predefinedTokens.clear();
-    const DeckList &deckList = player->getDeck();
+    DeckLoader *_deck = player->getDeck();
 
-    if (deckList.isEmpty()) {
+    if (!_deck) {
         return;
     }
 
-    auto tokenCardNodes = deckList.getCardNodes({DECK_ZONE_TOKENS});
+    InnerDecklistNode *tokenZone = dynamic_cast<InnerDecklistNode *>(_deck->getRoot()->findChild(DECK_ZONE_TOKENS));
 
-    if (!tokenCardNodes.isEmpty()) {
-        setEnabled(true);
+    if (tokenZone) {
+        if (!tokenZone->empty())
+            setEnabled(true);
 
-        for (int i = 0; i < tokenCardNodes.size(); ++i) {
-            const QString tokenName = tokenCardNodes[i]->getName();
+        for (int i = 0; i < tokenZone->size(); ++i) {
+            const QString tokenName = tokenZone->at(i)->getName();
             predefinedTokens.append(tokenName);
             QAction *a = addAction(tokenName);
             if (i < 10) {
diff --git a/cockatrice/src/game/player/menu/utility_menu.h b/cockatrice/src/game/player/menu/utility_menu.h
index f6577d7d1..ce5005180 100644
--- a/cockatrice/src/game/player/menu/utility_menu.h
+++ b/cockatrice/src/game/player/menu/utility_menu.h
@@ -1,25 +1,17 @@
-/**
- * @file utility_menu.h
- * @ingroup GameMenusPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_UTILITY_MENU_H
 #define COCKATRICE_UTILITY_MENU_H
 
-#include "abstract_player_component.h"
-
 #include <QMenu>
 
 class Player;
-class UtilityMenu : public QMenu, public AbstractPlayerComponent
+class UtilityMenu : public QMenu
 {
     Q_OBJECT
 public slots:
     void populatePredefinedTokensMenu();
-    void retranslateUi() override;
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
+    void retranslateUi();
+    void setShortcutsActive();
+    void setShortcutsInactive();
 
 public:
     explicit UtilityMenu(Player *player, QMenu *playerMenu);
diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp
index ac4149f0e..b7faa0868 100644
--- a/cockatrice/src/game/player/player.cpp
+++ b/cockatrice/src/game/player/player.cpp
@@ -1,7 +1,7 @@
 #include "player.h"
 
 #include "../../interface/theme_manager.h"
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../tabs/tab_game.h"
 #include "../board/arrow_item.h"
 #include "../board/card_item.h"
 #include "../board/card_list.h"
@@ -11,7 +11,16 @@
 #include "../zones/pile_zone.h"
 #include "../zones/stack_zone.h"
 #include "../zones/table_zone.h"
-#include "player_actions.h"
+#include "../zones/view_zone.h"
+#include "color.h"
+#include "pb/command_attach_card.pb.h"
+#include "pb/command_set_card_counter.pb.h"
+#include "pb/event_create_arrow.pb.h"
+#include "pb/event_create_counter.pb.h"
+#include "pb/event_draw_cards.pb.h"
+#include "pb/serverinfo_player.pb.h"
+#include "pb/serverinfo_user.pb.h"
+#include "pb/serverinfo_zone.pb.h"
 #include "player_target.h"
 
 #include <QDebug>
@@ -19,20 +28,11 @@
 #include <QMetaType>
 #include <QPainter>
 #include <QtConcurrent>
-#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_create_arrow.pb.h>
-#include <libcockatrice/protocol/pb/event_create_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_draw_cards.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
-#include <libcockatrice/utility/color.h>
 
 Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent)
     : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)),
       playerEventHandler(new PlayerEventHandler(this)), playerActions(new PlayerActions(this)), active(false),
-      conceded(false), zoneId(0), dialogSemaphore(false)
+      conceded(false), deck(nullptr), zoneId(0), dialogSemaphore(false)
 {
     initializeZones();
 
@@ -61,15 +61,15 @@ void Player::forwardActionSignalsToEventHandler()
 
 void Player::initializeZones()
 {
-    addZone(new PileZoneLogic(this, ZoneNames::DECK, false, true, false, this));
-    addZone(new PileZoneLogic(this, ZoneNames::GRAVE, false, false, true, this));
-    addZone(new PileZoneLogic(this, ZoneNames::EXILE, false, false, true, this));
-    addZone(new PileZoneLogic(this, ZoneNames::SIDEBOARD, false, false, false, this));
-    addZone(new TableZoneLogic(this, ZoneNames::TABLE, true, false, true, this));
-    addZone(new StackZoneLogic(this, ZoneNames::STACK, true, false, true, this));
+    addZone(new PileZoneLogic(this, "deck", false, true, false, this));
+    addZone(new PileZoneLogic(this, "grave", false, false, true, this));
+    addZone(new PileZoneLogic(this, "rfg", false, false, true, this));
+    addZone(new PileZoneLogic(this, "sb", false, false, false, this));
+    addZone(new TableZoneLogic(this, "table", true, false, true, this));
+    addZone(new StackZoneLogic(this, "stack", true, false, true, this));
     bool visibleHand = playerInfo->getLocalOrJudge() ||
                        (game->getPlayerManager()->isSpectator() && game->getGameMetaInfo()->spectatorsOmniscient());
-    addZone(new HandZoneLogic(this, ZoneNames::HAND, false, false, visibleHand, this));
+    addZone(new HandZoneLogic(this, "hand", false, false, visibleHand, this));
 }
 
 Player::~Player()
@@ -119,13 +119,13 @@ void Player::setZoneId(int _zoneId)
 void Player::processPlayerInfo(const ServerInfo_Player &info)
 {
     static QSet<QString> builtinZones{/* PileZones */
-                                      ZoneNames::DECK, ZoneNames::GRAVE, ZoneNames::EXILE, ZoneNames::SIDEBOARD,
+                                      "deck", "grave", "rfg", "sb",
                                       /* TableZone */
-                                      ZoneNames::TABLE,
+                                      "table",
                                       /* StackZone */
-                                      ZoneNames::STACK,
+                                      "stack",
                                       /* HandZone */
-                                      ZoneNames::HAND};
+                                      "hand"};
     clearCounters();
     clearArrows();
 
@@ -194,7 +194,7 @@ void Player::processPlayerInfo(const ServerInfo_Player &info)
         } else {
             for (int j = 0; j < cardListSize; ++j) {
                 const ServerInfo_Card &cardInfo = zoneInfo.card_list(j);
-                auto *card = new CardItem(this);
+                CardItem *card = new CardItem(this);
                 card->processCardInfo(cardInfo);
                 zone->addCard(card, false, cardInfo.x(), cardInfo.y());
             }
@@ -263,9 +263,9 @@ void Player::deleteCard(CardItem *card)
     }
 }
 
-void Player::setDeck(const DeckList &_deck)
+void Player::setDeck(const DeckLoader &_deck)
 {
-    deck = _deck;
+    deck = new DeckLoader(_deck);
 
     emit deckChanged();
 }
diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h
index e9c008821..7226f165b 100644
--- a/cockatrice/src/game/player/player.h
+++ b/cockatrice/src/game/player/player.h
@@ -1,20 +1,15 @@
-/**
- * @file player.h
- * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "../../game_graphics/board/abstract_graphics_item.h"
-#include "../../interface/widgets/menus/tearoff_menu.h"
-#include "../interface/deck_loader/loaded_deck.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 "../../card/card_info.h"
+#include "../../filters/filter_string.h"
+#include "../../interface/tearoff_menu.h"
+#include "../board/abstract_graphics_item.h"
+#include "../dialogs/dlg_create_token.h"
 #include "menu/player_menu.h"
+#include "pb/card_attributes.pb.h"
+#include "pb/game_event.pb.h"
+#include "player_actions.h"
 #include "player_area.h"
 #include "player_event_handler.h"
 #include "player_graphics_item.h"
@@ -23,11 +18,8 @@
 #include <QInputDialog>
 #include <QLoggingCategory>
 #include <QMap>
+#include <QPoint>
 #include <QTimer>
-#include <libcockatrice/filters/filter_string.h>
-#include <libcockatrice/protocol/pb/card_attributes.pb.h>
-#include <libcockatrice/protocol/pb/game_event.pb.h>
-#include <libcockatrice/utility/zone_names.h>
 
 inline Q_LOGGING_CATEGORY(PlayerLog, "player");
 
@@ -46,6 +38,7 @@ class ArrowTarget;
 class CardDatabase;
 class CardZone;
 class CommandContainer;
+class DeckLoader;
 class GameCommand;
 class GameEvent;
 class PlayerInfo;
@@ -67,7 +60,7 @@ class Player : public QObject
     Q_OBJECT
 
 signals:
-    void openDeckEditor(const LoadedDeck &deck);
+    void openDeckEditor(const DeckLoader *deck);
     void deckChanged();
     void newCardAdded(AbstractCardItem *card);
     void rearrangeCounters();
@@ -114,7 +107,7 @@ public:
     [[nodiscard]] PlayerActions *getPlayerActions() const
     {
         return playerActions;
-    }
+    };
 
     [[nodiscard]] PlayerEventHandler *getPlayerEventHandler() const
     {
@@ -124,16 +117,16 @@ public:
     [[nodiscard]] PlayerInfo *getPlayerInfo() const
     {
         return playerInfo;
-    }
+    };
 
     [[nodiscard]] PlayerMenu *getPlayerMenu() const
     {
         return playerMenu;
     }
 
-    void setDeck(const DeckList &_deck);
+    void setDeck(const DeckLoader &_deck);
 
-    [[nodiscard]] const DeckList &getDeck() const
+    [[nodiscard]] DeckLoader *getDeck() const
     {
         return deck;
     }
@@ -156,37 +149,37 @@ public:
 
     PileZoneLogic *getDeckZone()
     {
-        return qobject_cast<PileZoneLogic *>(zones.value(ZoneNames::DECK));
+        return qobject_cast<PileZoneLogic *>(zones.value("deck"));
     }
 
     PileZoneLogic *getGraveZone()
     {
-        return qobject_cast<PileZoneLogic *>(zones.value(ZoneNames::GRAVE));
+        return qobject_cast<PileZoneLogic *>(zones.value("grave"));
     }
 
     PileZoneLogic *getRfgZone()
     {
-        return qobject_cast<PileZoneLogic *>(zones.value(ZoneNames::EXILE));
+        return qobject_cast<PileZoneLogic *>(zones.value("rfg"));
     }
 
     PileZoneLogic *getSideboardZone()
     {
-        return qobject_cast<PileZoneLogic *>(zones.value(ZoneNames::SIDEBOARD));
+        return qobject_cast<PileZoneLogic *>(zones.value("sb"));
     }
 
     TableZoneLogic *getTableZone()
     {
-        return qobject_cast<TableZoneLogic *>(zones.value(ZoneNames::TABLE));
+        return qobject_cast<TableZoneLogic *>(zones.value("table"));
     }
 
     StackZoneLogic *getStackZone()
     {
-        return qobject_cast<StackZoneLogic *>(zones.value(ZoneNames::STACK));
+        return qobject_cast<StackZoneLogic *>(zones.value("stack"));
     }
 
     HandZoneLogic *getHandZone()
     {
-        return qobject_cast<HandZoneLogic *>(zones.value(ZoneNames::HAND));
+        return qobject_cast<HandZoneLogic *>(zones.value("hand"));
     }
 
     AbstractCounter *addCounter(const ServerInfo_Counter &counter);
@@ -242,7 +235,7 @@ private:
     bool active;
     bool conceded;
 
-    DeckList deck;
+    DeckLoader *deck;
 
     int zoneId;
     QMap<QString, CardZoneLogic *> zones;
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index 20034df16..b466009ea 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -1,42 +1,35 @@
 #include "player_actions.h"
 
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../../interface/widgets/utility/get_text_with_max.h"
+#include "../../../common/pb/context_move_card.pb.h"
+#include "../../client/get_text_with_max.h"
+#include "../../database/card_database_manager.h"
+#include "../../tabs/tab_game.h"
 #include "../board/card_item.h"
-#include "../client/settings/card_counter_settings.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>
-#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
-#include <libcockatrice/protocol/pb/command_create_token.pb.h>
-#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_move_card.pb.h>
-#include <libcockatrice/protocol/pb/command_mulligan.pb.h>
-#include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
-#include <libcockatrice/protocol/pb/command_roll_die.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_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>
+#include "pb/command_attach_card.pb.h"
+#include "pb/command_change_zone_properties.pb.h"
+#include "pb/command_concede.pb.h"
+#include "pb/command_create_token.pb.h"
+#include "pb/command_draw_cards.pb.h"
+#include "pb/command_flip_card.pb.h"
+#include "pb/command_game_say.pb.h"
+#include "pb/command_move_card.pb.h"
+#include "pb/command_mulligan.pb.h"
+#include "pb/command_reveal_cards.pb.h"
+#include "pb/command_roll_die.pb.h"
+#include "pb/command_set_card_attr.pb.h"
+#include "pb/command_set_card_counter.pb.h"
+#include "pb/command_shuffle.pb.h"
+#include "pb/command_undo_draw.pb.h"
+#include "trice_limits.h"
 
 // milliseconds in between triggers of the move top cards until action
 static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100;
 
-PlayerActions::PlayerActions(Player *_player)
-    : QObject(_player), player(_player), lastTokenTableRow(0), movingCardsUntil(false)
+PlayerActions::PlayerActions(Player *_player) : player(_player), lastTokenTableRow(0), movingCardsUntil(false)
 {
     moveTopCardTimer = new QTimer(this);
     moveTopCardTimer->setInterval(MOVE_TOP_CARD_UNTIL_INTERVAL);
@@ -64,28 +57,28 @@ void PlayerActions::playCard(CardItem *card, bool faceDown)
 
     const CardInfo &info = exactCard.getInfo();
 
-    int tableRow = info.getUiAttributes().tableRow;
+    int tableRow = info.getTableRow();
     bool playToStack = SettingsCache::instance().getPlayToStack();
     QString currentZone = card->getZone()->getName();
-    if (!faceDown && currentZone == ZoneNames::STACK && tableRow == 3) {
-        cmd.set_target_zone(ZoneNames::GRAVE);
+    if (currentZone == "stack" && tableRow == 3) {
+        cmd.set_target_zone("grave");
         cmd.set_x(0);
         cmd.set_y(0);
-    } else if (!faceDown && ((!playToStack && tableRow == 3) ||
-                             ((playToStack && tableRow != 0) && currentZone != ZoneNames::STACK))) {
-        cmd.set_target_zone(ZoneNames::STACK);
+    } else if (!faceDown &&
+               ((!playToStack && tableRow == 3) || ((playToStack && tableRow != 0) && currentZone != "stack"))) {
+        cmd.set_target_zone("stack");
         cmd.set_x(-1);
         cmd.set_y(0);
     } else {
-        tableRow = faceDown ? 2 : info.getUiAttributes().tableRow;
-        QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(tableRow));
+        tableRow = faceDown ? 2 : info.getTableRow();
+        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);
+        cardToMove->set_tapped(!faceDown && info.getCipt());
         if (tableRow != 3)
-            cmd.set_target_zone(ZoneNames::TABLE);
+            cmd.set_target_zone("table");
         cmd.set_x(gridPoint.x());
         cmd.set_y(gridPoint.y());
     }
@@ -116,14 +109,19 @@ 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));
+    int tableRow = faceDown ? 2 : info.getTableRow();
+    // 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());
     }
-    cardToMove->set_tapped(!faceDown && info.getUiAttributes().cipt);
-    cmd.set_target_zone(ZoneNames::TABLE);
+    cardToMove->set_tapped(!faceDown && info.getCipt());
+    cmd.set_target_zone("table");
     cmd.set_x(gridPoint.x());
     cmd.set_y(gridPoint.y());
     sendGameCommand(cmd);
@@ -131,44 +129,17 @@ void PlayerActions::playCardToTable(const CardItem *card, bool faceDown)
 
 void PlayerActions::actViewLibrary()
 {
-    player->getGameScene()->toggleZoneView(player, ZoneNames::DECK, -1);
+    player->getGameScene()->toggleZoneView(player, "deck", -1);
 }
 
 void PlayerActions::actViewHand()
 {
-    player->getGameScene()->toggleZoneView(player, ZoneNames::HAND, -1);
-}
-
-/**
- * @brief The sortHand actions only pass along a single SortOption in its data.
- * This method fills out the rest of the sort priority list given that option.
- * @param option The single sort option
- * @return The sort priority list
- */
-static QList<CardList::SortOption> expandSortOption(CardList::SortOption option)
-{
-    switch (option) {
-        case CardList::SortByName:
-            return {};
-        case CardList::SortByMainType:
-            return {CardList::SortByMainType, CardList::SortByManaValue};
-        case CardList::SortByManaValue:
-            return {CardList::SortByManaValue, CardList::SortByColors};
-        default:
-            return {option};
-    }
+    player->getGameScene()->toggleZoneView(player, "hand", -1);
 }
 
 void PlayerActions::actSortHand()
 {
-    auto *action = qobject_cast<QAction *>(sender());
-    CardList::SortOption option = static_cast<CardList::SortOption>(action->data().toInt());
-
-    QList<CardList::SortOption> sortOptions = expandSortOption(option);
-
-    static QList defaultOptions = {CardList::SortByName, CardList::SortByPrinting};
-
-    player->getGraphicsItem()->getHandZoneGraphicsItem()->sortHand(sortOptions + defaultOptions);
+    player->getGraphicsItem()->getHandZoneGraphicsItem()->sortHand();
 }
 
 void PlayerActions::actViewTopCards()
@@ -180,7 +151,7 @@ void PlayerActions::actViewTopCards()
                                       deckSize, 1, &ok);
     if (ok) {
         defaultNumberTopCards = number;
-        player->getGameScene()->toggleZoneView(player, ZoneNames::DECK, number);
+        player->getGameScene()->toggleZoneView(player, "deck", number);
     }
 }
 
@@ -193,14 +164,14 @@ void PlayerActions::actViewBottomCards()
                                       deckSize, 1, &ok);
     if (ok) {
         defaultNumberBottomCards = number;
-        player->getGameScene()->toggleZoneView(player, ZoneNames::DECK, number, true);
+        player->getGameScene()->toggleZoneView(player, "deck", number, true);
     }
 }
 
 void PlayerActions::actAlwaysRevealTopCard()
 {
     Command_ChangeZoneProperties cmd;
-    cmd.set_zone_name(ZoneNames::DECK);
+    cmd.set_zone_name("deck");
     cmd.set_always_reveal_top_card(player->getPlayerMenu()->getLibraryMenu()->isAlwaysRevealTopCardChecked());
 
     sendGameCommand(cmd);
@@ -209,7 +180,7 @@ void PlayerActions::actAlwaysRevealTopCard()
 void PlayerActions::actAlwaysLookAtTopCard()
 {
     Command_ChangeZoneProperties cmd;
-    cmd.set_zone_name(ZoneNames::DECK);
+    cmd.set_zone_name("deck");
     cmd.set_always_look_at_top_card(player->getPlayerMenu()->getLibraryMenu()->isAlwaysLookAtTopCardChecked());
 
     sendGameCommand(cmd);
@@ -217,22 +188,35 @@ void PlayerActions::actAlwaysLookAtTopCard()
 
 void PlayerActions::actOpenDeckInDeckEditor()
 {
-    emit player->openDeckEditor({.deckList = player->getDeck()});
+    emit player->openDeckEditor(player->getDeck());
 }
 
 void PlayerActions::actViewGraveyard()
 {
-    player->getGameScene()->toggleZoneView(player, ZoneNames::GRAVE, -1);
+    player->getGameScene()->toggleZoneView(player, "grave", -1);
+}
+
+void PlayerActions::actRevealRandomGraveyardCard()
+{
+    Command_RevealCards cmd;
+    auto *action = dynamic_cast<QAction *>(sender());
+    const int otherPlayerId = action->data().toInt();
+    if (otherPlayerId != -1) {
+        cmd.set_player_id(otherPlayerId);
+    }
+    cmd.set_zone_name("grave");
+    cmd.add_card_id(RANDOM_CARD_FROM_ZONE);
+    sendGameCommand(cmd);
 }
 
 void PlayerActions::actViewRfg()
 {
-    player->getGameScene()->toggleZoneView(player, ZoneNames::EXILE, -1);
+    player->getGameScene()->toggleZoneView(player, "rfg", -1);
 }
 
 void PlayerActions::actViewSideboard()
 {
-    player->getGameScene()->toggleZoneView(player, ZoneNames::SIDEBOARD, -1);
+    player->getGameScene()->toggleZoneView(player, "sb", -1);
 }
 
 void PlayerActions::actShuffle()
@@ -262,7 +246,7 @@ void PlayerActions::actShuffleTop()
     defaultNumberTopCards = number;
 
     Command_Shuffle cmd;
-    cmd.set_zone_name(ZoneNames::DECK);
+    cmd.set_zone_name("deck");
     cmd.set_start(0);
     cmd.set_end(number - 1); // inclusive, the indexed card at end will be shuffled
 
@@ -291,7 +275,7 @@ void PlayerActions::actShuffleBottom()
     defaultNumberBottomCards = number;
 
     Command_Shuffle cmd;
-    cmd.set_zone_name(ZoneNames::DECK);
+    cmd.set_zone_name("deck");
     cmd.set_start(-number);
     cmd.set_end(-1);
 
@@ -309,48 +293,28 @@ void PlayerActions::actMulligan()
 {
     int startSize = SettingsCache::instance().getStartingHandSize();
     int handSize = player->getHandZone()->getCards().size();
-    int deckSize = player->getDeckZone()->getCards().size() + handSize;
-
+    int deckSize = player->getDeckZone()->getCards().size() + handSize; // hand is shuffled back into the deck
     bool ok;
     int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Draw hand"),
                                       tr("Number of cards: (max. %1)").arg(deckSize) + '\n' +
                                           tr("0 and lower are in comparison to current hand size"),
                                       startSize, -handSize, deckSize, 1, &ok);
-
     if (!ok) {
         return;
     }
-
-    if (number < 1) {
-        number = handSize + number;
-    }
-
-    doMulligan(number);
-    SettingsCache::instance().setStartingHandSize(number);
-}
-
-void PlayerActions::actMulliganSameSize()
-{
-    int handSize = player->getHandZone()->getCards().size();
-    doMulligan(handSize);
-}
-
-void PlayerActions::actMulliganMinusOne()
-{
-    int handSize = player->getHandZone()->getCards().size();
-    int targetSize = qMax(1, handSize - 1);
-    doMulligan(targetSize);
-}
-
-void PlayerActions::doMulligan(int number)
-{
-    if (number < 1) {
-        return;
-    }
-
     Command_Mulligan cmd;
-    cmd.set_number(number);
+    if (number < 1) {
+        if (handSize == 0) {
+            return;
+        }
+        cmd.set_number(handSize + number);
+    } else {
+        cmd.set_number(number);
+    }
     sendGameCommand(cmd);
+    if (startSize != number) {
+        SettingsCache::instance().setStartingHandSize(number);
+    }
 }
 
 void PlayerActions::actDrawCards()
@@ -375,7 +339,7 @@ void PlayerActions::actUndoDraw()
 
 void PlayerActions::cmdSetTopCard(Command_MoveCard &cmd)
 {
-    cmd.set_start_zone(ZoneNames::DECK);
+    cmd.set_start_zone("deck");
     auto *cardToMove = cmd.mutable_cards_to_move()->add_card();
     cardToMove->set_card_id(0);
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
@@ -385,7 +349,7 @@ void PlayerActions::cmdSetBottomCard(Command_MoveCard &cmd)
 {
     CardZoneLogic *zone = player->getDeckZone();
     int lastCard = zone->getCards().size() - 1;
-    cmd.set_start_zone(ZoneNames::DECK);
+    cmd.set_start_zone("deck");
     auto *cardToMove = cmd.mutable_cards_to_move()->add_card();
     cardToMove->set_card_id(lastCard);
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
@@ -399,7 +363,7 @@ void PlayerActions::actMoveTopCardToGrave()
 
     Command_MoveCard cmd;
     cmdSetTopCard(cmd);
-    cmd.set_target_zone(ZoneNames::GRAVE);
+    cmd.set_target_zone("grave");
     cmd.set_x(0);
     cmd.set_y(0);
 
@@ -414,7 +378,7 @@ void PlayerActions::actMoveTopCardToExile()
 
     Command_MoveCard cmd;
     cmdSetTopCard(cmd);
-    cmd.set_target_zone(ZoneNames::EXILE);
+    cmd.set_target_zone("rfg");
     cmd.set_x(0);
     cmd.set_y(0);
 
@@ -423,25 +387,37 @@ void PlayerActions::actMoveTopCardToExile()
 
 void PlayerActions::actMoveTopCardsToGrave()
 {
-    moveTopCardsTo(ZoneNames::GRAVE, tr("grave"), false);
-}
+    const int maxCards = player->getDeckZone()->getCards().size();
+    if (maxCards == 0) {
+        return;
+    }
 
-void PlayerActions::actMoveTopCardsToGraveFaceDown()
-{
-    moveTopCardsTo(ZoneNames::GRAVE, tr("grave"), true);
+    bool ok;
+    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move top cards to grave"),
+                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1,
+                                      maxCards, 1, &ok);
+    if (!ok) {
+        return;
+    } else if (number > maxCards) {
+        number = maxCards;
+    }
+    defaultNumberTopCards = number;
+
+    Command_MoveCard cmd;
+    cmd.set_start_zone("deck");
+    cmd.set_target_player_id(player->getPlayerInfo()->getId());
+    cmd.set_target_zone("grave");
+    cmd.set_x(0);
+    cmd.set_y(0);
+
+    for (int i = number - 1; i >= 0; --i) {
+        cmd.mutable_cards_to_move()->add_card()->set_card_id(i);
+    }
+
+    sendGameCommand(cmd);
 }
 
 void PlayerActions::actMoveTopCardsToExile()
-{
-    moveTopCardsTo(ZoneNames::EXILE, tr("exile"), false);
-}
-
-void PlayerActions::actMoveTopCardsToExileFaceDown()
-{
-    moveTopCardsTo(ZoneNames::EXILE, tr("exile"), true);
-}
-
-void PlayerActions::moveTopCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown)
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
@@ -449,31 +425,25 @@ void PlayerActions::moveTopCardsTo(const QString &targetZone, const QString &zon
     }
 
     bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move top cards to %1").arg(zoneDisplayName),
+    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move top cards to exile"),
                                       tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1,
                                       maxCards, 1, &ok);
     if (!ok) {
         return;
-    }
-
-    if (number > maxCards) {
+    } else if (number > maxCards) {
         number = maxCards;
     }
     defaultNumberTopCards = number;
 
     Command_MoveCard cmd;
-    cmd.set_start_zone(ZoneNames::DECK);
+    cmd.set_start_zone("deck");
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone(targetZone.toStdString());
+    cmd.set_target_zone("rfg");
     cmd.set_x(0);
     cmd.set_y(0);
 
     for (int i = number - 1; i >= 0; --i) {
-        auto card = cmd.mutable_cards_to_move()->add_card();
-        card->set_card_id(i);
-        if (faceDown) {
-            card->set_face_down(true);
-        }
+        cmd.mutable_cards_to_move()->add_card()->set_card_id(i);
     }
 
     sendGameCommand(cmd);
@@ -483,19 +453,22 @@ void PlayerActions::actMoveTopCardsUntil()
 {
     stopMoveTopCardsUntil();
 
-    DlgMoveTopCardsUntil dlg(player->getGame()->getTab(), movingCardsUntilOptions);
+    DlgMoveTopCardsUntil dlg(player->getGame()->getTab(), movingCardsUntilExprs, movingCardsUntilNumberOfHits,
+                             movingCardsUntilAutoPlay);
     if (!dlg.exec()) {
         return;
     }
 
     auto expr = dlg.getExpr();
-    movingCardsUntilOptions = dlg.getOptions();
+    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();
     }
@@ -507,7 +480,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); });
@@ -545,7 +518,7 @@ void PlayerActions::actMoveTopCardToBottom()
 
     Command_MoveCard cmd;
     cmdSetTopCard(cmd);
-    cmd.set_target_zone(ZoneNames::DECK);
+    cmd.set_target_zone("deck");
     cmd.set_x(-1); // bottom of deck
     cmd.set_y(0);
 
@@ -560,7 +533,7 @@ void PlayerActions::actMoveTopCardToPlay()
 
     Command_MoveCard cmd;
     cmdSetTopCard(cmd);
-    cmd.set_target_zone(ZoneNames::STACK);
+    cmd.set_target_zone("stack");
     cmd.set_x(-1);
     cmd.set_y(0);
 
@@ -574,12 +547,12 @@ void PlayerActions::actMoveTopCardToPlayFaceDown()
     }
 
     Command_MoveCard cmd;
-    cmd.set_start_zone(ZoneNames::DECK);
+    cmd.set_start_zone("deck");
     CardToMove *cardToMove = cmd.mutable_cards_to_move()->add_card();
     cardToMove->set_card_id(0);
     cardToMove->set_face_down(true);
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone(ZoneNames::TABLE);
+    cmd.set_target_zone("table");
     cmd.set_x(-1);
     cmd.set_y(0);
 
@@ -594,7 +567,7 @@ void PlayerActions::actMoveBottomCardToGrave()
 
     Command_MoveCard cmd;
     cmdSetBottomCard(cmd);
-    cmd.set_target_zone(ZoneNames::GRAVE);
+    cmd.set_target_zone("grave");
     cmd.set_x(0);
     cmd.set_y(0);
 
@@ -609,7 +582,7 @@ void PlayerActions::actMoveBottomCardToExile()
 
     Command_MoveCard cmd;
     cmdSetBottomCard(cmd);
-    cmd.set_target_zone(ZoneNames::EXILE);
+    cmd.set_target_zone("rfg");
     cmd.set_x(0);
     cmd.set_y(0);
 
@@ -618,25 +591,37 @@ void PlayerActions::actMoveBottomCardToExile()
 
 void PlayerActions::actMoveBottomCardsToGrave()
 {
-    moveBottomCardsTo(ZoneNames::GRAVE, tr("grave"), false);
-}
+    const int maxCards = player->getDeckZone()->getCards().size();
+    if (maxCards == 0) {
+        return;
+    }
 
-void PlayerActions::actMoveBottomCardsToGraveFaceDown()
-{
-    moveBottomCardsTo(ZoneNames::GRAVE, tr("grave"), true);
+    bool ok;
+    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move bottom cards to grave"),
+                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1,
+                                      maxCards, 1, &ok);
+    if (!ok) {
+        return;
+    } else if (number > maxCards) {
+        number = maxCards;
+    }
+    defaultNumberBottomCards = number;
+
+    Command_MoveCard cmd;
+    cmd.set_start_zone("deck");
+    cmd.set_target_player_id(player->getPlayerInfo()->getId());
+    cmd.set_target_zone("grave");
+    cmd.set_x(0);
+    cmd.set_y(0);
+
+    for (int i = maxCards - number; i < maxCards; ++i) {
+        cmd.mutable_cards_to_move()->add_card()->set_card_id(i);
+    }
+
+    sendGameCommand(cmd);
 }
 
 void PlayerActions::actMoveBottomCardsToExile()
-{
-    moveBottomCardsTo(ZoneNames::EXILE, tr("exile"), false);
-}
-
-void PlayerActions::actMoveBottomCardsToExileFaceDown()
-{
-    moveBottomCardsTo(ZoneNames::EXILE, tr("exile"), true);
-}
-
-void PlayerActions::moveBottomCardsTo(const QString &targetZone, const QString &zoneDisplayName, bool faceDown)
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
@@ -644,31 +629,25 @@ void PlayerActions::moveBottomCardsTo(const QString &targetZone, const QString &
     }
 
     bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move bottom cards to %1").arg(zoneDisplayName),
+    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move bottom cards to exile"),
                                       tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1,
                                       maxCards, 1, &ok);
     if (!ok) {
         return;
-    }
-
-    if (number > maxCards) {
+    } else if (number > maxCards) {
         number = maxCards;
     }
     defaultNumberBottomCards = number;
 
     Command_MoveCard cmd;
-    cmd.set_start_zone(ZoneNames::DECK);
+    cmd.set_start_zone("deck");
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone(targetZone.toStdString());
+    cmd.set_target_zone("rfg");
     cmd.set_x(0);
     cmd.set_y(0);
 
     for (int i = maxCards - number; i < maxCards; ++i) {
-        auto card = cmd.mutable_cards_to_move()->add_card();
-        card->set_card_id(i);
-        if (faceDown) {
-            card->set_face_down(true);
-        }
+        cmd.mutable_cards_to_move()->add_card()->set_card_id(i);
     }
 
     sendGameCommand(cmd);
@@ -682,7 +661,7 @@ void PlayerActions::actMoveBottomCardToTop()
 
     Command_MoveCard cmd;
     cmdSetBottomCard(cmd);
-    cmd.set_target_zone(ZoneNames::DECK);
+    cmd.set_target_zone("deck");
     cmd.set_x(0); // top of deck
     cmd.set_y(0);
 
@@ -752,7 +731,7 @@ void PlayerActions::actDrawBottomCard()
 
     Command_MoveCard cmd;
     cmdSetBottomCard(cmd);
-    cmd.set_target_zone(ZoneNames::HAND);
+    cmd.set_target_zone("hand");
     cmd.set_x(0);
     cmd.set_y(0);
 
@@ -778,9 +757,9 @@ void PlayerActions::actDrawBottomCards()
     defaultNumberBottomCards = number;
 
     Command_MoveCard cmd;
-    cmd.set_start_zone(ZoneNames::DECK);
+    cmd.set_start_zone("deck");
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone(ZoneNames::HAND);
+    cmd.set_target_zone("hand");
     cmd.set_x(0);
     cmd.set_y(0);
 
@@ -799,7 +778,7 @@ void PlayerActions::actMoveBottomCardToPlay()
 
     Command_MoveCard cmd;
     cmdSetBottomCard(cmd);
-    cmd.set_target_zone(ZoneNames::STACK);
+    cmd.set_target_zone("stack");
     cmd.set_x(-1);
     cmd.set_y(0);
 
@@ -816,13 +795,13 @@ void PlayerActions::actMoveBottomCardToPlayFaceDown()
     int lastCard = zone->getCards().size() - 1;
 
     Command_MoveCard cmd;
-    cmd.set_start_zone(ZoneNames::DECK);
+    cmd.set_start_zone("deck");
     auto *cardToMove = cmd.mutable_cards_to_move()->add_card();
     cardToMove->set_card_id(lastCard);
     cardToMove->set_face_down(true);
 
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone(ZoneNames::TABLE);
+    cmd.set_target_zone("table");
     cmd.set_x(-1);
     cmd.set_y(0);
 
@@ -832,7 +811,7 @@ void PlayerActions::actMoveBottomCardToPlayFaceDown()
 void PlayerActions::actUntapAll()
 {
     Command_SetCardAttr cmd;
-    cmd.set_zone(ZoneNames::TABLE);
+    cmd.set_zone("table");
     cmd.set_attribute(AttrTapped);
     cmd.set_attr_value("0");
 
@@ -864,7 +843,7 @@ void PlayerActions::actCreateToken()
     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().getTableRow());
         if (lastTokenInfo.pt.isEmpty()) {
             lastTokenInfo.pt = correctedCard.getInfo().getPowTough();
         }
@@ -882,7 +861,7 @@ void PlayerActions::actCreateAnotherToken()
     }
 
     Command_CreateToken cmd;
-    cmd.set_zone(ZoneNames::TABLE);
+    cmd.set_zone("table");
     cmd.set_card_name(lastTokenInfo.name.toStdString());
     cmd.set_card_provider_id(lastTokenInfo.providerId.toStdString());
     cmd.set_color(lastTokenInfo.color.toStdString());
@@ -915,7 +894,7 @@ void PlayerActions::setLastToken(CardInfoPtr cardInfo)
                      .providerId =
                          SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName())};
 
-    lastTokenTableRow = TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow);
+    lastTokenTableRow = TableZone::clampValidTableRow(2 - cardInfo->getTableRow());
 
     utilityMenu->setAndEnableCreateAnotherTokenAction(tr("C&reate another %1 token").arg(lastTokenInfo.name));
 }
@@ -998,7 +977,7 @@ void PlayerActions::actCreateAllRelatedCards()
                         dbName = cardRelationAll->getName();
                         bool persistent = cardRelationAll->getIsPersistent();
                         for (int i = 0; i < cardRelationAll->getDefaultCount(); ++i) {
-                            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent);
+                            createCard(sourceCard, dbName, CardRelation::DoesNotAttach, persistent);
                         }
                         ++tokensTypesCreated;
                         if (tokensTypesCreated == 1) {
@@ -1013,7 +992,7 @@ void PlayerActions::actCreateAllRelatedCards()
                         dbName = cardRelationNotExcluded->getName();
                         bool persistent = cardRelationNotExcluded->getIsPersistent();
                         for (int i = 0; i < cardRelationNotExcluded->getDefaultCount(); ++i) {
-                            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent);
+                            createCard(sourceCard, dbName, CardRelation::DoesNotAttach, persistent);
                         }
                         ++tokensTypesCreated;
                         if (tokensTypesCreated == 1) {
@@ -1052,18 +1031,18 @@ bool PlayerActions::createRelatedFromRelation(const CardItem *sourceCard, const
             return false;
         }
         for (int i = 0; i < count; ++i) {
-            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent);
+            createCard(sourceCard, dbName, CardRelation::DoesNotAttach, persistent);
         }
     } else if (cardRelation->getDefaultCount() > 1) {
         for (int i = 0; i < cardRelation->getDefaultCount(); ++i) {
-            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent);
+            createCard(sourceCard, dbName, CardRelation::DoesNotAttach, persistent);
         }
     } else {
         auto attachType = cardRelation->getAttachType();
 
         // move card onto table first if attaching from some other zone
         // we only do this for AttachTo because cross-zone TransformInto is already handled server-side
-        if (attachType == CardRelationType::AttachTo && sourceCard->getZone()->getName() != ZoneNames::TABLE) {
+        if (attachType == CardRelation::AttachTo && sourceCard->getZone()->getName() != "table") {
             playCardToTable(sourceCard, false);
         }
 
@@ -1074,7 +1053,7 @@ bool PlayerActions::createRelatedFromRelation(const CardItem *sourceCard, const
 
 void PlayerActions::createCard(const CardItem *sourceCard,
                                const QString &dbCardName,
-                               CardRelationType attachType,
+                               CardRelation::AttachType attachType,
                                bool persistent)
 {
     CardInfoPtr cardInfo = CardDatabaseManager::query()->getCardInfo(dbCardName);
@@ -1083,11 +1062,13 @@ 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->getTableRow()));
 
     // create the token for the related card
     Command_CreateToken cmd;
-    cmd.set_zone(ZoneNames::TABLE);
+    cmd.set_zone("table");
     cmd.set_card_name(cardInfo->getName().toStdString());
     switch (cardInfo->getColors().size()) {
         case 0:
@@ -1115,21 +1096,21 @@ void PlayerActions::createCard(const CardItem *sourceCard,
         CardDatabaseManager::query()->getCardFromSameSet(cardInfo->getName(), sourceCard->getCard().getPrinting());
 
     switch (attachType) {
-        case CardRelationType::DoesNotAttach:
-            cmd.set_target_zone(ZoneNames::TABLE);
+        case CardRelation::DoesNotAttach:
+            cmd.set_target_zone("table");
             cmd.set_card_provider_id(relatedCard.getPrinting().getUuid().toStdString());
             break;
 
-        case CardRelationType::AttachTo:
-            cmd.set_target_zone(ZoneNames::TABLE); // We currently only support creating tokens on the table
+        case CardRelation::AttachTo:
+            cmd.set_target_zone("table"); // We currently only support creating tokens on the table
             cmd.set_card_provider_id(relatedCard.getPrinting().getUuid().toStdString());
             cmd.set_target_card_id(sourceCard->getId());
             cmd.set_target_mode(Command_CreateToken::ATTACH_TO);
             break;
 
-        case CardRelationType::TransformInto:
+        case CardRelation::TransformInto:
             // allow cards to directly transform on stack
-            cmd.set_zone(sourceCard->getZone()->getName() == ZoneNames::STACK ? ZoneNames::STACK : ZoneNames::TABLE);
+            cmd.set_zone(sourceCard->getZone()->getName() == "stack" ? "stack" : "table");
             // Transform card zone changes are handled server-side
             cmd.set_target_zone(sourceCard->getZone()->getName().toStdString());
             cmd.set_target_card_id(sourceCard->getId());
@@ -1244,7 +1225,7 @@ void PlayerActions::actMoveCardXCardsFromTop()
     cmd->set_start_zone(startZone.toStdString());
     cmd->mutable_cards_to_move()->CopyFrom(idList);
     cmd->set_target_player_id(player->getPlayerInfo()->getId());
-    cmd->set_target_zone(ZoneNames::DECK);
+    cmd->set_target_zone("deck");
     cmd->set_x(number);
     cmd->set_y(0);
     commandList.append(cmd);
@@ -1575,34 +1556,23 @@ void PlayerActions::actCardCounterTrigger()
             break;
         }
         case 11: { // set counter with dialog
+            bool ok;
             player->setDialogSemaphore(true);
 
-            // If a single card is selected, we show the old value in the dialog. Otherwise, we show "x"
-            QList<QGraphicsItem *> sel = player->getGameScene()->selectedItems();
-            QString oldValueForDlg = "x";
-            if (sel.size() == 1) {
-                auto *card = dynamic_cast<CardItem *>(sel.first());
-                oldValueForDlg = QString::number(card->getCounters().value(counterId, 0));
+            int oldValue = 0;
+            if (player->getGameScene()->selectedItems().size() == 1) {
+                auto *card = static_cast<CardItem *>(player->getGameScene()->selectedItems().first());
+                oldValue = card->getCounters().value(counterId, 0);
             }
-
-            auto &cardCounterSettings = SettingsCache::instance().cardCounters();
-            QString counterName = cardCounterSettings.displayName(counterId);
-
-            AbstractCounterDialog dialog(counterName, oldValueForDlg, player->getGame()->getTab());
-            int ok = dialog.exec();
-
+            int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Set counters"), tr("Number:"), oldValue,
+                                              0, MAX_COUNTERS_ON_CARD, 1, &ok);
             player->setDialogSemaphore(false);
             if (player->clearCardsToDelete() || !ok) {
                 return;
             }
 
-            for (const auto &item : sel) {
-                auto *card = dynamic_cast<CardItem *>(item);
-
-                int oldValue = card->getCounters().value(counterId, 0);
-                Expression exp(oldValue);
-                int number = static_cast<int>(exp.parse(dialog.textValue()));
-
+            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());
@@ -1644,7 +1614,7 @@ void PlayerActions::playSelectedCards(const bool faceDown)
               [](const auto &card1, const auto &card2) { return card1->getId() > card2->getId(); });
 
     for (auto &card : selectedCards) {
-        if (card && !isUnwritableRevealZone(card->getZone()) && card->getZone()->getName() != ZoneNames::TABLE) {
+        if (card && !isUnwritableRevealZone(card->getZone()) && card->getZone()->getName() != "table") {
             playCard(card, faceDown);
         }
     }
@@ -1691,78 +1661,6 @@ void PlayerActions::actReveal(QAction *action)
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actRevealHand(int revealToPlayerId)
-{
-    Command_RevealCards cmd;
-    if (revealToPlayerId != -1) {
-        cmd.set_player_id(revealToPlayerId);
-    }
-    cmd.set_zone_name(ZoneNames::HAND);
-
-    sendGameCommand(cmd);
-}
-
-void PlayerActions::actRevealRandomHandCard(int revealToPlayerId)
-{
-    Command_RevealCards cmd;
-    if (revealToPlayerId != -1) {
-        cmd.set_player_id(revealToPlayerId);
-    }
-    cmd.set_zone_name(ZoneNames::HAND);
-    cmd.add_card_id(RANDOM_CARD_FROM_ZONE);
-
-    sendGameCommand(cmd);
-}
-
-void PlayerActions::actRevealLibrary(int revealToPlayerId)
-{
-    Command_RevealCards cmd;
-    if (revealToPlayerId != -1) {
-        cmd.set_player_id(revealToPlayerId);
-    }
-    cmd.set_zone_name(ZoneNames::DECK);
-
-    sendGameCommand(cmd);
-}
-
-void PlayerActions::actLendLibrary(int lendToPlayerId)
-{
-    Command_RevealCards cmd;
-    if (lendToPlayerId != -1) {
-        cmd.set_player_id(lendToPlayerId);
-    }
-    cmd.set_zone_name(ZoneNames::DECK);
-    cmd.set_grant_write_access(true);
-
-    sendGameCommand(cmd);
-}
-
-void PlayerActions::actRevealTopCards(int revealToPlayerId, int amount)
-{
-    Command_RevealCards cmd;
-    if (revealToPlayerId != -1) {
-        cmd.set_player_id(revealToPlayerId);
-    }
-
-    cmd.set_zone_name(ZoneNames::DECK);
-    cmd.set_top_cards(amount);
-    // backward compatibility: servers before #1051 only permits to reveal the first card
-    cmd.add_card_id(0);
-
-    sendGameCommand(cmd);
-}
-
-void PlayerActions::actRevealRandomGraveyardCard(int revealToPlayerId)
-{
-    Command_RevealCards cmd;
-    if (revealToPlayerId != -1) {
-        cmd.set_player_id(revealToPlayerId);
-    }
-    cmd.set_zone_name(ZoneNames::GRAVE);
-    cmd.add_card_id(RANDOM_CARD_FROM_ZONE);
-    sendGameCommand(cmd);
-}
-
 void PlayerActions::cardMenuAction()
 {
     auto *a = dynamic_cast<QAction *>(sender());
@@ -1821,7 +1719,7 @@ void PlayerActions::cardMenuAction()
                 }
                 case cmClone: {
                     auto *cmd = new Command_CreateToken;
-                    cmd->set_zone(ZoneNames::TABLE);
+                    cmd->set_zone("table");
                     cmd->set_card_name(card->getName().toStdString());
                     cmd->set_card_provider_id(card->getProviderId().toStdString());
                     cmd->set_color(card->getColor().toStdString());
@@ -1863,13 +1761,13 @@ void PlayerActions::cardMenuAction()
                 cmd->set_start_zone(startZone.toStdString());
                 cmd->mutable_cards_to_move()->CopyFrom(idList);
                 cmd->set_target_player_id(player->getPlayerInfo()->getId());
-                cmd->set_target_zone(ZoneNames::DECK);
+                cmd->set_target_zone("deck");
                 cmd->set_x(0);
                 cmd->set_y(0);
 
                 if (idList.card_size() > 1) {
                     auto *scmd = new Command_Shuffle;
-                    scmd->set_zone_name(ZoneNames::DECK);
+                    scmd->set_zone_name("deck");
                     scmd->set_start(0);
                     scmd->set_end(idList.card_size() - 1); // inclusive, the indexed card at end will be shuffled
                     // Server process events backwards, so...
@@ -1885,13 +1783,13 @@ void PlayerActions::cardMenuAction()
                 cmd->set_start_zone(startZone.toStdString());
                 cmd->mutable_cards_to_move()->CopyFrom(idList);
                 cmd->set_target_player_id(player->getPlayerInfo()->getId());
-                cmd->set_target_zone(ZoneNames::DECK);
+                cmd->set_target_zone("deck");
                 cmd->set_x(-1);
                 cmd->set_y(0);
 
                 if (idList.card_size() > 1) {
                     auto *scmd = new Command_Shuffle;
-                    scmd->set_zone_name(ZoneNames::DECK);
+                    scmd->set_zone_name("deck");
                     scmd->set_start(-idList.card_size());
                     scmd->set_end(-1);
                     // Server process events backwards, so...
@@ -1907,7 +1805,7 @@ void PlayerActions::cardMenuAction()
                 cmd->set_start_zone(startZone.toStdString());
                 cmd->mutable_cards_to_move()->CopyFrom(idList);
                 cmd->set_target_player_id(player->getPlayerInfo()->getId());
-                cmd->set_target_zone(ZoneNames::HAND);
+                cmd->set_target_zone("hand");
                 cmd->set_x(0);
                 cmd->set_y(0);
                 commandList.append(cmd);
@@ -1919,7 +1817,7 @@ void PlayerActions::cardMenuAction()
                 cmd->set_start_zone(startZone.toStdString());
                 cmd->mutable_cards_to_move()->CopyFrom(idList);
                 cmd->set_target_player_id(player->getPlayerInfo()->getId());
-                cmd->set_target_zone(ZoneNames::GRAVE);
+                cmd->set_target_zone("grave");
                 cmd->set_x(0);
                 cmd->set_y(0);
                 commandList.append(cmd);
@@ -1931,40 +1829,12 @@ void PlayerActions::cardMenuAction()
                 cmd->set_start_zone(startZone.toStdString());
                 cmd->mutable_cards_to_move()->CopyFrom(idList);
                 cmd->set_target_player_id(player->getPlayerInfo()->getId());
-                cmd->set_target_zone(ZoneNames::EXILE);
+                cmd->set_target_zone("rfg");
                 cmd->set_x(0);
                 cmd->set_y(0);
                 commandList.append(cmd);
                 break;
             }
-            case cmMoveToTable: {
-                // Each card needs its own command because table row, pt, and cipt vary per card
-                for (const auto &card : cardList) {
-                    auto *cmd = new Command_MoveCard;
-                    cmd->set_start_player_id(startPlayerId);
-                    cmd->set_start_zone(startZone.toStdString());
-                    cmd->set_target_player_id(player->getPlayerInfo()->getId());
-                    cmd->set_target_zone(ZoneNames::TABLE);
-                    cmd->set_x(-1);
-
-                    CardToMove *ctm = cmd->mutable_cards_to_move()->add_card();
-                    ctm->set_card_id(card->getId());
-                    ctm->set_face_down(false);
-
-                    int tableRow = 0;
-                    ExactCard exactCard = card->getCard();
-                    if (exactCard) {
-                        const CardInfo &info = exactCard.getInfo();
-                        tableRow = info.getUiAttributes().tableRow;
-                        ctm->set_pt(info.getPowTough().toStdString());
-                        ctm->set_tapped(info.getUiAttributes().cipt);
-                    }
-
-                    cmd->set_y(TableZone::tableRowToGridY(tableRow));
-                    commandList.append(cmd);
-                }
-                break;
-            }
             default:
                 break;
         }
diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h
index d4c6daacf..a694ff5f8 100644
--- a/cockatrice/src/game/player/player_actions.h
+++ b/cockatrice/src/game/player/player_actions.h
@@ -1,22 +1,10 @@
-/**
- * @file player_actions.h
- *  @ingroup GameLogicActions
- * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
-#include "../dialogs/dlg_create_token.h"
-#include "../dialogs/dlg_move_top_cards_until.h"
 #include "event_processing_options.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
 {
@@ -65,7 +53,7 @@ public:
     void moveOneCardUntil(CardItem *card);
     void stopMoveTopCardsUntil();
 
-    [[nodiscard]] bool isMovingCardsUntil() const
+    bool isMovingCardsUntil() const
     {
         return movingCardsUntil;
     }
@@ -86,9 +74,6 @@ public slots:
     void actDrawCards();
     void actUndoDraw();
     void actMulligan();
-    void actMulliganSameSize();
-    void actMulliganMinusOne();
-    void doMulligan(int number);
 
     void actPlay();
     void actPlayFacedown();
@@ -99,9 +84,7 @@ public slots:
     void actMoveTopCardToGrave();
     void actMoveTopCardToExile();
     void actMoveTopCardsToGrave();
-    void actMoveTopCardsToGraveFaceDown();
     void actMoveTopCardsToExile();
-    void actMoveTopCardsToExileFaceDown();
     void actMoveTopCardsUntil();
     void actMoveTopCardToBottom();
     void actDrawBottomCard();
@@ -111,9 +94,7 @@ public slots:
     void actMoveBottomCardToGrave();
     void actMoveBottomCardToExile();
     void actMoveBottomCardsToGrave();
-    void actMoveBottomCardsToGraveFaceDown();
     void actMoveBottomCardsToExile();
-    void actMoveBottomCardsToExileFaceDown();
     void actMoveBottomCardToTop();
 
     void actSelectAll();
@@ -127,9 +108,7 @@ public slots:
     void actAlwaysRevealTopCard();
     void actAlwaysLookAtTopCard();
     void actViewGraveyard();
-    void actLendLibrary(int lendToPlayerId);
-    void actRevealTopCards(int revealToPlayerId, int amount);
-    void actRevealRandomGraveyardCard(int revealToPlayerId);
+    void actRevealRandomGraveyardCard();
     void actViewRfg();
     void actViewSideboard();
 
@@ -158,9 +137,6 @@ public slots:
     void actFlowT();
     void actSetAnnotation();
     void actReveal(QAction *action);
-    void actRevealHand(int revealToPlayerId);
-    void actRevealRandomHandCard(int revealToPlayerId);
-    void actRevealLibrary(int revealToPlayerId);
 
     void actSortHand();
 
@@ -179,16 +155,15 @@ private:
 
     bool movingCardsUntil;
     QTimer *moveTopCardTimer;
+    QStringList movingCardsUntilExprs = {};
+    int movingCardsUntilNumberOfHits = 1;
+    bool movingCardsUntilAutoPlay = false;
     FilterString movingCardsUntilFilter;
     int movingCardsUntilCounter = 0;
-    MoveTopCardsUntilOptions movingCardsUntilOptions;
-
-    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,
+                    CardRelation::AttachType attach = CardRelation::DoesNotAttach,
                     bool persistent = false);
     bool createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation);
 
diff --git a/cockatrice/src/game/player/player_area.h b/cockatrice/src/game/player/player_area.h
index ec0d23cb6..c0b689713 100644
--- a/cockatrice/src/game/player/player_area.h
+++ b/cockatrice/src/game/player/player_area.h
@@ -1,13 +1,7 @@
-/**
- * @file player_area.h
- * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_PLAYER_AREA_H
 #define COCKATRICE_PLAYER_AREA_H
 
-#include "../../game_graphics/board/graphics_item_type.h"
+#include "../board/graphics_item_type.h"
 #include "QGraphicsItem"
 
 /**
@@ -28,13 +22,13 @@ public:
     {
         Type = typeOther
     };
-    [[nodiscard]] int type() const override
+    int type() const override
     {
         return Type;
     }
 
     explicit PlayerArea(QGraphicsItem *parent = nullptr);
-    [[nodiscard]] QRectF boundingRect() const override
+    QRectF boundingRect() const override
     {
         return bRect;
     }
@@ -43,7 +37,7 @@ public:
     void setSize(qreal width, qreal height);
 
     void setPlayerZoneId(int _playerZoneId);
-    [[nodiscard]] int getPlayerZoneId() const
+    int getPlayerZoneId() const
     {
         return playerZoneId;
     }
diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp
index 6fb1ff19a..969ffd4d2 100644
--- a/cockatrice/src/game/player/player_event_handler.cpp
+++ b/cockatrice/src/game/player/player_event_handler.cpp
@@ -1,38 +1,35 @@
 #include "player_event_handler.h"
 
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../tabs/tab_game.h"
 #include "../board/arrow_item.h"
 #include "../board/card_item.h"
 #include "../board/card_list.h"
 #include "../zones/view_zone.h"
+#include "pb/command_set_card_attr.pb.h"
+#include "pb/context_move_card.pb.h"
+#include "pb/context_undo_draw.pb.h"
+#include "pb/event_attach_card.pb.h"
+#include "pb/event_change_zone_properties.pb.h"
+#include "pb/event_create_arrow.pb.h"
+#include "pb/event_create_counter.pb.h"
+#include "pb/event_create_token.pb.h"
+#include "pb/event_del_counter.pb.h"
+#include "pb/event_delete_arrow.pb.h"
+#include "pb/event_destroy_card.pb.h"
+#include "pb/event_draw_cards.pb.h"
+#include "pb/event_dump_zone.pb.h"
+#include "pb/event_flip_card.pb.h"
+#include "pb/event_game_say.pb.h"
+#include "pb/event_move_card.pb.h"
+#include "pb/event_reveal_cards.pb.h"
+#include "pb/event_roll_die.pb.h"
+#include "pb/event_set_card_attr.pb.h"
+#include "pb/event_set_card_counter.pb.h"
+#include "pb/event_set_counter.pb.h"
+#include "pb/event_shuffle.pb.h"
 #include "player.h"
-#include "player_actions.h"
 
-#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
-#include <libcockatrice/protocol/pb/context_move_card.pb.h>
-#include <libcockatrice/protocol/pb/context_undo_draw.pb.h>
-#include <libcockatrice/protocol/pb/event_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/event_change_zone_properties.pb.h>
-#include <libcockatrice/protocol/pb/event_create_arrow.pb.h>
-#include <libcockatrice/protocol/pb/event_create_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_create_token.pb.h>
-#include <libcockatrice/protocol/pb/event_del_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_delete_arrow.pb.h>
-#include <libcockatrice/protocol/pb/event_destroy_card.pb.h>
-#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_say.pb.h>
-#include <libcockatrice/protocol/pb/event_move_card.pb.h>
-#include <libcockatrice/protocol/pb/event_reveal_cards.pb.h>
-#include <libcockatrice/protocol/pb/event_roll_die.pb.h>
-#include <libcockatrice/protocol/pb/event_set_card_attr.pb.h>
-#include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_set_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_shuffle.pb.h>
-#include <libcockatrice/utility/zone_names.h>
-
-PlayerEventHandler::PlayerEventHandler(Player *_player) : QObject(_player), player(_player)
+PlayerEventHandler::PlayerEventHandler(Player *_player) : player(_player)
 {
 }
 
@@ -60,6 +57,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!";
@@ -78,7 +76,14 @@ void PlayerEventHandler::eventShuffle(const Event_Shuffle &event)
 void PlayerEventHandler::eventRollDie(const Event_RollDie &event)
 {
     if (!event.values().empty()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         QList<uint> rolls(event.values().begin(), event.values().end());
+#else
+        QList<uint> rolls;
+        for (const auto &value : event.values()) {
+            rolls.append(value);
+        }
+#endif
         std::sort(rolls.begin(), rolls.end());
         emit logRollDie(player, static_cast<int>(event.sides()), rolls);
     } else if (event.value()) {
@@ -321,8 +326,8 @@ void PlayerEventHandler::eventMoveCard(const Event_MoveCard &event, const GameEv
     }
     player->getPlayerMenu()->updateCardMenu(card);
 
-    if (player->getPlayerActions()->isMovingCardsUntil() && startZoneString == ZoneNames::DECK &&
-        targetZone->getName() == ZoneNames::STACK) {
+    if (player->getPlayerActions()->isMovingCardsUntil() && startZoneString == "deck" &&
+        targetZone->getName() == "stack") {
         player->getPlayerActions()->moveOneCardUntil(card);
     }
 }
@@ -594,4 +599,4 @@ void PlayerEventHandler::processGameEvent(GameEvent::GameEventType type,
             qWarning() << "unhandled game event" << type;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/player/player_event_handler.h b/cockatrice/src/game/player/player_event_handler.h
index 5d1ddd4b4..8df6cf299 100644
--- a/cockatrice/src/game/player/player_event_handler.h
+++ b/cockatrice/src/game/player/player_event_handler.h
@@ -1,16 +1,10 @@
-/**
- * @file player_event_handler.h
- * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_PLAYER_EVENT_HANDLER_H
 #define COCKATRICE_PLAYER_EVENT_HANDLER_H
 #include "event_processing_options.h"
 
 #include <QObject>
-#include <libcockatrice/protocol/pb/game_event.pb.h>
-#include <libcockatrice/protocol/pb/game_event_context.pb.h>
+#include <pb/game_event.pb.h>
+#include <pb/game_event_context.pb.h>
 
 class CardItem;
 class CardZoneLogic;
diff --git a/cockatrice/src/game/player/player_graphics_item.cpp b/cockatrice/src/game/player/player_graphics_item.cpp
index bcc4b7f72..b4553694b 100644
--- a/cockatrice/src/game/player/player_graphics_item.cpp
+++ b/cockatrice/src/game/player/player_graphics_item.cpp
@@ -1,12 +1,7 @@
 #include "player_graphics_item.h"
 
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../board/abstract_card_item.h"
+#include "../../tabs/tab_game.h"
 #include "../hand_counter.h"
-#include "../zones/hand_zone.h"
-#include "../zones/pile_zone.h"
-#include "../zones/stack_zone.h"
-#include "../zones/table_zone.h"
 
 PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player)
 {
@@ -19,8 +14,7 @@ PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player)
     playerArea = new PlayerArea(this);
 
     playerTarget = new PlayerTarget(player, playerArea);
-    qreal avatarMargin =
-        (counterAreaWidth + CardDimensions::HEIGHT_F + 15 - playerTarget->boundingRect().width()) / 2.0;
+    qreal avatarMargin = (counterAreaWidth + CARD_HEIGHT + 15 - playerTarget->boundingRect().width()) / 2.0;
     playerTarget->setPos(QPointF(avatarMargin, avatarMargin));
 
     initializeZones();
@@ -56,9 +50,8 @@ void PlayerGraphicsItem::onPlayerActiveChanged(bool _active)
 void PlayerGraphicsItem::initializeZones()
 {
     deckZoneGraphicsItem = new PileZone(player->getDeckZone(), this);
-    auto base = QPointF(counterAreaWidth + (CardDimensions::HEIGHT_F - CardDimensions::WIDTH_F + 15) / 2.0,
-                        10 + playerTarget->boundingRect().height() + 5 -
-                            (CardDimensions::HEIGHT_F - CardDimensions::WIDTH_F) / 2.0);
+    QPointF base = QPointF(counterAreaWidth + (CARD_HEIGHT - CARD_WIDTH + 15) / 2.0,
+                           10 + playerTarget->boundingRect().height() + 5 - (CARD_HEIGHT - CARD_WIDTH) / 2.0);
     deckZoneGraphicsItem->setPos(base);
 
     qreal h = deckZoneGraphicsItem->boundingRect().width() + 5;
@@ -97,7 +90,7 @@ QRectF PlayerGraphicsItem::boundingRect() const
 
 qreal PlayerGraphicsItem::getMinimumWidth() const
 {
-    qreal result = tableZoneGraphicsItem->getMinimumWidth() + CardDimensions::HEIGHT_F + 15 + counterAreaWidth +
+    qreal result = tableZoneGraphicsItem->getMinimumWidth() + CARD_HEIGHT + 15 + counterAreaWidth +
                    stackZoneGraphicsItem->boundingRect().width();
     if (!SettingsCache::instance().getHorizontalHand()) {
         result += handZoneGraphicsItem->boundingRect().width();
@@ -114,8 +107,8 @@ void PlayerGraphicsItem::paint(QPainter * /*painter*/,
 void PlayerGraphicsItem::processSceneSizeChange(int newPlayerWidth)
 {
     // Extend table (and hand, if horizontal) to accommodate the new player width.
-    qreal tableWidth = newPlayerWidth - CardDimensions::HEIGHT_F - 15 - counterAreaWidth -
-                       stackZoneGraphicsItem->boundingRect().width();
+    qreal tableWidth =
+        newPlayerWidth - CARD_HEIGHT - 15 - counterAreaWidth - stackZoneGraphicsItem->boundingRect().width();
     if (!SettingsCache::instance().getHorizontalHand()) {
         tableWidth -= handZoneGraphicsItem->boundingRect().width();
     }
@@ -154,7 +147,7 @@ void PlayerGraphicsItem::rearrangeCounters()
 
 void PlayerGraphicsItem::rearrangeZones()
 {
-    auto base = QPointF(CardDimensions::HEIGHT_F + counterAreaWidth + 15, 0);
+    QPointF base = QPointF(CARD_HEIGHT + counterAreaWidth + 15, 0);
     if (SettingsCache::instance().getHorizontalHand()) {
         if (mirrored) {
             if (player->getHandZone()->contentsKnown()) {
@@ -205,7 +198,7 @@ void PlayerGraphicsItem::rearrangeZones()
 void PlayerGraphicsItem::updateBoundingRect()
 {
     prepareGeometryChange();
-    qreal width = CardDimensions::HEIGHT_F + 15 + counterAreaWidth + stackZoneGraphicsItem->boundingRect().width();
+    qreal width = CARD_HEIGHT + 15 + counterAreaWidth + stackZoneGraphicsItem->boundingRect().width();
     if (SettingsCache::instance().getHorizontalHand()) {
         qreal handHeight =
             player->getPlayerInfo()->getHandVisible() ? handZoneGraphicsItem->boundingRect().height() : 0;
@@ -216,7 +209,7 @@ void PlayerGraphicsItem::updateBoundingRect()
             0, 0, width + handZoneGraphicsItem->boundingRect().width() + tableZoneGraphicsItem->boundingRect().width(),
             tableZoneGraphicsItem->boundingRect().height());
     }
-    playerArea->setSize(CardDimensions::HEIGHT_F + counterAreaWidth + 15, bRect.height());
+    playerArea->setSize(CARD_HEIGHT + counterAreaWidth + 15, bRect.height());
 
     emit sizeChanged();
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/player/player_graphics_item.h b/cockatrice/src/game/player/player_graphics_item.h
index cba664dd9..70f42ba79 100644
--- a/cockatrice/src/game/player/player_graphics_item.h
+++ b/cockatrice/src/game/player/player_graphics_item.h
@@ -1,9 +1,3 @@
-/**
- * @file player_graphics_item.h
- * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_PLAYER_GRAPHICS_ITEM_H
 #define COCKATRICE_PLAYER_GRAPHICS_ITEM_H
 #include "../game_scene.h"
diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h
index 2e9b49d6d..a8759b151 100644
--- a/cockatrice/src/game/player/player_info.h
+++ b/cockatrice/src/game/player/player_info.h
@@ -1,16 +1,15 @@
-/**
- * @file player_info.h
- * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_PLAYER_INFO_H
 #define COCKATRICE_PLAYER_INFO_H
 
+#include "../../../common/pb/serverinfo_user.pb.h"
+#include "../../deck/deck_loader.h"
+#include "../zones/hand_zone.h"
+#include "../zones/pile_zone.h"
+#include "../zones/stack_zone.h"
+#include "../zones/table_zone.h"
 #include "player_target.h"
 
 #include <QObject>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class PlayerInfo : public QObject
 {
diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp
index 9506e0729..9df7e94da 100644
--- a/cockatrice/src/game/player/player_list_widget.cpp
+++ b/cockatrice/src/game/player/player_list_widget.cpp
@@ -1,17 +1,21 @@
 #include "player_list_widget.h"
 
 #include "../../interface/pixel_map_generator.h"
-#include "../../interface/widgets/server/user/user_context_menu.h"
-#include "../../interface/widgets/server/user/user_list_manager.h"
-#include "../../interface/widgets/server/user/user_list_widget.h"
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../server/abstract_client.h"
+#include "../../server/user/user_context_menu.h"
+#include "../../server/user/user_list_manager.h"
+#include "../../server/user/user_list_widget.h"
+#include "../../tabs/tab_account.h"
+#include "../../tabs/tab_game.h"
+#include "../../tabs/tab_supervisor.h"
+#include "pb/command_kick_from_game.pb.h"
+#include "pb/serverinfo_playerproperties.pb.h"
+#include "pb/session_commands.pb.h"
 
+#include <QAction>
 #include <QHeaderView>
+#include <QMenu>
 #include <QMouseEvent>
-#include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
 
 PlayerListItemDelegate::PlayerListItemDelegate(QObject *const parent) : QStyledItemDelegate(parent)
 {
@@ -23,7 +27,7 @@ bool PlayerListItemDelegate::editorEvent(QEvent *event,
                                          const QModelIndex &index)
 {
     if ((event->type() == QEvent::MouseButtonPress) && index.isValid()) {
-        auto *const mouseEvent = static_cast<QMouseEvent *>(event);
+        QMouseEvent *const mouseEvent = static_cast<QMouseEvent *>(event);
         if (mouseEvent->button() == Qt::RightButton) {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
             static_cast<PlayerListWidget *>(parent())->showContextMenu(mouseEvent->globalPosition().toPoint(), index);
diff --git a/cockatrice/src/game/player/player_list_widget.h b/cockatrice/src/game/player/player_list_widget.h
index 8f1487563..ef5ceb212 100644
--- a/cockatrice/src/game/player/player_list_widget.h
+++ b/cockatrice/src/game/player/player_list_widget.h
@@ -1,9 +1,3 @@
-/**
- * @file player_list_widget.h
- * @ingroup GameWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef PLAYERLISTWIDGET_H
 #define PLAYERLISTWIDGET_H
 
diff --git a/cockatrice/src/game/player/player_manager.cpp b/cockatrice/src/game/player/player_manager.cpp
index e283d2196..d8c12cee6 100644
--- a/cockatrice/src/game/player/player_manager.cpp
+++ b/cockatrice/src/game/player/player_manager.cpp
@@ -60,7 +60,6 @@ void PlayerManager::removePlayer(int playerId)
     emit playerRemoved(player);
     emit playerCountChanged();
     players.remove(playerId);
-    player->deleteLater();
 }
 
 Player *PlayerManager::getPlayer(int playerId) const
diff --git a/cockatrice/src/game/player/player_manager.h b/cockatrice/src/game/player/player_manager.h
index 0f813b3e4..32f4a5753 100644
--- a/cockatrice/src/game/player/player_manager.h
+++ b/cockatrice/src/game/player/player_manager.h
@@ -1,15 +1,10 @@
-/**
- * @file player_manager.h
- * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_PLAYER_MANAGER_H
 #define COCKATRICE_PLAYER_MANAGER_H
 
+#include "pb/serverinfo_playerproperties.pb.h"
+
 #include <QMap>
 #include <QObject>
-#include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
 
 class AbstractGame;
 class Player;
@@ -27,39 +22,39 @@ public:
     bool localPlayerIsSpectator;
     QMap<int, ServerInfo_User> spectators;
 
-    [[nodiscard]] bool isSpectator() const
+    bool isSpectator() const
     {
         return localPlayerIsSpectator;
     }
 
-    [[nodiscard]] bool isJudge() const
+    bool isJudge() const
     {
         return localPlayerIsJudge;
     }
 
-    [[nodiscard]] int getLocalPlayerId() const
+    int getLocalPlayerId() const
     {
         return localPlayerId;
     }
 
-    [[nodiscard]] const QMap<int, Player *> &getPlayers() const
+    const QMap<int, Player *> &getPlayers() const
     {
         return players;
     }
 
-    [[nodiscard]] int getPlayerCount() const
+    int getPlayerCount() const
     {
         return players.size();
     }
 
-    [[nodiscard]] Player *getActiveLocalPlayer(int activePlayer) const;
+    Player *getActiveLocalPlayer(int activePlayer) const;
     bool isLocalPlayer(int playerId);
 
     Player *addPlayer(int playerId, const ServerInfo_User &info);
 
     void removePlayer(int playerId);
 
-    [[nodiscard]] Player *getPlayer(int playerId) const;
+    Player *getPlayer(int playerId) const;
 
     void onPlayerConceded(int playerId, bool conceded);
 
@@ -70,17 +65,17 @@ public:
         return playerId == getLocalPlayerId();
     }
 
-    [[nodiscard]] const QMap<int, ServerInfo_User> &getSpectators() const
+    const QMap<int, ServerInfo_User> &getSpectators() const
     {
         return spectators;
     }
 
-    [[nodiscard]] ServerInfo_User getSpectator(int playerId) const
+    ServerInfo_User getSpectator(int playerId) const
     {
         return spectators.value(playerId);
     }
 
-    [[nodiscard]] QString getSpectatorName(int spectatorId) const
+    QString getSpectatorName(int spectatorId) const
     {
         return QString::fromStdString(spectators.value(spectatorId).name());
     }
@@ -100,7 +95,7 @@ public:
         emit spectatorRemoved(spectatorId, spectatorInfo);
     }
 
-    [[nodiscard]] AbstractGame *getGame() const
+    AbstractGame *getGame() const
     {
         return game;
     }
diff --git a/cockatrice/src/game/player/player_target.cpp b/cockatrice/src/game/player/player_target.cpp
index a7a5cc5e7..6ece3e261 100644
--- a/cockatrice/src/game/player/player_target.cpp
+++ b/cockatrice/src/game/player/player_target.cpp
@@ -1,13 +1,13 @@
 #include "player_target.h"
 
 #include "../../interface/pixel_map_generator.h"
+#include "pb/serverinfo_user.pb.h"
 #include "player.h"
 
 #include <QDebug>
 #include <QPainter>
 #include <QPixmapCache>
 #include <QtMath>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 PlayerCounter::PlayerCounter(Player *_player, int _id, const QString &_name, int _value, QGraphicsItem *parent)
     : AbstractCounter(_player, _id, _name, false, _value, false, parent)
diff --git a/cockatrice/src/game/player/player_target.h b/cockatrice/src/game/player/player_target.h
index b60464e12..7c6f61020 100644
--- a/cockatrice/src/game/player/player_target.h
+++ b/cockatrice/src/game/player/player_target.h
@@ -1,16 +1,11 @@
-/**
- * @file player_target.h
- * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
- */
-
 #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 <QFont>
 #include <QPixmap>
 
 class Player;
diff --git a/cockatrice/src/game/replay.cpp b/cockatrice/src/game/replay.cpp
index 6886f817a..ca57af9bc 100644
--- a/cockatrice/src/game/replay.cpp
+++ b/cockatrice/src/game/replay.cpp
@@ -1,6 +1,6 @@
 #include "replay.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
+#include "../tabs/tab_game.h"
 
 Replay::Replay(TabGame *_tab, GameReplay *_replay) : AbstractGame(_tab)
 {
diff --git a/cockatrice/src/game/replay.h b/cockatrice/src/game/replay.h
index 301f47580..bfad6731b 100644
--- a/cockatrice/src/game/replay.h
+++ b/cockatrice/src/game/replay.h
@@ -1,10 +1,3 @@
-/**
- * @file replay.h
- * @ingroup GameLogic
- * @ingroup Replay
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_REPLAY_H
 #define COCKATRICE_REPLAY_H
 
diff --git a/cockatrice/src/game/z_value_layer_manager.h b/cockatrice/src/game/z_value_layer_manager.h
deleted file mode 100644
index 4eb864486..000000000
--- a/cockatrice/src/game/z_value_layer_manager.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * @file z_value_layer_manager.h
- * @ingroup GameGraphics
- * @brief Semantic Z-value layer management for game scene rendering.
- *
- * This file provides a structured approach to Z-value allocation in the game scene.
- * Z-values in Qt determine stacking order - higher values render on top of lower values.
- *
- * ## Layer Architecture
- *
- * The game scene is organized into three conceptual layers:
- *
- * 1. **Zone Layer (0-999)**: Zone backgrounds, containers, and static elements
- *    - Zone backgrounds (0.5-1.0)
- *    - Cards within zones (1.0 base + index)
- *
- * 2. **Card Layer (1-40,000,000)**: Dynamic card rendering on the table zone
- *    - Cards use formula: (actualY + CardDimensions::HEIGHT) * 100000 + (actualX + 1) * 100
- *    - Maximum card Z-value: ~40,000,000 (with 3 rows, actualY <= ~289)
- *
- * 3. **Overlay Layer (2,000,000,000+)**: UI elements that must appear above all cards
- *    - Hovered cards (+1)
- *    - Arrows (+3)
- *    - Zone views (+4)
- *    - Drag items (+5, +6)
- *    - Top UI elements (+7)
- *
- * ## Design Rationale
- *
- * The large gap between card Z-values (max ~40M) and overlay base (2B) provides
- * safety margin for future table zone expansions while ensuring overlays always
- * render above cards regardless of table position.
- *
- * ## Usage
- *
- * Prefer using the semantic constants from ZValues namespace:
- * @code
- * card->setZValue(ZValues::HOVERED_CARD);
- * arrow->setZValue(ZValues::ARROWS);
- * @endcode
- *
- * Use validation functions to verify card Z-values during development:
- * @code
- * Q_ASSERT(ZValueLayerManager::isValidCardZValue(cardZ));
- * @endcode
- */
-
-#ifndef Z_VALUE_LAYER_MANAGER_H
-#define Z_VALUE_LAYER_MANAGER_H
-
-#include <QtGlobal>
-
-/**
- * @namespace ZValueLayerManager
- * @brief Utilities for Z-value validation and layer management.
- */
-namespace ZValueLayerManager
-{
-
-/**
- * @enum Layer
- * @brief Semantic layer identifiers for Z-value allocation.
- *
- * These represent conceptual rendering layers, not actual Z-values.
- * Use the corresponding ZValues constants for actual rendering.
- */
-enum class Layer
-{
-    /// Zone-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
-};
-
-/**
- * @brief Maximum Z-value a card can have on the table zone.
- *
- * Based on table zone formula: (actualY + CardDimensions::HEIGHT) * 100000 + (actualX + 1) * 100
- * With maximum 3 rows and CardDimensions::HEIGHT = 102, actualY <= ~289.
- * Maximum: (289 + 102) * 100000 + 100 * 100 = 39,110,000
- *
- * We use 40,000,000 as a safe upper bound with margin.
- */
-constexpr qreal CARD_Z_VALUE_MAX = 40000000.0;
-
-/**
- * @brief Base Z-value for overlay elements.
- *
- * Must exceed CARD_Z_VALUE_MAX to ensure overlays render above all cards.
- * The 50x margin (2B vs 40M) provides safety for future expansion.
- */
-constexpr qreal OVERLAY_BASE = 2000000000.0;
-
-/**
- * @brief Validates that a Z-value is within the valid card range.
- *
- * Cards should have Z-values between CARD_BASE (1.0) and CARD_Z_VALUE_MAX.
- * Values outside this range may interfere with overlay rendering.
- *
- * @param zValue The Z-value to validate
- * @return true if the Z-value is valid for a card
- */
-[[nodiscard]] constexpr bool isValidCardZValue(qreal zValue)
-{
-    return zValue >= 1.0 && zValue <= CARD_Z_VALUE_MAX;
-}
-
-/**
- * @brief Validates that a Z-value is in the overlay layer.
- *
- * Overlay elements should have Z-values at or above OVERLAY_BASE.
- *
- * @param zValue The Z-value to validate
- * @return true if the Z-value is valid for an overlay element
- */
-[[nodiscard]] constexpr bool isOverlayZValue(qreal zValue)
-{
-    return zValue >= OVERLAY_BASE;
-}
-
-/**
- * @brief Returns the Z-value for a specific overlay element.
- *
- * @param offset Offset from OVERLAY_BASE (0-7 for current elements)
- * @return The absolute Z-value for the overlay element
- */
-[[nodiscard]] constexpr qreal overlayZValue(qreal offset)
-{
-    return OVERLAY_BASE + offset;
-}
-
-} // namespace ZValueLayerManager
-
-#endif // Z_VALUE_LAYER_MANAGER_H
diff --git a/cockatrice/src/game/z_values.h b/cockatrice/src/game/z_values.h
deleted file mode 100644
index c6e7f2c8a..000000000
--- a/cockatrice/src/game/z_values.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef Z_VALUES_H
-#define Z_VALUES_H
-
-#include "card_dimensions.h"
-#include "z_value_layer_manager.h"
-
-/**
- * @file z_values.h
- * @ingroup GameGraphics
- * @brief Centralized Z-value constants for rendering layer order.
- *
- * Z-values in Qt determine stacking order. Higher values render on top.
- * These constants define the visual layering hierarchy for the game scene.
- *
- * ## Layer Architecture
- *
- * See z_value_layer_manager.h for detailed documentation on the three-layer
- * architecture (Zone, Card, Overlay) and the rationale for Z-value choices.
- *
- * ## Quick Reference
- *
- * | Layer    | Z-Value Range    | Purpose                           |
- * |----------|------------------|-----------------------------------|
- * | Zone     | 0.5 - 1.0        | Zone backgrounds, containers      |
- * | Card     | 1.0 - 40,000,000 | Cards on table (position-based)   |
- * | Overlay  | 2,000,000,000+   | UI elements above all cards       |
- */
-
-namespace ZValues
-{
-
-// Expose base for callers that need it
-constexpr qreal OVERLAY_BASE = ZValueLayerManager::OVERLAY_BASE;
-
-// Overlay layer Z-values for items that should appear above normal cards
-constexpr qreal HOVERED_CARD = ZValueLayerManager::overlayZValue(1.0);
-constexpr qreal ARROWS = ZValueLayerManager::overlayZValue(3.0);
-constexpr qreal ZONE_VIEW_WIDGET = ZValueLayerManager::overlayZValue(4.0);
-constexpr qreal DRAG_ITEM = ZValueLayerManager::overlayZValue(5.0);
-constexpr qreal DRAG_ITEM_CHILD = ZValueLayerManager::overlayZValue(6.0);
-constexpr qreal TOP_UI = ZValueLayerManager::overlayZValue(7.0);
-
-/**
- * @brief Compute Z-value for child drag items based on hotspot position.
- *
- * When dragging multiple cards together, each child card needs a unique Z-value
- * to prevent Z-fighting (flickering/flashing). The Z-values are derived from
- * their position when grabbed to conserve original stacking. The formula encodes
- * 2D coordinates into a single value where X has higher weight, ensuring
- * deterministic visual stacking.
- *
- * @param hotSpotX The X coordinate of the grab position
- * @param hotSpotY The Y coordinate of the grab position
- * @return Unique Z-value for the child drag item
- */
-[[nodiscard]] constexpr qreal childDragZValue(qreal hotSpotX, qreal hotSpotY)
-{
-    return DRAG_ITEM_CHILD + hotSpotX * 1000000 + hotSpotY * 1000 + 1000;
-}
-
-/**
- * @brief Compute Z-value for cards on the table zone based on position.
- *
- * Cards lower on the table (higher Y) render above cards higher up,
- * and cards to the right (higher X) render above cards to the left.
- * This creates natural visual stacking for overlapping cards.
- *
- * @param x The X coordinate of the card position
- * @param y The Y coordinate of the card position
- * @return Z-value for the card's table position
- */
-[[nodiscard]] constexpr qreal tableCardZValue(qreal x, qreal y)
-{
-    return (y + CardDimensions::HEIGHT_F) * 100000.0 + (x + 1) * 100.0;
-}
-
-// Card layering (general architecture, not command-zone specific)
-constexpr qreal CARD_BASE = 1.0;
-constexpr qreal CARD_MAX = ZValueLayerManager::CARD_Z_VALUE_MAX;
-
-} // namespace ZValues
-
-#endif // Z_VALUES_H
diff --git a/cockatrice/src/game/zones/card_zone.h b/cockatrice/src/game/zones/card_zone.h
index 6fe8157e4..1034c4668 100644
--- a/cockatrice/src/game/zones/card_zone.h
+++ b/cockatrice/src/game/zones/card_zone.h
@@ -1,14 +1,8 @@
-/**
- * @file card_zone.h
- * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
- */
-
 #ifndef CARDZONE_H
 #define CARDZONE_H
 
-#include "../../game_graphics/board/abstract_graphics_item.h"
-#include "../../game_graphics/board/graphics_item_type.h"
+#include "../board/abstract_graphics_item.h"
+#include "../board/graphics_item_type.h"
 #include "logic/card_zone_logic.h"
 
 #include <QLoggingCategory>
diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp
index 7badfcca4..19ea272b2 100644
--- a/cockatrice/src/game/zones/hand_zone.cpp
+++ b/cockatrice/src/game/zones/hand_zone.cpp
@@ -1,14 +1,13 @@
 #include "hand_zone.h"
 
-#include "../../client/settings/cache_settings.h"
 #include "../../interface/theme_manager.h"
+#include "../../settings/cache_settings.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
+#include "pb/command_move_card.pb.h"
 
 #include <QPainter>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
 
 HandZone::HandZone(HandZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
     : SelectZone(_logic, parent), zoneHeight(_zoneHeight)
@@ -56,7 +55,7 @@ void HandZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
 QRectF HandZone::boundingRect() const
 {
     if (SettingsCache::instance().getHorizontalHand())
-        return QRectF(0, 0, width, CardDimensions::HEIGHT_F + 10);
+        return QRectF(0, 0, width, CARD_HEIGHT + 10);
     else
         return QRectF(0, 0, 100, zoneHeight);
 }
@@ -112,13 +111,12 @@ void HandZone::reorganizeCards()
     update();
 }
 
-void HandZone::sortHand(const QList<CardList::SortOption> &options)
+void HandZone::sortHand()
 {
     if (getLogic()->getCards().isEmpty()) {
         return;
     }
-
-    getLogic()->sortCards(options);
+    getLogic()->sortCards({CardList::SortByMainType, CardList::SortByManaValue, CardList::SortByColorGrouping});
     reorganizeCards();
 }
 
diff --git a/cockatrice/src/game/zones/hand_zone.h b/cockatrice/src/game/zones/hand_zone.h
index 25f4148bd..a5e06819e 100644
--- a/cockatrice/src/game/zones/hand_zone.h
+++ b/cockatrice/src/game/zones/hand_zone.h
@@ -1,9 +1,3 @@
-/**
- * @file hand_zone.h
- * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
- */
-
 #ifndef HANDZONE_H
 #define HANDZONE_H
 
@@ -27,7 +21,7 @@ public:
     QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     void reorganizeCards() override;
-    void sortHand(const QList<CardList::SortOption> &options);
+    void sortHand();
     void setWidth(qreal _width);
 };
 
diff --git a/cockatrice/src/game/zones/logic/card_zone_algorithms.h b/cockatrice/src/game/zones/logic/card_zone_algorithms.h
deleted file mode 100644
index 118a7d29d..000000000
--- a/cockatrice/src/game/zones/logic/card_zone_algorithms.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef COCKATRICE_CARD_ZONE_ALGORITHMS_H
-#define COCKATRICE_CARD_ZONE_ALGORITHMS_H
-
-namespace CardZoneAlgorithms
-{
-
-/**
- * Shared insertion logic for zones where cards become visible on add and follow
- * the standard pattern: clamp index, insert, clear identity if contents unknown,
- * reset state, show card.
- *
- * Zones with different post-add behavior (signal connections, positional resets,
- * hidden cards, or coordinate-based placement) should NOT use this — implement
- * addCardImpl directly instead.
- *
- * Template parameters allow testing with lightweight mocks that avoid Qt graphics
- * dependencies.
- *
- * @tparam CardList Must provide: size() -> int, insert(int, CardType*),
- *                  getContentsKnown() -> bool
- * @tparam CardType Must provide: setId(int), setCardRef(CardRefType),
- *                  resetState(bool), setVisible(bool)
- * @param keepAnnotations Forwarded to card->resetState(). Stack-like zones preserve
- *                        annotations across zone transitions; hand-like zones clear them.
- */
-template <typename CardList, typename CardType>
-void addCardToList(CardList &cards, CardType *card, int x, bool keepAnnotations)
-{
-    if (x < 0 || x >= cards.size()) {
-        x = static_cast<int>(cards.size());
-    }
-    cards.insert(x, card);
-
-    if (!cards.getContentsKnown()) {
-        card->setId(-1);
-        card->setCardRef({});
-    }
-
-    card->resetState(keepAnnotations);
-    card->setVisible(true);
-}
-
-} // namespace CardZoneAlgorithms
-
-#endif // COCKATRICE_CARD_ZONE_ALGORITHMS_H
diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.cpp b/cockatrice/src/game/zones/logic/card_zone_logic.cpp
index e917e4ad7..70cb21b8e 100644
--- a/cockatrice/src/game/zones/logic/card_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/card_zone_logic.cpp
@@ -1,16 +1,16 @@
 #include "card_zone_logic.h"
 
+#include "../../../database/card_database_manager.h"
 #include "../../board/card_item.h"
 #include "../../player/player.h"
-#include "../../player/player_actions.h"
+#include "../pile_zone.h"
 #include "../view_zone.h"
+#include "pb/command_move_card.pb.h"
+#include "pb/serverinfo_user.pb.h"
 #include "view_zone_logic.h"
 
 #include <QAction>
 #include <QDebug>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
-#include <libcockatrice/utility/zone_names.h>
 
 /**
  * @param _player the player that the zone belongs to
@@ -44,10 +44,8 @@ void CardZoneLogic::addCard(CardItem *card, const bool reorganize, const int x,
 
     for (auto *view : views) {
         if (qobject_cast<ZoneViewZoneLogic *>(view->getLogic())->prepareAddCard(x)) {
-            auto copy = new CardItem(player, nullptr, card->getCardRef(), card->getId());
-            copy->setFaceDown(card->getFaceDown());
-
-            view->getLogic()->addCard(copy, reorganize, x, y);
+            view->getLogic()->addCard(new CardItem(player, nullptr, card->getCardRef(), card->getId()), reorganize, x,
+                                      y);
         }
     }
 
@@ -150,24 +148,17 @@ void CardZoneLogic::moveAllToZone()
 
 void CardZoneLogic::clearContents()
 {
-    // First gather the cards into a safe temporary list.
-    const CardList toClear = cards;
-
-    // Detach and notify attached cards and zones *before* deleting anything.
-    for (CardItem *card : toClear) {
+    for (int i = 0; i < cards.size(); i++) {
         // If an incorrectly implemented server doesn't return attached cards to whom they belong before dropping a
         // player, we have to return them to avoid a crash.
-        const QList<CardItem *> &attachedCards = card->getAttachedCards();
-        for (CardItem *attachedCard : attachedCards) {
+
+        const QList<CardItem *> &attachedCards = cards[i]->getAttachedCards();
+        for (auto attachedCard : attachedCards) {
             emit attachedCard->getZone()->cardAdded(attachedCard);
         }
-    }
 
-    // Now request deletions after all manipulations are done.
-    for (CardItem *card : toClear) {
-        player->deleteCard(card);
+        player->deleteCard(cards.at(i));
     }
-
     cards.clear();
     emit cardCountChanged();
 }
@@ -175,9 +166,9 @@ void CardZoneLogic::clearContents()
 QString CardZoneLogic::getTranslatedName(bool theirOwn, GrammaticalCase gc) const
 {
     QString ownerName = player->getPlayerInfo()->getName();
-    if (name == ZoneNames::HAND)
+    if (name == "hand")
         return (theirOwn ? tr("their hand", "nominative") : tr("%1's hand", "nominative").arg(ownerName));
-    else if (name == ZoneNames::DECK)
+    else if (name == "deck")
         switch (gc) {
             case CaseLookAtZone:
                 return (theirOwn ? tr("their library", "look at zone")
@@ -193,11 +184,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 == "grave")
         return (theirOwn ? tr("their graveyard", "nominative") : tr("%1's graveyard", "nominative").arg(ownerName));
-    else if (name == ZoneNames::EXILE)
+    else if (name == "rfg")
         return (theirOwn ? tr("their exile", "nominative") : tr("%1's exile", "nominative").arg(ownerName));
-    else if (name == ZoneNames::SIDEBOARD)
+    else if (name == "sb")
         switch (gc) {
             case CaseLookAtZone:
                 return (theirOwn ? tr("their sideboard", "look at zone")
diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.h b/cockatrice/src/game/zones/logic/card_zone_logic.h
index 1aa46effd..166f63506 100644
--- a/cockatrice/src/game/zones/logic/card_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/card_zone_logic.h
@@ -1,9 +1,3 @@
-/**
- * @file card_zone_logic.h
- * @ingroup GameLogicZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_CARD_ZONE_LOGIC_H
 #define COCKATRICE_CARD_ZONE_LOGIC_H
 
@@ -52,7 +46,7 @@ public:
     void rawInsertCard(CardItem *card, int index)
     {
         cards.insert(index, card);
-    }
+    };
 
     [[nodiscard]] const CardList &getCards() const
     {
@@ -63,16 +57,16 @@ public:
     {
         cards.sortBy(options);
     }
-    [[nodiscard]] QString getName() const
+    QString getName() const
     {
         return name;
     }
-    [[nodiscard]] QString getTranslatedName(bool theirOwn, GrammaticalCase gc) const;
-    [[nodiscard]] Player *getPlayer() const
+    QString getTranslatedName(bool theirOwn, GrammaticalCase gc) const;
+    Player *getPlayer() const
     {
         return player;
     }
-    [[nodiscard]] bool contentsKnown() const
+    bool contentsKnown() const
     {
         return cards.getContentsKnown();
     }
@@ -84,15 +78,15 @@ public:
     {
         alwaysRevealTopCard = _alwaysRevealTopCard;
     }
-    [[nodiscard]] bool getAlwaysRevealTopCard() const
+    bool getAlwaysRevealTopCard() const
     {
         return alwaysRevealTopCard;
     }
-    [[nodiscard]] bool getHasCardAttr() const
+    bool getHasCardAttr() const
     {
         return hasCardAttr;
     }
-    [[nodiscard]] bool getIsShufflable() const
+    bool getIsShufflable() const
     {
         return isShufflable;
     }
diff --git a/cockatrice/src/game/zones/logic/hand_zone_logic.cpp b/cockatrice/src/game/zones/logic/hand_zone_logic.cpp
index efa85d649..292b9f7e3 100644
--- a/cockatrice/src/game/zones/logic/hand_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/hand_zone_logic.cpp
@@ -1,7 +1,6 @@
 #include "hand_zone_logic.h"
 
 #include "../../board/card_item.h"
-#include "card_zone_algorithms.h"
 
 HandZoneLogic::HandZoneLogic(Player *_player,
                              const QString &_name,
@@ -15,5 +14,16 @@ HandZoneLogic::HandZoneLogic(Player *_player,
 
 void HandZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/)
 {
-    CardZoneAlgorithms::addCardToList(cards, card, x, false);
-}
+    // if x is negative set it to add at end
+    if (x < 0 || x >= cards.size()) {
+        x = cards.size();
+    }
+    cards.insert(x, card);
+
+    if (!cards.getContentsKnown()) {
+        card->setId(-1);
+        card->setCardRef({});
+    }
+    card->resetState();
+    card->setVisible(true);
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/zones/logic/hand_zone_logic.h b/cockatrice/src/game/zones/logic/hand_zone_logic.h
index 8f34cc851..aebe6e03f 100644
--- a/cockatrice/src/game/zones/logic/hand_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/hand_zone_logic.h
@@ -1,9 +1,3 @@
-/**
- * @file hand_zone_logic.h
- * @ingroup GameLogicZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_HAND_ZONE_LOGIC_H
 #define COCKATRICE_HAND_ZONE_LOGIC_H
 #include "card_zone_logic.h"
diff --git a/cockatrice/src/game/zones/logic/pile_zone_logic.h b/cockatrice/src/game/zones/logic/pile_zone_logic.h
index 498d0d4a2..104ce42b5 100644
--- a/cockatrice/src/game/zones/logic/pile_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/pile_zone_logic.h
@@ -1,9 +1,3 @@
-/**
- * @file pile_zone_logic.h
- * @ingroup GameLogicZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_PILE_ZONE_LOGIC_H
 #define COCKATRICE_PILE_ZONE_LOGIC_H
 #include "card_zone_logic.h"
diff --git a/cockatrice/src/game/zones/logic/stack_zone_logic.cpp b/cockatrice/src/game/zones/logic/stack_zone_logic.cpp
index 6f3cb6e99..a477a8025 100644
--- a/cockatrice/src/game/zones/logic/stack_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/stack_zone_logic.cpp
@@ -1,7 +1,6 @@
 #include "stack_zone_logic.h"
 
 #include "../../board/card_item.h"
-#include "card_zone_algorithms.h"
 
 StackZoneLogic::StackZoneLogic(Player *_player,
                                const QString &_name,
@@ -15,5 +14,16 @@ StackZoneLogic::StackZoneLogic(Player *_player,
 
 void StackZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/)
 {
-    CardZoneAlgorithms::addCardToList(cards, card, x, true);
-}
+    // if x is negative set it to add at end
+    if (x < 0 || x >= cards.size()) {
+        x = static_cast<int>(cards.size());
+    }
+    cards.insert(x, card);
+
+    if (!cards.getContentsKnown()) {
+        card->setId(-1);
+        card->setCardRef({});
+    }
+    card->resetState(true);
+    card->setVisible(true);
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/zones/logic/stack_zone_logic.h b/cockatrice/src/game/zones/logic/stack_zone_logic.h
index 81b9d6969..709d0c87a 100644
--- a/cockatrice/src/game/zones/logic/stack_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/stack_zone_logic.h
@@ -1,9 +1,3 @@
-/**
- * @file stack_zone_logic.h
- * @ingroup GameLogicZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_STACK_ZONE_LOGIC_H
 #define COCKATRICE_STACK_ZONE_LOGIC_H
 #include "card_zone_logic.h"
diff --git a/cockatrice/src/game/zones/logic/table_zone_logic.cpp b/cockatrice/src/game/zones/logic/table_zone_logic.cpp
index 42caf2ec8..39e24b5cd 100644
--- a/cockatrice/src/game/zones/logic/table_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/table_zone_logic.cpp
@@ -18,7 +18,7 @@ void TableZoneLogic::addCardImpl(CardItem *card, int _x, int _y)
     if (!card->getFaceDown() && card->getPT().isEmpty()) {
         card->setPT(card->getCardInfo().getPowTough());
     }
-    if (card->getCardInfo().getUiAttributes().cipt && card->getCardInfo().getUiAttributes().landscapeOrientation) {
+    if (card->getCardInfo().getCipt() && card->getCardInfo().getLandscapeOrientation()) {
         card->setDoesntUntap(true);
     }
     card->setGridPoint(QPoint(_x, _y));
diff --git a/cockatrice/src/game/zones/logic/table_zone_logic.h b/cockatrice/src/game/zones/logic/table_zone_logic.h
index e173bc637..a3ce3480b 100644
--- a/cockatrice/src/game/zones/logic/table_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/table_zone_logic.h
@@ -1,9 +1,3 @@
-/**
- * @file table_zone_logic.h
- * @ingroup GameLogicZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_TABLE_ZONE_LOGIC_H
 #define COCKATRICE_TABLE_ZONE_LOGIC_H
 #include "card_zone_logic.h"
diff --git a/cockatrice/src/game/zones/logic/view_zone_logic.cpp b/cockatrice/src/game/zones/logic/view_zone_logic.cpp
index 5a4db3163..6050cbadf 100644
--- a/cockatrice/src/game/zones/logic/view_zone_logic.cpp
+++ b/cockatrice/src/game/zones/logic/view_zone_logic.cpp
@@ -1,6 +1,6 @@
 #include "view_zone_logic.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../settings/cache_settings.h"
 #include "../../board/card_item.h"
 
 /**
diff --git a/cockatrice/src/game/zones/logic/view_zone_logic.h b/cockatrice/src/game/zones/logic/view_zone_logic.h
index 6bd5ecc8d..f5139dfaf 100644
--- a/cockatrice/src/game/zones/logic/view_zone_logic.h
+++ b/cockatrice/src/game/zones/logic/view_zone_logic.h
@@ -1,9 +1,3 @@
-/**
- * @file view_zone_logic.h
- * @ingroup GameLogicZones
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_VIEW_ZONE_LOGIC_H
 #define COCKATRICE_VIEW_ZONE_LOGIC_H
 #include "card_zone_logic.h"
diff --git a/cockatrice/src/game/zones/pile_zone.cpp b/cockatrice/src/game/zones/pile_zone.cpp
index d85b5f4e2..5df91a64d 100644
--- a/cockatrice/src/game/zones/pile_zone.cpp
+++ b/cockatrice/src/game/zones/pile_zone.cpp
@@ -3,14 +3,13 @@
 #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 "pb/command_move_card.pb.h"
 #include "view_zone.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
 
 PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent)
 {
@@ -19,9 +18,9 @@ PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_log
     setCursor(Qt::OpenHandCursor);
 
     setTransform(QTransform()
-                     .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
+                     .translate((float)CARD_WIDTH / 2, (float)CARD_HEIGHT / 2)
                      .rotate(90)
-                     .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
+                     .translate((float)-CARD_WIDTH / 2, (float)-CARD_HEIGHT / 2));
 
     connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
         Q_UNUSED(_roundCardCorners);
@@ -33,13 +32,13 @@ PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_log
 
 QRectF PileZone::boundingRect() const
 {
-    return QRectF(0, 0, CardDimensions::WIDTH_F, CardDimensions::HEIGHT_F);
+    return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);
 }
 
 QPainterPath PileZone::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
+    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0;
     shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
     return shape;
 }
@@ -52,9 +51,9 @@ void PileZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*optio
         getLogic()->getCards().at(0)->paintPicture(painter, getLogic()->getCards().at(0)->getTranslatedSize(painter),
                                                    90);
 
-    painter->translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F);
+    painter->translate((float)CARD_WIDTH / 2, (float)CARD_HEIGHT / 2);
     painter->rotate(-90);
-    painter->translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F);
+    painter->translate((float)-CARD_WIDTH / 2, (float)-CARD_HEIGHT / 2);
     paintNumberEllipse(getLogic()->getCards().size(), 28, Qt::white, -1, -1, painter);
 }
 
@@ -68,13 +67,8 @@ void PileZone::handleDropEvent(const QList<CardDragItem *> &dragItems, CardZoneL
     cmd.set_x(0);
     cmd.set_y(0);
 
-    for (int i = 0; i < dragItems.size(); ++i) {
-        auto cardToMove = cmd.mutable_cards_to_move()->add_card();
-        cardToMove->set_card_id(dragItems[i]->getId());
-        if (dragItems[i]->isForceFaceDown()) {
-            cardToMove->set_face_down(true);
-        }
-    }
+    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);
 }
@@ -106,12 +100,12 @@ void PileZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     if (getLogic()->getCards().isEmpty())
         return;
 
-    bool forceFaceDown = event->modifiers().testFlag(Qt::ShiftModifier);
+    bool faceDown = event->modifiers().testFlag(Qt::ShiftModifier);
     bool bottomCard = event->modifiers().testFlag(Qt::ControlModifier);
     CardItem *card = bottomCard ? getLogic()->getCards().last() : getLogic()->getCards().first();
     const int cardid =
         getLogic()->contentsKnown() ? card->getId() : (bottomCard ? getLogic()->getCards().size() - 1 : 0);
-    CardDragItem *drag = card->createDragItem(cardid, event->pos(), event->scenePos(), forceFaceDown);
+    CardDragItem *drag = card->createDragItem(cardid, event->pos(), event->scenePos(), faceDown);
     drag->grabMouse();
     setCursor(Qt::OpenHandCursor);
 }
diff --git a/cockatrice/src/game/zones/pile_zone.h b/cockatrice/src/game/zones/pile_zone.h
index 5bfc50880..9ea05fa5d 100644
--- a/cockatrice/src/game/zones/pile_zone.h
+++ b/cockatrice/src/game/zones/pile_zone.h
@@ -1,9 +1,3 @@
-/**
- * @file pile_zone.h
- * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
- */
-
 #ifndef PILEZONE_H
 #define PILEZONE_H
 
diff --git a/cockatrice/src/game/zones/select_zone.cpp b/cockatrice/src/game/zones/select_zone.cpp
index 9bf5f9faf..863edab48 100644
--- a/cockatrice/src/game/zones/select_zone.cpp
+++ b/cockatrice/src/game/zones/select_zone.cpp
@@ -1,6 +1,6 @@
 #include "select_zone.h"
 
-#include "../../client/settings/cache_settings.h"
+#include "../../settings/cache_settings.h"
 #include "../board/card_item.h"
 #include "../game_scene.h"
 
@@ -68,8 +68,7 @@ void SelectZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
             }
         }
         static_cast<GameScene *>(scene())->resizeRubberBand(
-            deviceTransform(static_cast<GameScene *>(scene())->getViewportTransform()).map(pos),
-            cardsInSelectionRect.size());
+            deviceTransform(static_cast<GameScene *>(scene())->getViewportTransform()).map(pos));
         event->accept();
     }
 }
diff --git a/cockatrice/src/game/zones/select_zone.h b/cockatrice/src/game/zones/select_zone.h
index d6fd3e10e..eabd8b370 100644
--- a/cockatrice/src/game/zones/select_zone.h
+++ b/cockatrice/src/game/zones/select_zone.h
@@ -1,9 +1,3 @@
-/**
- * @file select_zone.h
- * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
- */
-
 #ifndef SELECTZONE_H
 #define SELECTZONE_H
 
diff --git a/cockatrice/src/game/zones/stack_zone.cpp b/cockatrice/src/game/zones/stack_zone.cpp
index a9d649a4a..0eedd5500 100644
--- a/cockatrice/src/game/zones/stack_zone.cpp
+++ b/cockatrice/src/game/zones/stack_zone.cpp
@@ -1,16 +1,16 @@
 #include "stack_zone.h"
 
-#include "../../client/settings/cache_settings.h"
 #include "../../interface/theme_manager.h"
+#include "../../settings/cache_settings.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 "pb/command_move_card.pb.h"
 
 #include <QPainter>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <QSet>
 
 StackZone::StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
     : SelectZone(_logic, parent), zoneHeight(_zoneHeight)
@@ -78,11 +78,7 @@ void StackZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
 
     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);
-            }
+            cmd.mutable_cards_to_move()->add_card()->set_card_id(item->getId());
         }
     }
 
diff --git a/cockatrice/src/game/zones/stack_zone.h b/cockatrice/src/game/zones/stack_zone.h
index 7c98f5128..16dab22bb 100644
--- a/cockatrice/src/game/zones/stack_zone.h
+++ b/cockatrice/src/game/zones/stack_zone.h
@@ -1,9 +1,3 @@
-/**
- * @file stack_zone.h
- * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
- */
-
 #ifndef STACKZONE_H
 #define STACKZONE_H
 
diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp
index 2a382fafe..4573cc5c3 100644
--- a/cockatrice/src/game/zones/table_zone.cpp
+++ b/cockatrice/src/game/zones/table_zone.cpp
@@ -1,21 +1,19 @@
 #include "table_zone.h"
 
-#include "../../client/settings/cache_settings.h"
+#include "../../card/card_info.h"
 #include "../../interface/theme_manager.h"
+#include "../../settings/cache_settings.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 "pb/command_move_card.pb.h"
+#include "pb/command_set_card_attr.pb.h"
 
 #include <QGraphicsScene>
 #include <QPainter>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
-#include <libcockatrice/utility/zone_names.h>
+#include <QSet>
 
 const QColor TableZone::BACKGROUND_COLOR = QColor(100, 100, 100);
 const QColor TableZone::FADE_MASK = QColor(0, 0, 0, 80);
@@ -32,7 +30,7 @@ TableZone::TableZone(TableZoneLogic *_logic, QGraphicsItem *parent) : SelectZone
 
     updateBg();
 
-    height = MARGIN_TOP + MARGIN_BOTTOM + TABLEROWS * CardDimensions::HEIGHT + (TABLEROWS - 1) * PADDING_Y;
+    height = MARGIN_TOP + MARGIN_BOTTOM + TABLEROWS * CARD_HEIGHT + (TABLEROWS - 1) * PADDING_Y;
     width = MIN_WIDTH;
     currentMinimumWidth = width;
 
@@ -107,7 +105,7 @@ 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;
+    qreal separatorY = MARGIN_TOP + 2 * (CARD_HEIGHT + PADDING_Y) - STACKED_CARD_OFFSET_Y / 2;
     if (isInverted())
         separatorY = height - separatorY;
     painter->setPen(QColor(255, 255, 255, 40));
@@ -136,10 +134,8 @@ void TableZone::handleDropEventByGrid(const QList<CardDragItem *> &dragItems,
     for (const auto &item : dragItems) {
         CardToMove *ctm = cmd.mutable_cards_to_move()->add_card();
         ctm->set_card_id(item->getId());
-        if (item->isForceFaceDown()) {
-            ctm->set_face_down(true);
-        }
-        if (startZone->getName() != getLogic()->getName() && !item->isForceFaceDown()) {
+        ctm->set_face_down(item->getFaceDown());
+        if (startZone->getName() != getLogic()->getName() && !item->getFaceDown()) {
             const auto &card = item->getItem()->getCard();
             if (card) {
                 ctm->set_pt(card.getInfo().getPowTough().toStdString());
@@ -171,7 +167,7 @@ void TableZone::reorganizeCards()
             actualY += 15;
 
         getLogic()->getCards()[i]->setPos(actualX, actualY);
-        getLogic()->getCards()[i]->setRealZValue(ZValues::tableCardZValue(actualX, actualY));
+        getLogic()->getCards()[i]->setRealZValue((actualY + CARD_HEIGHT) * 100000 + (actualX + 1) * 100);
 
         QListIterator<CardItem *> attachedCardIterator(getLogic()->getCards()[i]->getAttachedCards());
         int j = 0;
@@ -181,7 +177,7 @@ void TableZone::reorganizeCards()
             qreal childX = actualX - j * STACKED_CARD_OFFSET_X;
             qreal childY = y + 5;
             attachedCard->setPos(childX, childY);
-            attachedCard->setRealZValue(ZValues::tableCardZValue(childX, childY));
+            attachedCard->setRealZValue((childY + CARD_HEIGHT) * 100000 + (childX + 1) * 100);
         }
     }
 
@@ -196,7 +192,7 @@ void TableZone::toggleTapped()
 
     auto isCardOnTable = [](const QGraphicsItem *item) {
         if (auto card = qgraphicsitem_cast<const CardItem *>(item)) {
-            return card->getZone()->getName() == ZoneNames::TABLE;
+            return card->getZone()->getName() == "table";
         }
         return false;
     };
@@ -233,7 +229,7 @@ void TableZone::resizeToContents()
 
     // 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;
+    currentMinimumWidth = xMax + (2 * CARD_WIDTH) + PADDING_X + MARGIN_RIGHT;
 
     if (currentMinimumWidth < MIN_WIDTH)
         currentMinimumWidth = MIN_WIDTH;
@@ -283,10 +279,10 @@ void TableZone::computeCardStackWidths()
         const int key = getCardStackMapKey(gridPoint.x() / 3, gridPoint.y());
         const int stackCount = cardStackCount.value(key, 0);
         if (stackCount == 1)
-            cardStackWidth.insert(key, CardDimensions::WIDTH + getLogic()->getCards()[i]->getAttachedCards().size() *
-                                                                   STACKED_CARD_OFFSET_X);
+            cardStackWidth.insert(key, CARD_WIDTH + getLogic()->getCards()[i]->getAttachedCards().size() *
+                                                        STACKED_CARD_OFFSET_X);
         else
-            cardStackWidth.insert(key, CardDimensions::WIDTH + (stackCount - 1) * STACKED_CARD_OFFSET_X);
+            cardStackWidth.insert(key, CARD_WIDTH + (stackCount - 1) * STACKED_CARD_OFFSET_X);
     }
 }
 
@@ -300,7 +296,7 @@ QPointF TableZone::mapFromGrid(QPoint gridPoint) const
     // Add in width of card stack plus padding for each column
     for (int i = 0; i < gridPoint.x() / 3; ++i) {
         const int key = getCardStackMapKey(i, gridPoint.y());
-        x += cardStackWidth.value(key, CardDimensions::WIDTH) + PADDING_X;
+        x += cardStackWidth.value(key, CARD_WIDTH) + PADDING_X;
     }
 
     if (isInverted())
@@ -311,7 +307,7 @@ QPointF TableZone::mapFromGrid(QPoint gridPoint) const
 
     // Add in card size and padding for each row
     for (int i = 0; i < gridPoint.y(); ++i)
-        y += CardDimensions::HEIGHT + PADDING_Y;
+        y += CARD_HEIGHT + PADDING_Y;
 
     return QPointF(x, y);
 }
@@ -325,7 +321,7 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const
     int y = mapPoint.y() - MARGIN_TOP;
 
     // Below calculation effectively rounds to the nearest grid point.
-    const int gridPointHeight = CardDimensions::HEIGHT + PADDING_Y;
+    const int gridPointHeight = CARD_HEIGHT + PADDING_Y;
     int gridPointY = (y + PADDING_Y / 2) / gridPointHeight;
 
     gridPointY = clampValidTableRow(gridPointY);
@@ -341,7 +337,7 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const
 
     // Maximum value is a card width from the right margin, referenced to the
     // grid area.
-    const int xMax = width - MARGIN_LEFT - MARGIN_RIGHT - CardDimensions::WIDTH;
+    const int xMax = width - MARGIN_LEFT - MARGIN_RIGHT - CARD_WIDTH;
 
     int xStack = 0;
     int xNextStack = 0;
@@ -349,7 +345,7 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const
     while ((xNextStack <= x) && (xNextStack <= xMax)) {
         xStack = xNextStack;
         const int key = getCardStackMapKey(nextStackCol, gridPointY);
-        xNextStack += cardStackWidth.value(key, CardDimensions::WIDTH) + PADDING_X;
+        xNextStack += cardStackWidth.value(key, CARD_WIDTH) + PADDING_X;
         nextStackCol++;
     }
     int stackCol = qMax(nextStackCol - 1, 0);
@@ -382,11 +378,3 @@ int TableZone::clampValidTableRow(const int row)
         return TABLEROWS - 1;
     return row;
 }
-
-int TableZone::tableRowToGridY(int tableRow)
-{
-    if (tableRow > 2) {
-        tableRow = 1;
-    }
-    return clampValidTableRow(2 - tableRow);
-}
diff --git a/cockatrice/src/game/zones/table_zone.h b/cockatrice/src/game/zones/table_zone.h
index 7a53a9eb4..155ac7ab3 100644
--- a/cockatrice/src/game/zones/table_zone.h
+++ b/cockatrice/src/game/zones/table_zone.h
@@ -1,9 +1,3 @@
-/**
- * @file table_zone.h
- * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
- */
-
 #ifndef TABLEZONE_H
 #define TABLEZONE_H
 
@@ -41,12 +35,12 @@ private:
     /*
     Minimum width of the table zone including margins.
     */
-    static const int MIN_WIDTH = MARGIN_LEFT + (5 * CardDimensions::WIDTH) + MARGIN_RIGHT;
+    static const int MIN_WIDTH = MARGIN_LEFT + (5 * CARD_WIDTH) + MARGIN_RIGHT;
 
     /*
     Offset sizes when cards are stacked on each other in the grid
     */
-    static const int STACKED_CARD_OFFSET_X = CardDimensions::WIDTH / 3;
+    static const int STACKED_CARD_OFFSET_X = CARD_WIDTH / 3;
     static const int STACKED_CARD_OFFSET_Y = PADDING_Y / 3;
 
     /*
@@ -84,7 +78,7 @@ private:
      */
     bool active = false;
 
-    [[nodiscard]] bool isInverted() const;
+    bool isInverted() const;
 
 private slots:
     /**
@@ -110,7 +104,7 @@ public:
     /**
        @return a QRectF of the TableZone bounding box.
      */
-    [[nodiscard]] QRectF boundingRect() const override;
+    QRectF boundingRect() const override;
 
     /**
        Render the TableZone
@@ -140,31 +134,24 @@ public:
     /**
        @return CardItem from grid location
      */
-    [[nodiscard]] CardItem *getCardFromGrid(const QPoint &gridPoint) const;
+    CardItem *getCardFromGrid(const QPoint &gridPoint) const;
 
     /**
        @return CardItem from coordinate location
      */
-    [[nodiscard]] CardItem *getCardFromCoords(const QPointF &point) const;
+    CardItem *getCardFromCoords(const QPointF &point) const;
 
     QPointF closestGridPoint(const QPointF &point) override;
 
     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.
      */
     void resizeToContents();
 
-    [[nodiscard]] int getMinimumWidth() const
+    int getMinimumWidth() const
     {
         return currentMinimumWidth;
     }
@@ -173,7 +160,7 @@ public:
         prepareGeometryChange();
         width = _width;
     }
-    [[nodiscard]] qreal getWidth() const
+    qreal getWidth() const
     {
         return width;
     }
@@ -195,13 +182,13 @@ private:
     /*
     Mapping functions for points to/from gridpoints.
     */
-    [[nodiscard]] QPointF mapFromGrid(QPoint gridPoint) const;
-    [[nodiscard]] QPoint mapToGrid(const QPointF &mapPoint) const;
+    QPointF mapFromGrid(QPoint gridPoint) const;
+    QPoint mapToGrid(const QPointF &mapPoint) const;
 
     /*
     Helper function to create a single key from a card stack location.
     */
-    [[nodiscard]] int getCardStackMapKey(int x, int y) const
+    int getCardStackMapKey(int x, int y) const
     {
         return x + (y * 1000);
     }
diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp
index d2fd1e971..1eb99f5c1 100644
--- a/cockatrice/src/game/zones/view_zone.cpp
+++ b/cockatrice/src/game/zones/view_zone.cpp
@@ -1,21 +1,21 @@
 #include "view_zone.h"
 
+#include "../../card/card_info.h"
+#include "../../server/pending_command.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 "pb/command_dump_zone.pb.h"
+#include "pb/command_move_card.pb.h"
+#include "pb/response_dump_zone.pb.h"
+#include "pb/serverinfo_card.pb.h"
 
 #include <QBrush>
 #include <QDebug>
 #include <QGraphicsSceneWheelEvent>
 #include <QPainter>
 #include <QtMath>
-#include <libcockatrice/protocol/pb/command_dump_zone.pb.h>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
-#include <libcockatrice/protocol/pb/response_dump_zone.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
 
 /**
  * @param parent the parent QGraphicsWidget containing the reveal zone
@@ -73,10 +73,7 @@ void ZoneViewZone::initializeCards(const QList<const ServerInfo_Card *> &cardLis
         for (int i = 0; i < cardList.size(); ++i) {
             auto card = cardList[i];
             CardRef cardRef = {QString::fromStdString(card->name()), QString::fromStdString(card->provider_id())};
-            auto copy = new CardItem(getLogic()->getPlayer(), this, cardRef, card->id());
-            copy->setFaceDown(card->face_down());
-
-            getLogic()->addCard(copy, false, i);
+            getLogic()->addCard(new CardItem(getLogic()->getPlayer(), this, cardRef, card->id()), false, i);
         }
         reorganizeCards();
     } else if (!qobject_cast<ZoneViewZoneLogic *>(getLogic())->getOriginalZone()->contentsKnown()) {
@@ -94,10 +91,8 @@ void ZoneViewZone::initializeCards(const QList<const ServerInfo_Card *> &cardLis
         int number = numberCards == -1 ? c.size() : (numberCards < c.size() ? numberCards : c.size());
         for (int i = 0; i < number; i++) {
             CardItem *card = c.at(i);
-            auto copy = new CardItem(getLogic()->getPlayer(), this, card->getCardRef(), card->getId());
-            copy->setFaceDown(card->getFaceDown());
-
-            getLogic()->addCard(copy, false, i);
+            getLogic()->addCard(new CardItem(getLogic()->getPlayer(), this, card->getCardRef(), card->getId()), false,
+                                i);
         }
         reorganizeCards();
     }
@@ -112,15 +107,12 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
         auto cardName = QString::fromStdString(cardInfo.name());
         auto cardProviderId = QString::fromStdString(cardInfo.provider_id());
         auto card = new CardItem(getLogic()->getPlayer(), this, {cardName, cardProviderId}, cardInfo.id(), getLogic());
-        card->setFaceDown(cardInfo.face_down());
         getLogic()->rawInsertCard(card, i);
     }
 
     qobject_cast<ZoneViewZoneLogic *>(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE);
     reorganizeCards();
-    // clang-format off
-    emit getLogic()->cardCountChanged(); // emit keyword causes spurious spacing around ->
-    // clang-format on
+    emit getLogic()->cardCountChanged();
 }
 
 // Because of boundingRect(), this function must not be called before the zone was added to a scene.
@@ -168,8 +160,8 @@ void ZoneViewZone::reorganizeCards()
     // determine bounding rect
     qreal aleft = 0;
     qreal atop = 0;
-    qreal awidth = gridSize.cols * CardDimensions::WIDTH_F + CardDimensions::WIDTH_HALF_F + HORIZONTAL_PADDING;
-    qreal aheight = (gridSize.rows * CardDimensions::HEIGHT_F) / 3 + CardDimensions::HEIGHT_F * 1.3;
+    qreal awidth = gridSize.cols * CARD_WIDTH + (CARD_WIDTH / 2) + HORIZONTAL_PADDING;
+    qreal aheight = (gridSize.rows * CARD_HEIGHT) / 3 + CARD_HEIGHT * 1.3;
     optimumRect = QRectF(aleft, atop, awidth, aheight);
 
     updateGeometry();
@@ -212,8 +204,8 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca
             }
 
             lastColumnProp = columnProp;
-            qreal x = col * CardDimensions::WIDTH_F;
-            qreal y = row * CardDimensions::HEIGHT_F / 3;
+            qreal x = col * CARD_WIDTH;
+            qreal y = row * CARD_HEIGHT / 3;
             c->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y);
             c->setRealZValue(i);
             longestRow = qMax(row, longestRow);
@@ -240,8 +232,8 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca
 
         for (int i = 0; i < cardCount; i++) {
             CardItem *c = cards.at(i);
-            qreal x = (i / rows) * CardDimensions::WIDTH_F;
-            qreal y = (i % rows) * CardDimensions::HEIGHT_F / 3;
+            qreal x = (i / rows) * CARD_WIDTH;
+            qreal y = (i % rows) * CARD_HEIGHT / 3;
             c->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y);
             c->setRealZValue(i);
         }
@@ -287,13 +279,8 @@ void ZoneViewZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
     cmd.set_y(0);
     cmd.set_is_reversed(qobject_cast<ZoneViewZoneLogic *>(getLogic())->getIsReversed());
 
-    for (int i = 0; i < dragItems.size(); ++i) {
-        auto cardToMove = cmd.mutable_cards_to_move()->add_card();
-        cardToMove->set_card_id(dragItems[i]->getId());
-        if (dragItems[i]->isForceFaceDown()) {
-            cardToMove->set_face_down(true);
-        }
-    }
+    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);
 }
diff --git a/cockatrice/src/game/zones/view_zone.h b/cockatrice/src/game/zones/view_zone.h
index 81279c72e..2cb22ba5c 100644
--- a/cockatrice/src/game/zones/view_zone.h
+++ b/cockatrice/src/game/zones/view_zone.h
@@ -1,19 +1,13 @@
-/**
- * @file view_zone.h
- * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
- */
-
 #ifndef ZONEVIEWERZONE_H
 #define ZONEVIEWERZONE_H
 
+#include "../../filters/filter_string.h"
 #include "logic/view_zone_logic.h"
 #include "select_zone.h"
 
 #include <QGraphicsLayoutItem>
 #include <QLoggingCategory>
-#include <libcockatrice/filters/filter_string.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
+#include <pb/commands.pb.h>
 
 inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone");
 
@@ -58,12 +52,12 @@ private:
 
 public:
     ZoneViewZone(ZoneViewZoneLogic *_logic, QGraphicsItem *parent);
-    [[nodiscard]] QRectF boundingRect() const override;
+    QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     void reorganizeCards() override;
     void initializeCards(const QList<const ServerInfo_Card *> &cardList = QList<const ServerInfo_Card *>());
     void setGeometry(const QRectF &rect) override;
-    [[nodiscard]] QRectF getOptimumRect() const
+    QRectF getOptimumRect() const
     {
         return optimumRect;
     }
@@ -83,7 +77,7 @@ signals:
     void wheelEventReceived(QGraphicsSceneWheelEvent *event);
 
 protected:
-    [[nodiscard]] QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override;
     void wheelEvent(QGraphicsSceneWheelEvent *event) override;
 };
 
diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp
index 23d7d6a19..f0615d256 100644
--- a/cockatrice/src/game/zones/view_zone_widget.cpp
+++ b/cockatrice/src/game/zones/view_zone_widget.cpp
@@ -1,32 +1,23 @@
 #include "view_zone_widget.h"
 
-#include "../../client/settings/cache_settings.h"
 #include "../../filters/syntax_help.h"
 #include "../../interface/pixel_map_generator.h"
+#include "../../settings/cache_settings.h"
 #include "../board/card_item.h"
 #include "../game_scene.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
-#include "../z_values.h"
+#include "pb/command_shuffle.pb.h"
 #include "view_zone.h"
 
 #include <QCheckBox>
 #include <QGraphicsLinearLayout>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsSceneMouseEvent>
-#include <QGraphicsView>
 #include <QLabel>
 #include <QPainter>
 #include <QScrollBar>
-#include <QStyle>
 #include <QStyleOption>
-#include <libcockatrice/protocol/pb/command_shuffle.pb.h>
-
-namespace
-{
-constexpr qreal kTitleBarHeight = 24.0;
-constexpr qreal kMinVisibleWidth = 100.0;
-} // namespace
+#include <QStyleOptionTitleBar>
 
 /**
  * @param _player the player the cards were revealed to.
@@ -48,7 +39,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
 {
     setAcceptHoverEvents(true);
     setAttribute(Qt::WA_DeleteOnClose);
-    setZValue(ZValues::ZONE_VIEW_WIDGET);
+    setZValue(2000000006);
     setFlag(ItemIgnoresTransformations);
 
     QGraphicsLinearLayout *vbox = new QGraphicsLinearLayout(Qt::Vertical);
@@ -72,7 +63,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
 
         QGraphicsProxyWidget *searchEditProxy = new QGraphicsProxyWidget;
         searchEditProxy->setWidget(&searchEdit);
-        searchEditProxy->setZValue(ZValues::DRAG_ITEM);
+        searchEditProxy->setZValue(2000000007);
         vbox->addItem(searchEditProxy);
 
         // top row
@@ -81,13 +72,13 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
         // groupBy options
         QGraphicsProxyWidget *groupBySelectorProxy = new QGraphicsProxyWidget;
         groupBySelectorProxy->setWidget(&groupBySelector);
-        groupBySelectorProxy->setZValue(ZValues::TOP_UI);
+        groupBySelectorProxy->setZValue(2000000008);
         hTopRow->addItem(groupBySelectorProxy);
 
         // sortBy options
         QGraphicsProxyWidget *sortBySelectorProxy = new QGraphicsProxyWidget;
         sortBySelectorProxy->setWidget(&sortBySelector);
-        sortBySelectorProxy->setZValue(ZValues::DRAG_ITEM);
+        sortBySelectorProxy->setZValue(2000000007);
         hTopRow->addItem(sortBySelectorProxy);
 
         vbox->addItem(hTopRow);
@@ -250,191 +241,33 @@ void ZoneViewWidget::retranslateUi()
     pileViewCheckBox.setText(tr("pile view"));
 }
 
-void ZoneViewWidget::stopWindowDrag()
+void ZoneViewWidget::moveEvent(QGraphicsSceneMoveEvent * /* event */)
 {
-    if (!draggingWindow)
+    if (!scene())
         return;
 
-    draggingWindow = false;
-    ungrabMouse();
-}
+    int titleBarHeight = 24;
 
-void ZoneViewWidget::startWindowDrag(QGraphicsSceneMouseEvent *event)
-{
-    draggingWindow = true;
-    dragStartItemPos = pos();
-    dragStartScreenPos = event->screenPos();
-    dragView = findDragView(event->widget());
+    QPointF scenePos = pos();
 
-    // need to grab mouse to receive events and not miss initial movement
-    grabMouse();
-}
-
-QRectF ZoneViewWidget::closeButtonRect(QWidget *styleWidget) const
-{
-    const QRectF frameRectF = windowFrameRect();
-
-    // query the style for the close button position (handles macOS top-left placement)
-    // Title bar rect MUST be local (0,0-based) for QStyle
-    const QRect titleBarRect(0, 0, static_cast<int>(frameRectF.width()), static_cast<int>(kTitleBarHeight));
-
-    if (styleWidget) {
-        QStyleOptionTitleBar opt;
-        opt.initFrom(styleWidget);
-        opt.rect = titleBarRect;
-        opt.text = windowTitle();
-        opt.icon = styleWidget->windowIcon();
-        opt.titleBarFlags = Qt::Window | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
-
-        opt.subControls = QStyle::SC_TitleBarCloseButton;
-        opt.activeSubControls = QStyle::SC_TitleBarCloseButton;
-        opt.titleBarState = styleWidget->isActiveWindow() ? Qt::WindowActive : Qt::WindowNoState;
-
-        if (styleWidget->isActiveWindow()) {
-            opt.state |= QStyle::State_Active;
-        }
-
-        QRect r = styleWidget->style()->subControlRect(QStyle::CC_TitleBar, &opt, QStyle::SC_TitleBarCloseButton,
-                                                       styleWidget);
-
-        if (r.isValid() && !r.isEmpty()) {
-            // Translate from local-titlebar coords → frame coords
-            r.translate(frameRectF.topLeft().toPoint());
-            return QRectF(r);
-        }
+    if (scenePos.x() < 0) {
+        scenePos.setX(0);
+    } else {
+        qreal maxw = scene()->sceneRect().width() - 100;
+        if (scenePos.x() > maxw)
+            scenePos.setX(maxw);
     }
 
-    // Fallback: frame-relative top-right
-    return QRectF(frameRectF.right() - kTitleBarHeight, frameRectF.top(), kTitleBarHeight, kTitleBarHeight);
-}
-
-QGraphicsView *ZoneViewWidget::findDragView(QWidget *eventWidget) const
-{
-    QWidget *current = eventWidget;
-    while (current) {
-        if (auto *view = qobject_cast<QGraphicsView *>(current))
-            return view;
-        current = current->parentWidget();
+    if (scenePos.y() < titleBarHeight) {
+        scenePos.setY(titleBarHeight);
+    } else {
+        qreal maxh = scene()->sceneRect().height() - titleBarHeight;
+        if (scenePos.y() > maxh)
+            scenePos.setY(maxh);
     }
 
-    if (scene() && !scene()->views().isEmpty())
-        return scene()->views().constFirst();
-
-    return nullptr;
-}
-
-QPointF ZoneViewWidget::calcDraggedWindowPos(const QPoint &screenPos,
-                                             const QPointF &scenePos,
-                                             const QPointF &buttonDownScenePos) const
-{
-    if (dragView && dragView->viewport()) {
-        const QPoint vpStart = dragView->viewport()->mapFromGlobal(dragStartScreenPos);
-        const QPoint vpNow = dragView->viewport()->mapFromGlobal(screenPos);
-        const QPointF sceneStart = dragView->mapToScene(vpStart);
-        const QPointF sceneNow = dragView->mapToScene(vpNow);
-        return dragStartItemPos + (sceneNow - sceneStart);
-    }
-
-    return dragStartItemPos + (scenePos - buttonDownScenePos);
-}
-
-bool ZoneViewWidget::windowFrameEvent(QEvent *event)
-{
-    if (event->type() == QEvent::UngrabMouse) {
-        stopWindowDrag();
-        return QGraphicsWidget::windowFrameEvent(event);
-    }
-
-    auto *me = dynamic_cast<QGraphicsSceneMouseEvent *>(event);
-    if (!me)
-        return QGraphicsWidget::windowFrameEvent(event);
-
-    switch (event->type()) {
-        case QEvent::GraphicsSceneMousePress:
-            if (me->button() == Qt::LeftButton && windowFrameSectionAt(me->pos()) == Qt::TitleBarArea) {
-                // avoid drag on close button
-                if (closeButtonRect(me->widget()).contains(me->pos())) {
-                    me->accept();
-                    close();
-                    return true;
-                }
-
-                startWindowDrag(me);
-                me->accept();
-                return true;
-            }
-            break;
-
-        case QEvent::GraphicsSceneMouseMove:
-            if (draggingWindow) {
-                if (!(me->buttons() & Qt::LeftButton)) {
-                    stopWindowDrag();
-                } else {
-                    setPos(
-                        calcDraggedWindowPos(me->screenPos(), me->scenePos(), me->buttonDownScenePos(Qt::LeftButton)));
-                }
-                me->accept();
-                return true;
-            }
-            break;
-
-        case QEvent::GraphicsSceneMouseRelease:
-            if (draggingWindow && me->button() == Qt::LeftButton) {
-                stopWindowDrag();
-                me->accept();
-                return true;
-            }
-            break;
-
-        default:
-            break;
-    }
-
-    return QGraphicsWidget::windowFrameEvent(event);
-}
-
-void ZoneViewWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    // move if the scene routes moves while dragging
-    if (draggingWindow && (event->buttons() & Qt::LeftButton)) {
-        setPos(calcDraggedWindowPos(event->screenPos(), event->scenePos(), event->buttonDownScenePos(Qt::LeftButton)));
-        event->accept();
-        return;
-    }
-
-    QGraphicsWidget::mouseMoveEvent(event);
-}
-
-void ZoneViewWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (draggingWindow && event->button() == Qt::LeftButton) {
-        stopWindowDrag();
-        event->accept();
-        return;
-    }
-
-    QGraphicsWidget::mouseReleaseEvent(event);
-}
-
-QVariant ZoneViewWidget::itemChange(GraphicsItemChange change, const QVariant &value)
-{
-    if (change == QGraphicsItem::ItemPositionChange && scene()) {
-        // Keep grab area in main view
-        const QRectF sceneRect = scene()->sceneRect();
-        const QPointF requestedPos = value.toPointF();
-        QPointF desiredPos = requestedPos;
-
-        const qreal minX = sceneRect.left();
-        const qreal maxX = qMax(minX, sceneRect.right() - kMinVisibleWidth);
-        const qreal minY = sceneRect.top() + kTitleBarHeight;
-        const qreal maxY = qMax(minY, sceneRect.bottom() - kTitleBarHeight);
-
-        desiredPos.setX(qBound(minX, desiredPos.x(), maxX));
-        desiredPos.setY(qBound(minY, desiredPos.y(), maxY));
-        return desiredPos;
-    }
-
-    return QGraphicsWidget::itemChange(change, value);
+    if (scenePos != pos())
+        setPos(scenePos);
 }
 
 void ZoneViewWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
@@ -458,7 +291,7 @@ void ZoneViewWidget::resizeScrollbar(const qreal newZoneHeight)
  */
 static qreal rowsToHeight(int rows)
 {
-    const qreal cardsHeight = (rows + 1) * (CardDimensions::HEIGHT_F / 3);
+    const qreal cardsHeight = (rows + 1) * (CARD_HEIGHT / 3);
     return cardsHeight + 5; // +5 padding to make the cutoff look nicer
 }
 
@@ -517,7 +350,6 @@ void ZoneViewWidget::handleScrollBarChange(int value)
 
 void ZoneViewWidget::closeEvent(QCloseEvent *event)
 {
-    stopWindowDrag();
     disconnect(zone, &ZoneViewZone::closed, this, 0);
     // manually call zone->close in order to remove it from the origZones views
     zone->close();
@@ -574,4 +406,4 @@ void ZoneViewWidget::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
     if (event->pos().y() <= 0) {
         expandWindow();
     }
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/zones/view_zone_widget.h b/cockatrice/src/game/zones/view_zone_widget.h
index 1246192b8..ae282435d 100644
--- a/cockatrice/src/game/zones/view_zone_widget.h
+++ b/cockatrice/src/game/zones/view_zone_widget.h
@@ -1,11 +1,7 @@
-/**
- * @file view_zone_widget.h
- * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
- */
 #ifndef ZONEVIEWWIDGET_H
 #define ZONEVIEWWIDGET_H
 
+#include "../../utility/macros.h"
 #include "logic/card_zone_logic.h"
 
 #include <QCheckBox>
@@ -13,8 +9,6 @@
 #include <QGraphicsProxyWidget>
 #include <QGraphicsWidget>
 #include <QLineEdit>
-#include <QPointer>
-#include <libcockatrice/utility/macros.h>
 
 class QLabel;
 class QPushButton;
@@ -28,8 +22,6 @@ class ServerInfo_Card;
 class QGraphicsSceneMouseEvent;
 class QGraphicsSceneWheelEvent;
 class QStyleOption;
-class QGraphicsView;
-class QWidget;
 
 class ScrollableGraphicsProxyWidget : public QGraphicsProxyWidget
 {
@@ -54,6 +46,7 @@ private:
     ZoneViewZone *zone;
     QGraphicsWidget *zoneContainer;
 
+    QPushButton *closeButton;
     QScrollBar *scrollBar;
     ScrollableGraphicsProxyWidget *scrollBarProxy;
 
@@ -67,33 +60,6 @@ private:
     int extraHeight;
     Player *player;
 
-    bool draggingWindow = false;
-    QPoint dragStartScreenPos;
-    QPointF dragStartItemPos;
-    QPointer<QGraphicsView> dragView;
-
-    void stopWindowDrag();
-    void startWindowDrag(QGraphicsSceneMouseEvent *event);
-    QRectF closeButtonRect(QWidget *styleWidget) const;
-    /**
-     * @brief Resolves the QGraphicsView to use for drag coordinate mapping
-     *
-     * @param eventWidget QWidget that originated the mouse event
-     * @return The resolved QGraphicsView
-     */
-    QGraphicsView *findDragView(QWidget *eventWidget) const;
-    /**
-     * @brief Calculates the desired widget position while dragging
-     *
-     * @param screenPos Global screen coordinates of the current mouse position
-     * @param scenePos Scene coordinates of the current mouse position
-     * @param buttonDownScenePos Scene coordinates of the initial mouse press position
-     *
-     * @return The new widget position in scene coordinates
-     */
-    QPointF
-    calcDraggedWindowPos(const QPoint &screenPos, const QPointF &scenePos, const QPointF &buttonDownScenePos) const;
-
     void resizeScrollbar(qreal newZoneHeight);
 signals:
     void closePressed(ZoneViewWidget *zv);
@@ -104,6 +70,7 @@ private slots:
     void resizeToZoneContents(bool forceInitialHeight = false);
     void handleScrollBarChange(int value);
     void zoneDeleted();
+    void moveEvent(QGraphicsSceneMoveEvent * /* event */) override;
     void resizeEvent(QGraphicsSceneResizeEvent * /* event */) override;
     void expandWindow();
 
@@ -128,10 +95,6 @@ public:
 protected:
     void closeEvent(QCloseEvent *event) override;
     void initStyleOption(QStyleOption *option) const override;
-    bool windowFrameEvent(QEvent *event) override;
-    QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
     void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
 };
 
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
deleted file mode 100644
index 4000fd99a..000000000
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
+++ /dev/null
@@ -1,135 +0,0 @@
-#ifndef CARD_PICTURE_LOADER_H
-#define CARD_PICTURE_LOADER_H
-
-#include "card_picture_loader_status_bar.h"
-#include "card_picture_loader_worker.h"
-
-#include <QLoggingCategory>
-
-inline Q_LOGGING_CATEGORY(CardPictureLoaderLog, "card_picture_loader");
-inline Q_LOGGING_CATEGORY(CardPictureLoaderCardBackCacheFailLog, "card_picture_loader.card_back_cache_fail");
-
-/**
- * @class CardPictureLoader
- * @ingroup PictureLoader
- * @brief Singleton class to manage card image loading and caching. Provides functionality to asynchronously load,
- * cache, and manage card images for the client.
- *
- * This class is a singleton and handles:
- * - Loading card images from disk or network.
- * - Caching images in QPixmapCache for fast reuse.
- * - Providing themed card backs, including fallback and in-progress/failed states.
- * - Emitting updates when pixmaps are loaded.
- *
- * It interacts with CardPictureLoaderWorker for background loading and
- * CardPictureLoaderStatusBar to display loading progress in the main window.
- *
- * Provides static accessors for:
- * - Card images by ExactCard.
- * - Card back images (normal, in-progress, failed).
- * - Cache management (clearPixmapCache(), clearNetworkCache(), cacheCardPixmaps(const QList<ExactCard> &cards)).
- *
- * Uses a worker thread for asynchronous image loading and a status bar widget
- * to track load progress.
- */
-class CardPictureLoader : public QObject
-{
-    Q_OBJECT
-public:
-    /**
-     * @brief Access the singleton instance of CardPictureLoader.
-     * @return Reference to the singleton.
-     */
-    static CardPictureLoader &getInstance()
-    {
-        static CardPictureLoader instance;
-        return instance;
-    }
-
-private:
-    explicit CardPictureLoader();
-    ~CardPictureLoader() override;
-
-    // Disable copy and assignment for singleton
-    CardPictureLoader(CardPictureLoader const &) = delete;
-    void operator=(CardPictureLoader const &) = delete;
-
-    CardPictureLoaderWorker *worker;       ///< Worker thread for async image loading
-    CardPictureLoaderStatusBar *statusBar; ///< Status bar widget showing load progress
-
-public:
-    /**
-     * @brief Retrieve a card pixmap, either from cache or enqueued for loading.
-     * @param pixmap Reference to QPixmap where result will be stored.
-     * @param card ExactCard to load.
-     * @param size Desired size of pixmap.
-     */
-    static void getPixmap(QPixmap &pixmap, const ExactCard &card, QSize size);
-
-    /**
-     * @brief Retrieve a generic card back pixmap.
-     * @param pixmap Reference to QPixmap where result will be stored.
-     * @param size Desired size of pixmap.
-     */
-    static void getCardBackPixmap(QPixmap &pixmap, QSize size);
-
-    /**
-     * @brief Retrieve a card back pixmap for the loading-in-progress state.
-     * @param pixmap Reference to QPixmap where result will be stored.
-     * @param size Desired size of pixmap.
-     */
-    static void getCardBackLoadingInProgressPixmap(QPixmap &pixmap, QSize size);
-
-    /**
-     * @brief Retrieve a card back pixmap for the loading-failed state.
-     * @param pixmap Reference to QPixmap where result will be stored.
-     * @param size Desired size of pixmap.
-     */
-    static void getCardBackLoadingFailedPixmap(QPixmap &pixmap, QSize size);
-
-    /**
-     * @brief Preload a list of cards into the pixmap cache (limited to CACHED_CARD_PER_DECK_MAX).
-     * @param cards List of ExactCard objects to preload.
-     */
-    static void cacheCardPixmaps(const QList<ExactCard> &cards);
-
-    /**
-     * @brief Check if the user has custom card art in the picsPath directory.
-     * @return True if any custom art exists.
-     */
-    static bool hasCustomArt();
-
-    /**
-     * @brief Clears the in-memory QPixmap cache for all cards.
-     */
-    static void clearPixmapCache();
-
-public slots:
-    /**
-     * @brief Clears the network disk cache of the worker.
-     */
-    static void clearNetworkCache();
-
-    /**
-     * @brief Slot called by the worker when an image is loaded.
-     * Inserts the pixmap into the cache and emits pixmap updated signals.
-     * @param card ExactCard that was loaded.
-     * @param image Loaded QImage.
-     */
-    void imageLoaded(const ExactCard &card, const QImage &image);
-
-private slots:
-    /**
-     * @brief Triggered when the user changes the picture download settings.
-     * Clears the QPixmap cache to reload images.
-     */
-    void picDownloadChanged();
-
-    /**
-     * @brief Triggered when the pictures path changes.
-     * Clears the QPixmap cache to reload images.
-     */
-    void picsPathChanged();
-};
-
-#endif
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h
deleted file mode 100644
index 44163d1db..000000000
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef PICTURE_LOADER_LOCAL_H
-#define PICTURE_LOADER_LOCAL_H
-
-#include <QTimer>
-#include <libcockatrice/card/printing/exact_card.h>
-
-inline Q_LOGGING_CATEGORY(CardPictureLoaderLocalLog, "card_picture_loader.local");
-
-/**
- * @class CardPictureLoaderLocal
- * @ingroup PictureLoader
- * @brief Handles searching for and loading card images from local and custom image folders.
- *
- * This class maintains an index of the CUSTOM folder to avoid repeatedly scanning
- * directories, and supports periodic refreshes to update the index.
- *
- * Responsibilities:
- * - Load images for ExactCard objects from local disk or custom folders.
- * - Maintain an index for fast lookup of images in the CUSTOM folder.
- * - Refresh the index periodically to account for changes in local image directories.
- */
-class CardPictureLoaderLocal : public QObject
-{
-    Q_OBJECT
-
-public:
-    /**
-     * @brief Constructs a CardPictureLoaderLocal object.
-     * @param parent Optional parent QObject.
-     *
-     * Initializes paths from SettingsCache, connects to settings change signals,
-     * builds the initial folder index, and starts a periodic refresh timer.
-     */
-    explicit CardPictureLoaderLocal(QObject *parent);
-
-    /**
-     * @brief Attempts to load a card image from local disk or custom folders.
-     * @param toLoad ExactCard object representing the card to load.
-     * @return Loaded QImage if found; otherwise, an empty QImage.
-     *
-     * Uses a set of name variants and folder paths to attempt to locate the correct image.
-     */
-    [[nodiscard]] QImage tryLoad(const ExactCard &toLoad) const;
-
-private:
-    QString picsPath;       ///< Path to standard card image folder
-    QString customPicsPath; ///< Path to custom card image folder
-
-    QMultiHash<QString, QString> customFolderIndex; ///< Multimap from cardName to file paths in CUSTOM folder
-    QTimer *refreshTimer;                           ///< Timer for periodic folder index refresh
-
-    /**
-     * @brief Rebuilds the index of the custom image folder.
-     *
-     * Iterates through all subdirectories of the CUSTOM folder and populates
-     * `customFolderIndex` with all discovered image files keyed by base name
-     * and complete base name.
-     */
-    void refreshIndex();
-
-    /**
-     * @brief Attempts to load a card image from disk given its set and name info.
-     * @param setName Corrected short name of the card's set.
-     * @param correctedCardName Corrected card name (e.g., normalized name).
-     * @param collectorNumber Collector number of the card.
-     * @param providerId Optional provider UUID of the card.
-     * @return Loaded QImage if found; otherwise, an empty QImage.
-     *
-     * Searches in both the custom folder index and standard pictures paths.
-     * Uses several filename patterns to match card images, in order from
-     * most-specific to least-specific.
-     */
-    [[nodiscard]] QImage tryLoadCardImageFromDisk(const QString &setName,
-                                                  const QString &correctedCardName,
-                                                  const QString &collectorNumber,
-                                                  const QString &providerId) const;
-
-private slots:
-    /**
-     * @brief Updates internal paths when the user changes picture settings.
-     *
-     * Triggered by `SettingsCache::picsPathChanged`.
-     */
-    void picsPathChanged();
-};
-
-#endif // PICTURE_LOADER_LOCAL_H
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h
deleted file mode 100644
index c9a272b68..000000000
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#ifndef PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
-#define PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QUrl>
-#include <QWidget>
-#include <libcockatrice/card/printing/exact_card.h>
-
-/**
- * @class CardPictureLoaderRequestStatusDisplayWidget
- * @ingroup PictureLoader
- * @brief A small widget to display the status of a single card image request.
- *
- * Displays:
- * - Card name
- * - Set short name
- * - Provider ID
- * - Start time of request
- * - Elapsed time since start
- * - Finished status
- * - URL of the requested image
- */
-class CardPictureLoaderRequestStatusDisplayWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    /**
-     * @brief Constructs a new status widget for a specific card image request.
-     * @param parent Parent widget
-     * @param url URL of the image being requested
-     * @param card The ExactCard being downloaded
-     * @param setName Set name for the card
-     */
-    CardPictureLoaderRequestStatusDisplayWidget(QWidget *parent,
-                                                const QUrl &url,
-                                                const ExactCard &card,
-                                                const QString &setName);
-
-    /** Marks the request as finished */
-    void setFinished()
-    {
-        finished->setText("True");
-        update();
-        repaint();
-    }
-
-    /** Returns whether the request has finished */
-    [[nodiscard]] bool getFinished() const
-    {
-        return finished->text() == "True";
-    }
-
-    /** Updates the elapsed time display */
-    void setElapsedTime(const QString &_elapsedTime) const
-    {
-        elapsedTime->setText(_elapsedTime);
-    }
-
-    /**
-     * @brief Queries the elapsed time in seconds since the request started
-     * @return Elapsed time in seconds
-     */
-    int queryElapsedSeconds()
-    {
-        if (!getFinished()) {
-            int elapsedSeconds = QDateTime::fromString(startTime->text()).secsTo(QDateTime::currentDateTime());
-            elapsedTime->setText(QString::number(elapsedSeconds));
-            update();
-            repaint();
-            return elapsedSeconds;
-        }
-        return elapsedTime->text().toInt();
-    }
-
-    /** Returns the start time as a string */
-    [[nodiscard]] QString getStartTime() const
-    {
-        return startTime->text();
-    }
-
-    /** Returns the URL of the request */
-    [[nodiscard]] QString getUrl() const
-    {
-        return url->text();
-    }
-
-private:
-    QHBoxLayout *layout;  ///< Horizontal layout for arranging labels
-    QLabel *name;         ///< Card name
-    QLabel *setShortname; ///< Set short name
-    QLabel *providerId;   ///< Provider ID for the card
-    QLabel *startTime;    ///< Start time of the request
-    QLabel *elapsedTime;  ///< Elapsed time since start
-    QLabel *finished;     ///< Whether the request has finished
-    QLabel *url;          ///< URL of the requested image
-};
-
-#endif // PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h
deleted file mode 100644
index 7f1f509db..000000000
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef PICTURE_LOADER_STATUS_BAR_H
-#define PICTURE_LOADER_STATUS_BAR_H
-
-#include "../../interface/widgets/quick_settings/settings_button_widget.h"
-#include "card_picture_loader_worker_work.h"
-
-#include <QHBoxLayout>
-#include <QProgressBar>
-#include <QWidget>
-
-/**
- * @class CardPictureLoaderStatusBar
- * @ingroup PictureLoader
- * @brief Displays the status of card image downloads in a horizontal progress bar with a log popup.
- *
- * Responsibilities:
- * - Shows overall progress of image downloads.
- * - Maintains a log of individual requests via a popup (SettingsButtonWidget).
- * - Cleans up finished request entries automatically after a delay.
- */
-class CardPictureLoaderStatusBar : public QWidget
-{
-    Q_OBJECT
-public:
-    /**
-     * @brief Constructs a status bar with progress bar and log button.
-     * @param parent Parent widget
-     */
-    explicit CardPictureLoaderStatusBar(QWidget *parent);
-
-public slots:
-    /**
-     * @brief Adds a queued image download to the log and increments the progress bar maximum.
-     * @param url URL of the image
-     * @param card The card being loaded
-     * @param setName The set name of the card
-     */
-    void addQueuedImageLoad(const QUrl &url, const ExactCard &card, const QString &setName);
-
-    /**
-     * @brief Marks an image as successfully loaded.
-     *        Updates the progress bar and marks the corresponding log entry as finished.
-     * @param url URL of the successfully loaded image
-     */
-    void addSuccessfulImageLoad(const QUrl &url);
-
-    /**
-     * @brief Cleans up old entries from the log that have finished more than 10 seconds ago.
-     *        Adjusts the progress bar accordingly.
-     */
-    void cleanOldEntries();
-
-private:
-    QHBoxLayout *layout;           ///< Horizontal layout containing progress bar and log button
-    QProgressBar *progressBar;     ///< Progress bar showing overall download progress
-    SettingsButtonWidget *loadLog; ///< Popup log showing individual request statuses
-    QTimer *cleaner;               ///< Timer for periodically cleaning old log entries
-};
-
-#endif // PICTURE_LOADER_STATUS_BAR_H
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h
deleted file mode 100644
index f927abde6..000000000
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h
+++ /dev/null
@@ -1,152 +0,0 @@
-#ifndef PICTURE_LOADER_WORKER_H
-#define PICTURE_LOADER_WORKER_H
-
-#include "card_picture_loader_local.h"
-#include "card_picture_loader_worker_work.h"
-#include "card_picture_to_load.h"
-
-#include <QLoggingCategory>
-#include <QMutex>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
-#include <QObject>
-#include <QQueue>
-#include <QTimer>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/card/database/card_database.h>
-
-#define REDIRECT_HEADER_NAME "redirects"
-#define REDIRECT_ORIGINAL_URL "original"
-#define REDIRECT_URL "redirect"
-#define REDIRECT_TIMESTAMP "timestamp"
-#define REDIRECT_CACHE_FILENAME "cache.ini"
-
-inline Q_LOGGING_CATEGORY(CardPictureLoaderWorkerLog, "card_picture_loader.worker")
-
-    class CardPictureLoaderWorkerWork;
-
-/**
- * @class CardPictureLoaderWorker
- * @ingroup PictureLoader
- * @brief Handles asynchronous loading of card images, both locally and via network.
- *
- * Responsibilities:
- * - Maintain a queue of network image requests with rate-limiting.
- * - Load images from local cache first via CardPictureLoaderLocal.
- * - Handle network redirects and persistent caching of redirects.
- * - Deduplicate simultaneous requests for the same card.
- * - Emit signals for status updates and loaded images.
- */
-class CardPictureLoaderWorker : public QObject
-{
-    Q_OBJECT
-
-public:
-    /**
-     * @brief Constructs a CardPictureLoaderWorker.
-     *
-     * Initializes network manager, cache, redirect cache, local loader, and request quota timer.
-     */
-    explicit CardPictureLoaderWorker();
-
-    ~CardPictureLoaderWorker() override;
-
-    /**
-     * @brief Enqueues an ExactCard for loading.
-     * @param card ExactCard to load
-     *
-     * This will first try to load the image locally; if that fails, it will enqueue a network request.
-     */
-    void enqueueImageLoad(const ExactCard &card);
-
-    /**
-     * @brief Queues a network request for a given URL and worker thread.
-     * @param url URL to load
-     * @param worker Worker handling this request
-     */
-    void queueRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker);
-
-    /** @brief Clears the network cache and redirect cache. */
-    void clearNetworkCache();
-
-public slots:
-    /**
-     * @brief Makes a network request for the given URL using the specified worker.
-     * @param url URL to load
-     * @param workThread Worker handling the request
-     * @return The QNetworkReply object representing the request
-     */
-    QNetworkReply *makeRequest(const QUrl &url, CardPictureLoaderWorkerWork *workThread);
-
-    /** @brief Processes all queued requests respecting the request quota. */
-    void processQueuedRequests();
-
-    /**
-     * @brief Processes a single queued request.
-     * @return true if a request was processed, false if queue is empty.
-     */
-    bool processSingleRequest();
-
-    /**
-     * @brief Handles an image that has finished loading.
-     * @param card The ExactCard that was loaded
-     * @param image The loaded QImage; empty if loading failed
-     */
-    void handleImageLoaded(const ExactCard &card, const QImage &image);
-
-    /** @brief Caches a redirect mapping between original and redirected URL. */
-    void cacheRedirect(const QUrl &originalUrl, const QUrl &redirectUrl);
-
-    /** @brief Removes a URL from the network cache. */
-    void removedCachedUrl(const QUrl &url);
-
-private:
-    QThread *pictureLoaderThread;                      ///< Thread for executing worker tasks
-    QNetworkAccessManager *networkManager;             ///< Network manager for HTTP requests
-    QNetworkDiskCache *cache;                          ///< Disk cache for downloaded images
-    QHash<QUrl, QPair<QUrl, QDateTime>> redirectCache; ///< Maps original URLs to redirects with timestamp
-    QString cacheFilePath;                             ///< Path to persistent redirect cache file
-    static constexpr int CacheTTLInDays = 30;          ///< Time-to-live for redirect cache entries (days)
-    bool picDownload;                                  ///< Whether downloading images from network is enabled
-    QQueue<QPair<QUrl, CardPictureLoaderWorkerWork *>> requestLoadQueue; ///< Queue of pending network requests
-
-    int requestQuota;    ///< Remaining requests allowed per second
-    QTimer requestTimer; ///< Timer to reset the request quota
-
-    CardPictureLoaderLocal *localLoader; ///< Loader for local images
-    QSet<QString> currentlyLoading;      ///< Deduplication: contains pixmapCacheKey currently being loaded
-
-    /** @brief Returns cached redirect URL for the given original URL, if available. */
-    [[nodiscard]] QUrl getCachedRedirect(const QUrl &originalUrl) const;
-
-    /** @brief Loads redirect cache from disk. */
-    void loadRedirectCache();
-
-    /** @brief Saves redirect cache to disk. */
-    void saveRedirectCache() const;
-
-    /** @brief Removes stale redirect entries older than TTL. */
-    void cleanStaleEntries();
-
-private slots:
-    /** @brief Resets the request quota for rate-limiting. */
-    void resetRequestQuota();
-
-    /** @brief Handles image load requests enqueued on this worker. */
-    void handleImageLoadEnqueued(const ExactCard &card);
-
-signals:
-    /** @brief Emitted when an image load is enqueued. */
-    void imageLoadEnqueued(const ExactCard &card);
-
-    /** @brief Emitted when an image has finished loading. */
-    void imageLoaded(const ExactCard &card, const QImage &image);
-
-    /** @brief Emitted when a request is added to the network queue. */
-    void imageRequestQueued(const QUrl &url, const ExactCard &card, const QString &setName);
-
-    /** @brief Emitted when a network request successfully completes. */
-    void imageRequestSucceeded(const QUrl &url);
-};
-
-#endif // PICTURE_LOADER_WORKER_H
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h
deleted file mode 100644
index cdffc1dff..000000000
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef PICTURE_LOADER_WORKER_WORK_H
-#define PICTURE_LOADER_WORKER_WORK_H
-
-#include "card_picture_loader_worker.h"
-#include "card_picture_to_load.h"
-
-#include <QLoggingCategory>
-#include <QMutex>
-#include <QNetworkAccessManager>
-#include <QObject>
-#include <QThread>
-#include <libcockatrice/card/database/card_database.h>
-
-inline Q_LOGGING_CATEGORY(CardPictureLoaderWorkerWorkLog, "card_picture_loader.worker");
-
-class CardPictureLoaderWorker;
-
-/**
- * @class CardPictureLoaderWorkerWork
- * @ingroup PictureLoader
- * @brief Handles downloading a single card image from network or local sources.
- *
- * Responsibilities:
- * - Try to load images from all possible URLs and sets for a given ExactCard.
- * - Handle network redirects and cache invalidation.
- * - Check for blacklisted images and discard them.
- * - Emit signals when image is successfully loaded or all attempts fail.
- * - Delete itself after loading completes.
- */
-class CardPictureLoaderWorkerWork : public QObject
-{
-    Q_OBJECT
-public:
-    /**
-     * @brief Constructs a worker for downloading a specific card image.
-     * @param worker The orchestrating CardPictureLoaderWorker
-     * @param toLoad The ExactCard to download
-     */
-    explicit CardPictureLoaderWorkerWork(const CardPictureLoaderWorker *worker, const ExactCard &toLoad);
-
-    CardPictureToLoad cardToDownload; ///< The card and associated URLs to try downloading
-
-public slots:
-    /**
-     * @brief Handles a finished network reply for the card image.
-     * @param reply The QNetworkReply object to process. Ownership is transferred.
-     */
-    void handleNetworkReply(QNetworkReply *reply);
-
-private:
-    bool picDownload; ///< Whether network downloading is enabled
-
-    /** @brief Starts downloading the next URL for this card. */
-    void startNextPicDownload();
-
-    /** @brief Called when all URLs have been exhausted or download failed. */
-    void picDownloadFailed();
-
-    /** @brief Processes a failed network reply. */
-    void handleFailedReply(const QNetworkReply *reply);
-
-    /** @brief Processes a successful network reply. */
-    void handleSuccessfulReply(QNetworkReply *reply);
-
-    /**
-     * @brief Attempts to read an image from a network reply.
-     * @param reply The network reply
-     * @return The loaded QImage or an empty image if reading failed
-     */
-    QImage tryLoadImageFromReply(QNetworkReply *reply);
-
-    /**
-     * @brief Finalizes the image loading process.
-     * @param image The loaded image (empty if failed)
-     *
-     * Emits imageLoaded() and deletes this object.
-     */
-    void concludeImageLoad(const QImage &image);
-
-private slots:
-    /** @brief Updates the picDownload setting when it changes. */
-    void picDownloadChanged();
-
-signals:
-    /**
-     * @brief Emitted when the image has been loaded or all attempts failed.
-     * @param card The card corresponding to the image
-     * @param image The loaded image (empty if failed)
-     *
-     * The worker deletes itself after emitting this signal.
-     */
-    void imageLoaded(const ExactCard &card, const QImage &image);
-
-    /** @brief Emitted when a network request completes successfully. */
-    void requestSucceeded(const QUrl &url);
-
-    /** @brief Request that a URL be downloaded. */
-    void requestImageDownload(const QUrl &url, CardPictureLoaderWorkerWork *instance);
-
-    /** @brief Emitted when a URL has been redirected. */
-    void urlRedirected(const QUrl &originalUrl, const QUrl &redirectUrl);
-
-    /** @brief Emitted when a cached URL is invalid and must be removed. */
-    void cachedUrlInvalidated(const QUrl &url);
-};
-
-#endif // PICTURE_LOADER_WORKER_WORK_H
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h
deleted file mode 100644
index b57e57644..000000000
--- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef PICTURE_TO_LOAD_H
-#define PICTURE_TO_LOAD_H
-
-#include <libcockatrice/card/printing/exact_card.h>
-
-inline Q_LOGGING_CATEGORY(CardPictureToLoadLog, "card_picture_loader.picture_to_load");
-
-/**
- * @class CardPictureToLoad
- * @ingroup PictureLoader
- * @brief Manages all URLs and sets for downloading a specific card image.
- *
- * Responsibilities:
- * - Maintains a sorted list of sets for a card.
- * - Generates URLs to download images from, including custom URLs and URL templates.
- * - Tracks which URL and set is currently being attempted.
- * - Provides helper methods to advance to next URL or set.
- */
-class CardPictureToLoad
-{
-private:
-    ExactCard card;                ///< The ExactCard being downloaded
-    QList<CardSetPtr> sortedSets;  ///< All sets for this card, sorted by priority
-    QList<QString> urlTemplates;   ///< URL templates from settings
-    QList<QString> currentSetUrls; ///< URLs for the current set being attempted
-    QString currentUrl;            ///< Currently active URL to download
-    CardSetPtr currentSet;         ///< Currently active set
-
-public:
-    /**
-     * @brief Constructs a CardPictureToLoad for a given ExactCard.
-     * @param _card The card to download
-     *
-     * Initializes URL templates and pre-populates the first set URLs.
-     */
-    explicit CardPictureToLoad(const ExactCard &_card);
-
-    /** @return The card being loaded. */
-    [[nodiscard]] const ExactCard &getCard() const
-    {
-        return card;
-    }
-
-    /** @return The current URL being attempted. */
-    [[nodiscard]] QString getCurrentUrl() const
-    {
-        return currentUrl;
-    }
-
-    /** @return The current set being attempted. */
-    [[nodiscard]] CardSetPtr getCurrentSet() const
-    {
-        return currentSet;
-    }
-
-    /** @return The short name of the current set, or empty string if no set. */
-    [[nodiscard]] QString getSetName() const;
-
-    /**
-     * @brief Transforms a URL template into a concrete URL for this card/set.
-     * @param urlTemplate The URL template to transform
-     * @return The transformed URL or empty string if the template cannot be fulfilled
-     */
-    QString transformUrl(const QString &urlTemplate) const;
-
-    /**
-     * @brief Advance to the next set in the list.
-     * @return True if a next set exists and was selected, false if at the end.
-     *
-     * Updates currentSet and repopulates currentSetUrls.
-     * If we are already at the end of the list, then currentSet is set to empty.
-     */
-    bool nextSet();
-
-    /**
-     * @brief Advance to the next URL in the current set's list.
-     * @return True if a next URL exists, false if at the end.
-     *
-     * Updates currentUrl.
-     * If we are already at the end of the list, then currentUrl is set to empty.
-     */
-    bool nextUrl();
-
-    /**
-     * @brief Populates the currentSetUrls list with URLs for the current set.
-     *
-     * Includes custom URLs first, followed by template-based URLs.
-     */
-    void populateSetUrls();
-
-    /**
-     * @brief Extract all sets from the card and sort them by priority.
-     * @param card The card to extract sets from
-     * @return A non-empty list of CardSetPtr, sorted by priority
-     *
-     * If the card has no sets, a dummy set is inserted. Also ensures
-     * the printing corresponding to the ExactCard is first in the list.
-     */
-    static QList<CardSetPtr> extractSetsSorted(const ExactCard &card);
-};
-
-#endif // PICTURE_TO_LOAD_H
diff --git a/cockatrice/src/interface/deck_loader/card_node_function.cpp b/cockatrice/src/interface/deck_loader/card_node_function.cpp
deleted file mode 100644
index 9441fe428..000000000
--- a/cockatrice/src/interface/deck_loader/card_node_function.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "card_node_function.h"
-
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-
-void CardNodeFunction::SetProviderIdToPreferred::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
-{
-    Q_UNUSED(node);
-    PrintingInfo preferredPrinting = CardDatabaseManager::query()->getPreferredPrinting(card->getName());
-    QString providerId = preferredPrinting.getUuid();
-    QString setShortName = preferredPrinting.getSet()->getShortName();
-    QString collectorNumber = preferredPrinting.getProperty("num");
-
-    card->setCardProviderId(providerId);
-    card->setCardCollectorNumber(collectorNumber);
-    card->setCardSetShortName(setShortName);
-}
-
-void CardNodeFunction::ClearPrintingData::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
-{
-    Q_UNUSED(node);
-    card->setCardSetShortName(nullptr);
-    card->setCardCollectorNumber(nullptr);
-    card->setCardProviderId(nullptr);
-}
-
-void CardNodeFunction::ResolveProviderId::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
-{
-    Q_UNUSED(node);
-    // Retrieve the providerId based on setName and collectorNumber
-    QString providerId =
-        CardDatabaseManager::getInstance()
-            ->query()
-            ->getSpecificPrinting(card->getName(), card->getCardSetShortName(), card->getCardCollectorNumber())
-            .getUuid();
-
-    // Set the providerId on the card
-    card->setCardProviderId(providerId);
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/deck_loader/card_node_function.h b/cockatrice/src/interface/deck_loader/card_node_function.h
deleted file mode 100644
index 398dc0c0e..000000000
--- a/cockatrice/src/interface/deck_loader/card_node_function.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef COCKATRICE_DECK_FUNCTION_H
-#define COCKATRICE_DECK_FUNCTION_H
-
-class DecklistCardNode;
-class InnerDecklistNode;
-
-/**
- * Functions to be used with DeckList::forEachCard
- */
-namespace CardNodeFunction
-{
-
-/**
- * @brief Sets the providerId of the card to the preferred printing.
- */
-struct SetProviderIdToPreferred
-{
-    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
-};
-
-/**
- * @brief Clears all fields on the card related to the printing
- */
-struct ClearPrintingData
-{
-    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
-};
-
-/**
- * @brief Sets the providerId of the card based on its set name and collector number.
- */
-struct ResolveProviderId
-{
-    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
-};
-
-} // namespace CardNodeFunction
-
-#endif // COCKATRICE_DECK_FUNCTION_H
diff --git a/cockatrice/src/interface/deck_loader/deck_file_format.cpp b/cockatrice/src/interface/deck_loader/deck_file_format.cpp
deleted file mode 100644
index 3c88cde4e..000000000
--- a/cockatrice/src/interface/deck_loader/deck_file_format.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "deck_file_format.h"
-
-DeckFileFormat::Format DeckFileFormat::getFormatFromName(const QString &fileName)
-{
-    if (fileName.endsWith(".cod", Qt::CaseInsensitive)) {
-        return Cockatrice;
-    }
-    return PlainText;
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/deck_loader/deck_file_format.h b/cockatrice/src/interface/deck_loader/deck_file_format.h
deleted file mode 100644
index 995de32c0..000000000
--- a/cockatrice/src/interface/deck_loader/deck_file_format.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef COCKATRICE_DECK_FILE_FORMAT_H
-#define COCKATRICE_DECK_FILE_FORMAT_H
-#include <QString>
-
-namespace DeckFileFormat
-{
-
-/**
- * The deck file formats that Cockatrice supports.
- */
-enum Format
-{
-    /**
-     * Plaintext deck files, a format that is intended to be widely supported among different programs.
-     * This format does not support Cockatrice specific features such as banner cards or tags.
-     */
-    PlainText,
-
-    /**
-     * This is cockatrice's native deck file format, and supports deck metadata such as banner cards and tags.
-     * Stored as .cod files.
-     */
-    Cockatrice
-};
-
-/**
- * Determines what deck file format the given filename corresponds to.
- *
- * @param fileName The filename
- * @return The deck format
- */
-Format getFormatFromName(const QString &fileName);
-
-} // namespace DeckFileFormat
-
-#endif // COCKATRICE_DECK_FILE_FORMAT_H
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp
deleted file mode 100644
index d71dca24a..000000000
--- a/cockatrice/src/interface/deck_loader/deck_loader.cpp
+++ /dev/null
@@ -1,588 +0,0 @@
-#include "deck_loader.h"
-
-#include <QApplication>
-#include <QClipboard>
-#include <QDebug>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QFutureWatcher>
-#include <QPrinter>
-#include <QRegularExpression>
-#include <QStringList>
-#include <QTextCursor>
-#include <QTextDocument>
-#include <QTextStream>
-#include <QTextTable>
-#include <QtConcurrentRun>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/import/card_name_normalizer.h>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-
-const QStringList DeckLoader::ACCEPTED_FILE_EXTENSIONS = {"*.cod", "*.dec", "*.dek", "*.txt", "*.mwDeck"};
-
-const QStringList DeckLoader::FILE_NAME_FILTERS = {
-    tr("Common deck formats (%1)").arg(ACCEPTED_FILE_EXTENSIONS.join(" ")), tr("All files (*.*)")};
-
-DeckLoader::DeckLoader(QObject *parent) : QObject(parent)
-{
-}
-
-std::optional<LoadedDeck>
-DeckLoader::loadFromFile(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest)
-{
-    QFile file(fileName);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qCWarning(DeckLoaderLog) << "File does not exist:" << fileName;
-        return std::nullopt;
-    }
-
-    bool result = false;
-    DeckList deckList;
-    switch (fmt) {
-        case DeckFileFormat::PlainText:
-            result = deckList.loadFromFile_Plain(&file, CardNameNormalizer());
-            break;
-        case DeckFileFormat::Cockatrice: {
-            result = deckList.loadFromFile_Native(&file);
-            if (!result) {
-                qCInfo(DeckLoaderLog) << "Failed to load " << fileName
-                                      << "as cockatrice format; retrying as plain format";
-                file.seek(0);
-                result = deckList.loadFromFile_Plain(&file, CardNameNormalizer());
-                fmt = DeckFileFormat::PlainText;
-            }
-            break;
-        }
-
-        default:
-            break;
-    }
-
-    if (!result) {
-        qCWarning(DeckLoaderLog) << "Failed to load " << fileName << "as" << fmt;
-        return std::nullopt;
-    }
-
-    LoadedDeck::LoadInfo lastLoadInfo = {
-        .fileName = fileName,
-        .fileFormat = fmt,
-    };
-    LoadedDeck loadedDeck = {deckList, lastLoadInfo};
-
-    if (userRequest) {
-        updateLastLoadedTimestamp(loadedDeck);
-    }
-
-    qCDebug(DeckLoaderLog) << "Loaded deck" << fileName << "with userRequest:" << userRequest;
-
-    return loadedDeck;
-}
-
-void DeckLoader::loadFromFileAsync(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest)
-{
-    QFuture<void> future = QtConcurrent::run([=, this] {
-        std::optional<LoadedDeck> deckOpt = loadFromFile(fileName, fmt, userRequest);
-        if (deckOpt) {
-            loadedDeck = deckOpt.value();
-        }
-        emit loadFinished(deckOpt.has_value());
-    });
-}
-
-bool DeckLoader::reload()
-{
-    QString lastFileName = loadedDeck.lastLoadInfo.fileName;
-    if (lastFileName.isEmpty()) {
-        return false;
-    }
-    std::optional<LoadedDeck> deck = loadFromFile(lastFileName, loadedDeck.lastLoadInfo.fileFormat, false);
-
-    if (!deck) {
-        return false;
-    }
-
-    loadedDeck = *deck;
-    return true;
-}
-
-std::optional<LoadedDeck> DeckLoader::loadFromRemote(const QString &nativeString, int remoteDeckId)
-{
-    DeckList deckList;
-    bool success = deckList.loadFromString_Native(nativeString);
-
-    if (!success) {
-        qCWarning(DeckLoaderLog) << "Failed to load remote deck with id" << remoteDeckId << ":" << nativeString;
-        return std::nullopt;
-    }
-
-    LoadedDeck::LoadInfo lastLoadInfo = {.remoteDeckId = remoteDeckId};
-    LoadedDeck loadedDeck = {deckList, lastLoadInfo};
-
-    qCDebug(DeckLoaderLog) << "Loaded remote deck with id" << remoteDeckId;
-
-    return loadedDeck;
-}
-
-std::optional<LoadedDeck::LoadInfo>
-DeckLoader::saveToFile(const DeckList &deck, const QString &fileName, DeckFileFormat::Format fmt)
-{
-    QFile file(fileName);
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qCWarning(DeckLoaderLog) << "Could not create or open file:" << fileName;
-        return std::nullopt;
-    }
-
-    bool success = false;
-    switch (fmt) {
-        case DeckFileFormat::PlainText:
-            success = deck.saveToFile_Plain(&file);
-            break;
-        case DeckFileFormat::Cockatrice:
-            success = deck.saveToFile_Native(&file);
-            break;
-    }
-
-    file.flush();
-    file.close();
-
-    qCInfo(DeckLoaderLog) << "Saved deck to " << fileName << "with format" << fmt << "-" << success;
-
-    if (!success) {
-        return std::nullopt;
-    }
-
-    LoadedDeck::LoadInfo lastLoadInfo = {fileName, fmt};
-    return lastLoadInfo;
-}
-
-bool DeckLoader::saveToFile(const LoadedDeck &deck)
-{
-    auto opt = saveToFile(deck.deckList, deck.lastLoadInfo.fileName, deck.lastLoadInfo.fileFormat);
-    return opt.has_value();
-}
-
-bool DeckLoader::saveToNewFile(LoadedDeck &deck, const QString &fileName, DeckFileFormat::Format fmt)
-{
-    std::optional<LoadedDeck::LoadInfo> infoOpt = saveToFile(deck.deckList, fileName, fmt);
-
-    if (infoOpt) {
-        deck.lastLoadInfo = infoOpt.value();
-    }
-
-    return infoOpt.has_value();
-}
-
-/**
- * @brief Updates the lastLoadedTimestamp field in the file corresponding to the deck, without changing the
- * FileModificationTime of the file.
- */
-bool DeckLoader::updateLastLoadedTimestamp(LoadedDeck &deck)
-{
-    QString fileName = deck.lastLoadInfo.fileName;
-
-    QFileInfo fileInfo(fileName);
-    if (!fileInfo.exists()) {
-        qCWarning(DeckLoaderLog) << "File does not exist:" << fileName;
-        return false;
-    }
-
-    QDateTime originalTimestamp = fileInfo.lastModified();
-
-    // 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
-    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;
-    }
-
-    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();
-    }
-
-    return result;
-}
-
-static QString getDomainForWebsite(DeckLoader::DecklistWebsite website)
-{
-    switch (website) {
-        case DeckLoader::DecklistOrg:
-            return "www.decklist.org";
-        case DeckLoader::DecklistXyz:
-            return "www.decklist.xyz";
-        default:
-            qCWarning(DeckLoaderLog) << "Invalid decklist website enum:" << website;
-            return "";
-    }
-}
-
-/**
- * Converts the card to the String that represents it in the decklist export
- */
-static QString toDecklistExportString(const DecklistCardNode *card)
-{
-    QString cardString;
-    // Get the number of cards and add the card name
-    cardString += QString::number(card->getNumber());
-    // Add a space between card num and name
-    cardString += "%20";
-    // Add card name
-    cardString += card->getName();
-
-    if (!card->getCardSetShortName().isNull()) {
-        cardString += "%20";
-        cardString += "(" + card->getCardSetShortName() + ")";
-    }
-    if (!card->getCardCollectorNumber().isNull()) {
-        cardString += "%20";
-        cardString += card->getCardCollectorNumber();
-    }
-
-    // Add a return at the end of the card
-    cardString += "%0A";
-
-    return cardString;
-}
-
-/**
- * Converts all cards in the list to their decklist export string and joins them into one string
- */
-static QString toDecklistExportString(const QList<const DecklistCardNode *> &cardNodes)
-{
-    QString result;
-
-    for (auto cardNode : cardNodes) {
-        result += toDecklistExportString(cardNode);
-    }
-
-    return result;
-}
-
-/**
- * Export deck to decklist function, called to format the deck in a way to be sent to a server
- *
- * @param deckList The decklist to export
- * @param website The website we're sending the deck to
- */
-QString DeckLoader::exportDeckToDecklist(const DeckList &deckList, DecklistWebsite website)
-{
-    // Add the base url
-    QString deckString = "https://" + getDomainForWebsite(website) + "/?";
-
-    // export all cards in zone
-    QString mainBoardCards = toDecklistExportString(deckList.getCardNodes({DECK_ZONE_MAIN}));
-    QString sideBoardCards = toDecklistExportString(deckList.getCardNodes({DECK_ZONE_SIDE}));
-
-    // Remove the extra return at the end of the last cards
-    mainBoardCards.chop(3);
-    sideBoardCards.chop(3);
-    // if after we've called it for each card, and the strings are empty, we know that
-    // there were no non-token cards in the deck, so show an error message.
-    if ((QString::compare(mainBoardCards, "", Qt::CaseInsensitive) == 0) &&
-        (QString::compare(sideBoardCards, "", Qt::CaseInsensitive) == 0)) {
-        return "";
-    }
-    // return a string with the url for decklist export
-    deckString += "deckmain=" + mainBoardCards + "&deckside=" + sideBoardCards;
-    return deckString;
-}
-
-void DeckLoader::saveToClipboard(const DeckList &deckList, bool addComments, bool addSetNameAndNumber)
-{
-    QString buffer;
-    QTextStream stream(&buffer);
-    saveToStream_Plain(stream, deckList, addComments, addSetNameAndNumber);
-    QApplication::clipboard()->setText(buffer, QClipboard::Clipboard);
-    QApplication::clipboard()->setText(buffer, QClipboard::Selection);
-}
-
-bool DeckLoader::saveToStream_Plain(QTextStream &out,
-                                    const DeckList &deckList,
-                                    bool addComments,
-                                    bool addSetNameAndNumber)
-{
-    if (addComments) {
-        saveToStream_DeckHeader(out, deckList);
-    }
-
-    // loop zones
-    for (auto zoneNode : deckList.getZoneNodes()) {
-        saveToStream_DeckZone(out, zoneNode, addComments, addSetNameAndNumber);
-
-        // end of zone
-        out << "\n";
-    }
-
-    return true;
-}
-
-void DeckLoader::saveToStream_DeckHeader(QTextStream &out, const DeckList &deckList)
-{
-    if (!deckList.getName().isEmpty()) {
-        out << "// " << deckList.getName() << "\n\n";
-    }
-
-    if (!deckList.getComments().isEmpty()) {
-        QStringList commentRows = deckList.getComments().split(QRegularExpression("\n|\r\n|\r"));
-        for (const QString &row : commentRows) {
-            out << "// " << row << "\n";
-        }
-        out << "\n";
-    }
-}
-
-void DeckLoader::saveToStream_DeckZone(QTextStream &out,
-                                       const InnerDecklistNode *zoneNode,
-                                       bool addComments,
-                                       bool addSetNameAndNumber)
-{
-    // group cards by card type and count the subtotals
-    QMultiMap<QString, DecklistCardNode *> cardsByType;
-    QMap<QString, int> cardTotalByType;
-    int cardTotal = 0;
-
-    for (int j = 0; j < zoneNode->size(); j++) {
-        auto *card = dynamic_cast<DecklistCardNode *>(zoneNode->at(j));
-
-        CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(card->getName());
-        QString cardType = info ? info->getMainCardType() : "unknown";
-
-        cardsByType.insert(cardType, card);
-
-        if (cardTotalByType.contains(cardType)) {
-            cardTotalByType[cardType] += card->getNumber();
-        } else {
-            cardTotalByType[cardType] = card->getNumber();
-        }
-
-        cardTotal += card->getNumber();
-    }
-
-    if (addComments) {
-        out << "// " << cardTotal << " " << zoneNode->getVisibleName() << "\n";
-    }
-
-    // print cards to stream
-    for (const QString &cardType : cardsByType.uniqueKeys()) {
-        if (addComments) {
-            out << "// " << cardTotalByType[cardType] << " " << cardType << "\n";
-        }
-
-        QList<DecklistCardNode *> cards = cardsByType.values(cardType);
-
-        saveToStream_DeckZoneCards(out, zoneNode, cards, addComments, addSetNameAndNumber);
-
-        if (addComments) {
-            out << "\n";
-        }
-    }
-}
-
-void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out,
-                                            const InnerDecklistNode *zoneNode,
-                                            QList<DecklistCardNode *> cards,
-                                            bool addComments,
-                                            bool addSetNameAndNumber)
-{
-    // QMultiMap sorts values in reverse order
-    for (int i = cards.size() - 1; i >= 0; --i) {
-        DecklistCardNode *card = cards[i];
-
-        if (zoneNode->getName() == DECK_ZONE_SIDE && addComments) {
-            out << "SB: ";
-        }
-
-        if (card->getNumber()) {
-            out << card->getNumber();
-        }
-        if (!card->getName().isNull() && !card->getName().isEmpty()) {
-            out << " " << card->getName();
-        }
-        if (addSetNameAndNumber) {
-            if (!card->getCardSetShortName().isNull() && !card->getCardSetShortName().isEmpty()) {
-                out << " "
-                    << "(" << card->getCardSetShortName() << ")";
-            }
-            if (!card->getCardCollectorNumber().isNull()) {
-                out << " " << card->getCardCollectorNumber();
-            }
-        }
-        out << "\n";
-    }
-}
-
-bool DeckLoader::convertToCockatriceFormat(LoadedDeck &deck)
-{
-    QString fileName = deck.lastLoadInfo.fileName;
-    if (fileName.isEmpty()) {
-        return false;
-    }
-
-    // Change the file extension to .cod
-    QFileInfo fileInfo(fileName);
-    QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod");
-
-    // Open the new file for writing
-    QFile file(newFileName);
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qCWarning(DeckLoaderLog) << "Failed to open file for writing:" << newFileName;
-        return false;
-    }
-
-    bool result = false;
-
-    // Perform file modifications based on the detected format
-    switch (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;
-    }
-
-    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,
-        };
-    }
-
-    return result;
-}
-
-void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node)
-{
-    const int totalColumns = 2;
-
-    if (node->height() == 1) {
-        QTextBlockFormat blockFormat;
-        QTextCharFormat charFormat;
-        charFormat.setFontPointSize(11);
-        charFormat.setFontWeight(QFont::Bold);
-        cursor->insertBlock(blockFormat, charFormat);
-
-        QTextTableFormat tableFormat;
-        tableFormat.setCellPadding(0);
-        tableFormat.setCellSpacing(0);
-        tableFormat.setBorder(0);
-        QTextTable *table = cursor->insertTable(node->size() + 1, totalColumns, tableFormat);
-        for (int i = 0; i < node->size(); i++) {
-            auto *card = dynamic_cast<AbstractDecklistCardNode *>(node->at(i));
-
-            QTextCharFormat cellCharFormat;
-            cellCharFormat.setFontPointSize(9);
-
-            QTextTableCell cell = table->cellAt(i, 0);
-            cell.setFormat(cellCharFormat);
-            QTextCursor cellCursor = cell.firstCursorPosition();
-            cellCursor.insertText(QString("%1 ").arg(card->getNumber()));
-
-            cell = table->cellAt(i, 1);
-            cell.setFormat(cellCharFormat);
-            cellCursor = cell.firstCursorPosition();
-            cellCursor.insertText(card->getName());
-        }
-    } else if (node->height() == 2) {
-        QTextBlockFormat blockFormat;
-        QTextCharFormat charFormat;
-        charFormat.setFontPointSize(14);
-        charFormat.setFontWeight(QFont::Bold);
-
-        cursor->insertBlock(blockFormat, charFormat);
-
-        QTextTableFormat tableFormat;
-        tableFormat.setCellPadding(10);
-        tableFormat.setCellSpacing(0);
-        tableFormat.setBorder(0);
-        QVector<QTextLength> constraints;
-        for (int i = 0; i < totalColumns; i++) {
-            constraints << QTextLength(QTextLength::PercentageLength, 100.0 / totalColumns);
-        }
-        tableFormat.setColumnWidthConstraints(constraints);
-
-        QTextTable *table = cursor->insertTable(1, totalColumns, tableFormat);
-        for (int i = 0; i < node->size(); i++) {
-            QTextCursor cellCursor = table->cellAt(0, (i * totalColumns) / node->size()).lastCursorPosition();
-            printDeckListNode(&cellCursor, dynamic_cast<InnerDecklistNode *>(node->at(i)));
-        }
-    }
-
-    cursor->movePosition(QTextCursor::End);
-}
-
-void DeckLoader::printDeckList(QPrinter *printer, const DeckList &deckList)
-{
-    QTextDocument doc;
-
-    QFont font("Serif");
-    font.setStyleHint(QFont::Serif);
-    doc.setDefaultFont(font);
-
-    QTextCursor cursor(&doc);
-
-    QTextBlockFormat headerBlockFormat;
-    QTextCharFormat headerCharFormat;
-    headerCharFormat.setFontPointSize(16);
-    headerCharFormat.setFontWeight(QFont::Bold);
-
-    cursor.insertBlock(headerBlockFormat, headerCharFormat);
-    cursor.insertText(deckList.getName());
-
-    headerCharFormat.setFontPointSize(12);
-    cursor.insertBlock(headerBlockFormat, headerCharFormat);
-    cursor.insertText(deckList.getComments());
-    cursor.insertBlock(headerBlockFormat, headerCharFormat);
-
-    for (auto zoneNode : deckList.getZoneNodes()) {
-        cursor.insertHtml("<br><img src=theme:hr.jpg>");
-        cursor.insertBlock(headerBlockFormat, headerCharFormat);
-
-        printDeckListNode(&cursor, zoneNode);
-    }
-
-    doc.print(printer);
-}
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h
deleted file mode 100644
index c707c33dc..000000000
--- a/cockatrice/src/interface/deck_loader/deck_loader.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * @file deck_loader.h
- * @ingroup ImportExport
- * @brief TODO: Document this.
- */
-
-#ifndef DECK_LOADER_H
-#define DECK_LOADER_H
-
-#include "loaded_deck.h"
-
-#include <QLoggingCategory>
-#include <QPrinter>
-#include <QTextCursor>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <optional>
-
-inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader");
-
-class DeckLoader : public QObject
-{
-    Q_OBJECT
-signals:
-    void loadFinished(bool success);
-
-public:
-    /**
-     * Supported file extensions for decklist files
-     */
-    static const QStringList ACCEPTED_FILE_EXTENSIONS;
-
-    /**
-     * For use with `QFileDialog::setNameFilters`
-     */
-    static const QStringList FILE_NAME_FILTERS;
-
-    enum DecklistWebsite
-    {
-        DecklistOrg,
-        DecklistXyz
-    };
-
-private:
-    LoadedDeck loadedDeck;
-
-public:
-    DeckLoader(QObject *parent);
-    DeckLoader(const DeckLoader &) = delete;
-    DeckLoader &operator=(const DeckLoader &) = delete;
-
-    [[nodiscard]] bool hasNotBeenLoaded() const
-    {
-        return loadedDeck.lastLoadInfo.isEmpty();
-    }
-
-    /**
-     * @brief Asynchronously loads a deck from a local file into this DeckLoader.
-     * The `loadFinished` signal will be emitted when the load finishes.
-     * Once the loading finishes, the deck can be accessed with `getDeck`
-     * @param fileName The file to load
-     * @param fmt The format of the file to load
-     * @param userRequest Whether the load was manually requested by the user, instead of being done in the background.
-     */
-    void loadFromFileAsync(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest);
-
-    /**
-     * @brief Loads the file that the lastLoadInfo currently points to into this instance.
-     * No-ops if the lastLoadInfo is missing the required info or the load fails.
-     * @return Whether the loaded succeeded.
-     */
-    bool reload();
-
-    /**
-     * @brief Loads a deck from a local file.
-     * @param fileName The file to load
-     * @param fmt The format of the file to load
-     * @param userRequest Whether the load was manually requested by the user, instead of being done in the background.
-     * @return An optional containing the LoadedDeck, or empty if the load failed.
-     */
-    static std::optional<LoadedDeck>
-    loadFromFile(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest = false);
-
-    /**
-     * @brief Loads a deck from the response of a remote deck request
-     * @param nativeString The deck string, in cod format
-     * @param remoteDeckId The remote deck id
-     * @return An optional containing the LoadedDeck, or empty if the load failed.
-     */
-    static std::optional<LoadedDeck> loadFromRemote(const QString &nativeString, int remoteDeckId);
-
-    /**
-     * @brief Saves a DeckList to a local file.
-     * @param deck The DeckList
-     * @param fileName The file to write to
-     * @param fmt The deck file format to use
-     * @return An optional containing the LoadInfo for the new file, or empty if the save failed.
-     */
-    static std::optional<LoadedDeck::LoadInfo>
-    saveToFile(const DeckList &deck, const QString &fileName, DeckFileFormat::Format fmt);
-
-    /**
-     * @brief Saves a LoadedDeck to a local file.
-     * Uses the lastLoadInfo in the LoadedDeck to determine where to save to.
-     * @param deck The LoadedDeck to save. Should have valid lastLoadInfo.
-     * @return Whether the save succeeded.
-     */
-    static bool saveToFile(const LoadedDeck &deck);
-
-    /**
-     * @brief Saves a LoadedDeck to a new local file.
-     * @param deck The LoadedDeck to save. Will update the lastLoadInfo.
-     * @param fileName The file to write to
-     * @param fmt The deck file format to use
-     * @return Whether the save succeeded.
-     */
-    static bool saveToNewFile(LoadedDeck &deck, const QString &fileName, DeckFileFormat::Format fmt);
-
-    static QString exportDeckToDecklist(const DeckList &deckList, DecklistWebsite website);
-
-    static void saveToClipboard(const DeckList &deckList, bool addComments = true, bool addSetNameAndNumber = true);
-    static bool saveToStream_Plain(QTextStream &out,
-                                   const DeckList &deckList,
-                                   bool addComments = true,
-                                   bool addSetNameAndNumber = true);
-
-    /**
-     * @brief Prints the decklist to the provided QPrinter.
-     * @param printer The printer to render the decklist to.
-     * @param deckList
-     */
-    static void printDeckList(QPrinter *printer, const DeckList &deckList);
-
-    /**
-     * Converts the given deck's file to the cockatrice file format.
-     * Uses the lastLoadInfo in the LoadedDeck to determine the current name of the file and where to save to.
-     * @param deck The deck to convert. Should have valid lastLoadInfo. Will update the lastLoadInfo.
-     * @return Whether the conversion succeeded.
-     */
-    static bool convertToCockatriceFormat(LoadedDeck &deck);
-
-    LoadedDeck &getDeck()
-    {
-        return loadedDeck;
-    }
-    const LoadedDeck &getDeck() const
-    {
-        return loadedDeck;
-    }
-    void setDeck(const LoadedDeck &deck)
-    {
-        loadedDeck = deck;
-    }
-
-private:
-    static bool updateLastLoadedTimestamp(LoadedDeck &deck);
-    static void printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node);
-    static void saveToStream_DeckHeader(QTextStream &out, const DeckList &deckList);
-
-    static void saveToStream_DeckZone(QTextStream &out,
-                                      const InnerDecklistNode *zoneNode,
-                                      bool addComments = true,
-                                      bool addSetNameAndNumber = true);
-    static void saveToStream_DeckZoneCards(QTextStream &out,
-                                           const InnerDecklistNode *zoneNode,
-                                           QList<DecklistCardNode *> cards,
-                                           bool addComments = true,
-                                           bool addSetNameAndNumber = true);
-};
-
-#endif
diff --git a/cockatrice/src/interface/deck_loader/loaded_deck.cpp b/cockatrice/src/interface/deck_loader/loaded_deck.cpp
deleted file mode 100644
index 633545718..000000000
--- a/cockatrice/src/interface/deck_loader/loaded_deck.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "loaded_deck.h"
-
-bool LoadedDeck::LoadInfo::isEmpty() const
-{
-    return fileName.isEmpty() && remoteDeckId == NON_REMOTE_ID;
-}
-
-bool LoadedDeck::isEmpty() const
-{
-    return deckList.isEmpty() && lastLoadInfo.isEmpty();
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/deck_loader/loaded_deck.h b/cockatrice/src/interface/deck_loader/loaded_deck.h
deleted file mode 100644
index e07cd0db6..000000000
--- a/cockatrice/src/interface/deck_loader/loaded_deck.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef COCKATRICE_LOADED_DECK_H
-#define COCKATRICE_LOADED_DECK_H
-
-#include "deck_file_format.h"
-#include "libcockatrice/deck_list/deck_list.h"
-
-#include <QString>
-
-/**
- * @brief Represents a deck that was loaded from somewhere.
- * Contains the DeckList itself, as well as info about where it was loaded from.
- */
-struct LoadedDeck
-{
-
-    /**
-     * @brief Information about where the deck was loaded from.
-     *
-     * For local decks, the remoteDeckId field will always be -1.
-     * For remote decks, fileName will be empty and fileFormat will always be CockatriceFormat
-     */
-    struct LoadInfo
-    {
-        static constexpr int NON_REMOTE_ID = -1;
-
-        QString fileName = "";
-        DeckFileFormat::Format fileFormat = DeckFileFormat::Cockatrice;
-        int remoteDeckId = NON_REMOTE_ID;
-
-        bool isEmpty() const;
-    };
-
-    DeckList deckList;          ///< The decklist itself
-    LoadInfo lastLoadInfo = {}; ///< info about where the deck was loaded from
-
-    bool isEmpty() const;
-};
-
-#endif // COCKATRICE_LOADED_DECK_H
diff --git a/cockatrice/src/interface/layouts/flow_layout.h b/cockatrice/src/interface/layouts/flow_layout.h
index cf109d260..19f696d1c 100644
--- a/cockatrice/src/interface/layouts/flow_layout.h
+++ b/cockatrice/src/interface/layouts/flow_layout.h
@@ -1,9 +1,3 @@
-/**
- * @file flow_layout.h
- * @ingroup UI
- * @brief TODO: Document this.
- */
-
 #ifndef FLOW_LAYOUT_H
 #define FLOW_LAYOUT_H
 
@@ -23,9 +17,9 @@ public:
     ~FlowLayout() override;
     void insertWidgetAtIndex(QWidget *toInsert, int index);
 
-    [[nodiscard]] QSize calculateMinimumSizeHorizontal() const;
-    [[nodiscard]] QSize calculateSizeHintVertical() const;
-    [[nodiscard]] QSize calculateMinimumSizeVertical() const;
+    QSize calculateMinimumSizeHorizontal() const;
+    QSize calculateSizeHintVertical() const;
+    QSize calculateMinimumSizeVertical() const;
     void addItem(QLayoutItem *item) override;
     [[nodiscard]] int count() const override;
     [[nodiscard]] QLayoutItem *itemAt(int index) const override;
@@ -48,7 +42,7 @@ public:
     void layoutSingleColumn(const QVector<QLayoutItem *> &colItems, int x, int y);
     [[nodiscard]] QSize sizeHint() const override;
     [[nodiscard]] QSize minimumSize() const override;
-    [[nodiscard]] QSize calculateSizeHintHorizontal() const;
+    QSize calculateSizeHintHorizontal() const;
 
 protected:
     QList<QLayoutItem *> items; // List to store layout items
diff --git a/cockatrice/src/interface/layouts/overlap_layout.h b/cockatrice/src/interface/layouts/overlap_layout.h
index 5844fca41..ab823222a 100644
--- a/cockatrice/src/interface/layouts/overlap_layout.h
+++ b/cockatrice/src/interface/layouts/overlap_layout.h
@@ -1,9 +1,3 @@
-/**
- * @file overlap_layout.h
- * @ingroup UI
- * @brief TODO: Document this.
- */
-
 #ifndef OVERLAP_LAYOUT_H
 #define OVERLAP_LAYOUT_H
 
@@ -27,18 +21,18 @@ public:
     void insertWidgetAtIndex(QWidget *toInsert, int index);
 
     void addItem(QLayoutItem *item) override;
-    [[nodiscard]] int count() const override;
-    [[nodiscard]] QLayoutItem *itemAt(int index) const override;
+    int count() const override;
+    QLayoutItem *itemAt(int index) const override;
     QLayoutItem *takeAt(int index) override;
     void setGeometry(const QRect &rect) override;
-    [[nodiscard]] QSize minimumSize() const override;
-    [[nodiscard]] QSize sizeHint() const override;
+    QSize minimumSize() const override;
+    QSize sizeHint() const override;
     void setMaxColumns(int _maxColumns);
     void setMaxRows(int _maxRows);
-    [[nodiscard]] int calculateMaxColumns() const;
-    [[nodiscard]] int calculateRowsForColumns(int columns) const;
-    [[nodiscard]] int calculateMaxRows() const;
-    [[nodiscard]] int calculateColumnsForRows(int rows) const;
+    int calculateMaxColumns() const;
+    int calculateRowsForColumns(int columns) const;
+    int calculateMaxRows() const;
+    int calculateColumnsForRows(int rows) const;
     void setDirection(Qt::Orientation _direction);
 
 private:
@@ -50,7 +44,7 @@ private:
     Qt::Orientation flowDirection;
 
     // Calculate the preferred size of the layout
-    [[nodiscard]] QSize calculatePreferredSize() const;
+    QSize calculatePreferredSize() const;
 };
 
 #endif // OVERLAP_LAYOUT_H
diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp b/cockatrice/src/interface/line_edit_completer.cpp
similarity index 99%
rename from cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
rename to cockatrice/src/interface/line_edit_completer.cpp
index 389e69d57..7820ad91b 100644
--- a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
+++ b/cockatrice/src/interface/line_edit_completer.cpp
@@ -3,6 +3,7 @@
 #include <QAbstractItemView>
 #include <QCompleter>
 #include <QFocusEvent>
+#include <QKeyEvent>
 #include <QScrollBar>
 #include <QStringListModel>
 #include <QTextCursor>
diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.h b/cockatrice/src/interface/line_edit_completer.h
similarity index 82%
rename from cockatrice/src/interface/widgets/utility/line_edit_completer.h
rename to cockatrice/src/interface/line_edit_completer.h
index 7b3756e3c..28b176665 100644
--- a/cockatrice/src/interface/widgets/utility/line_edit_completer.h
+++ b/cockatrice/src/interface/line_edit_completer.h
@@ -1,15 +1,11 @@
-/**
- * @file line_edit_completer.h
- * @ingroup UI
- * @brief TODO: Document this.
- */
-
 #ifndef LINEEDITCOMPLETER_H
 #define LINEEDITCOMPLETER_H
 
-#include "custom_line_edit.h"
+#include "../deck/custom_line_edit.h"
 
+#include <QFocusEvent>
 #include <QKeyEvent>
+#include <QStringList>
 
 class LineEditCompleter : public LineEditUnfocusable
 {
diff --git a/cockatrice/src/interface/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp
index 382fff317..25bd67264 100644
--- a/cockatrice/src/interface/pixel_map_generator.cpp
+++ b/cockatrice/src/interface/pixel_map_generator.cpp
@@ -1,12 +1,13 @@
 #include "pixel_map_generator.h"
 
+#include "pb/serverinfo_user.pb.h"
+
 #include <QApplication>
 #include <QDomDocument>
 #include <QFile>
 #include <QPainter>
 #include <QPalette>
 #include <QSvgRenderer>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 #define DEFAULT_COLOR_UNREGISTERED "#32c8ec";
 #define DEFAULT_COLOR_REGISTERED "#5ed900";
diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h
index 36d1e45f3..0380de5ee 100644
--- a/cockatrice/src/interface/pixel_map_generator.h
+++ b/cockatrice/src/interface/pixel_map_generator.h
@@ -1,18 +1,12 @@
-/**
- * @file pixel_map_generator.h
- * @ingroup UI
- * @brief TODO: Document this.
- */
-
 #ifndef PIXMAPGENERATOR_H
 #define PIXMAPGENERATOR_H
 
+#include "user_level.h"
+
 #include <QIcon>
 #include <QLoggingCategory>
 #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/widgets/menus/tearoff_menu.h b/cockatrice/src/interface/tearoff_menu.h
similarity index 86%
rename from cockatrice/src/interface/widgets/menus/tearoff_menu.h
rename to cockatrice/src/interface/tearoff_menu.h
index 3e6c47012..1c1258f5f 100644
--- a/cockatrice/src/interface/widgets/menus/tearoff_menu.h
+++ b/cockatrice/src/interface/tearoff_menu.h
@@ -1,12 +1,6 @@
-/**
- * @file tearoff_menu.h
- * @ingroup GameMenus
- * @brief TODO: Document this.
- */
-
 #pragma once
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 
 #include <QMenu>
 
diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp
index 19353b1e9..58a411c99 100644
--- a/cockatrice/src/interface/theme_manager.cpp
+++ b/cockatrice/src/interface/theme_manager.cpp
@@ -1,26 +1,15 @@
 #include "theme_manager.h"
 
-#include "../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 
 #include <QApplication>
 #include <QColor>
 #include <QDebug>
 #include <QLibraryInfo>
-#include <QMap>
-#include <QMetaEnum>
-#include <QPalette>
 #include <QPixmapCache>
 #include <QStandardPaths>
-#include <QString>
-#include <QStyle>
-#include <QStyleFactory>
-#include <QStyleHints>
-#include <Qt>
 
 #define NONE_THEME_NAME "Default"
-#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"
@@ -32,73 +21,9 @@ static const QColor PLAYERZONE_BG_DEFAULT = QColor(200, 200, 200);
 static const QColor STACKZONE_BG_DEFAULT = QColor(113, 43, 43);
 static const QStringList DEFAULT_RESOURCE_PATHS = {":/resources"};
 
-struct PaletteColorInfo
-{
-    QPalette::ColorGroup group;
-    QPalette::ColorRole role;
-    QColor color;
-};
-
-[[maybe_unused]] static inline QList<PaletteColorInfo> queryAllPaletteColors(const QPalette &palette = qApp->palette())
-{
-    QList<PaletteColorInfo> colors;
-
-    // Iterate through relevant color groups (Active, Disabled, Inactive)
-    const QList<QPalette::ColorGroup> groups = {QPalette::Active, QPalette::Disabled, QPalette::Inactive};
-
-    for (auto group : groups) {
-        // Iterate through all color roles (excluding NoRole and NColorRoles)
-        for (int r = 0; r < QPalette::NColorRoles; ++r) {
-            auto role = static_cast<QPalette::ColorRole>(r);
-            if (role == QPalette::NoRole)
-                continue;
-
-            PaletteColorInfo info;
-            info.group = group;
-            info.role = role;
-            info.color = palette.color(group, role);
-            colors.append(info);
-        }
-    }
-
-    return colors;
-}
-
-// Pretty print version
-[[maybe_unused]] static inline void printPaletteColors(const QPalette &palette = qApp->palette())
-{
-    QMetaEnum groupEnum = QMetaEnum::fromType<QPalette::ColorGroup>();
-    QMetaEnum roleEnum = QMetaEnum::fromType<QPalette::ColorRole>();
-
-    const QList<QPalette::ColorGroup> groups = {QPalette::Active, QPalette::Disabled, QPalette::Inactive};
-
-    for (auto group : groups) {
-        qInfo() << "\n===========" << groupEnum.valueToKey(group) << "===========";
-
-        for (int r = 0; r < QPalette::NColorRoles; ++r) {
-            auto role = static_cast<QPalette::ColorRole>(r);
-            if (role == QPalette::NoRole)
-                continue;
-
-            QColor color = palette.color(group, role);
-            qInfo().nospace() << qPrintable(QString("%1").arg(roleEnum.valueToKey(role), -20)) << " : "
-                              << qPrintable(color.name(QColor::HexArgb)) << " (RGBA: " << color.red() << ", "
-                              << color.green() << ", " << color.blue() << ", " << color.alpha() << ")";
-        }
-    }
-}
-
 ThemeManager::ThemeManager(QObject *parent) : QObject(parent)
 {
-    defaultStyleName = qApp->style()->objectName();
-    // FIXME 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);
-#endif
     connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, &ThemeManager::themeChangedSlot);
     themeChangedSlot();
 }
@@ -123,10 +48,6 @@ QStringMap &ThemeManager::getAvailableThemes()
     // load themes from user profile dir
     dir.setPath(SettingsCache::instance().getThemesPath());
 
-    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)) {
             availableThemes.insert(themeName, dir.absoluteFilePath(themeName));
@@ -181,145 +102,6 @@ QBrush ThemeManager::loadExtraBrush(QString fileName, QBrush &fallbackBrush)
     return brush;
 }
 
-static inline QPalette createDarkGreenFusionPalette()
-{
-    QPalette p = QStyleFactory::create("Fusion")->standardPalette();
-
-    // ---------- 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
-
-    // ---------- 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
-
-    // ---------- 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(0, 246, 82));        // #ff00f652
-    p.setColor(QPalette::LinkVisited, QColor(0, 211, 70)); // #ff00d346
-
-    // ---------- Accent (Qt 6) ----------
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0))
-    p.setColor(QPalette::Accent, QColor(0, 211, 70)); // #ff00d346
-#endif
-
-    // ---------- Bright text ----------
-    p.setColor(QPalette::BrightText, QColor(0, 246, 82)); // #ff00f652
-
-    // ---------- 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
-
-    // ---------- 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 = QStyleFactory::create("Fusion")->standardPalette();
-
-    // ---------- 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();
@@ -335,28 +117,6 @@ void ThemeManager::themeChangedSlot()
         qApp->setStyleSheet("");
     }
 
-    if (themeName == FUSION_THEME_NAME) {
-        QStyle *fusionStyle = QStyleFactory::create("Fusion");
-        qApp->setStyle(fusionStyle);
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
-        // Start from Fusion's own palette so dark mode is handled correctly,
-        // then apply any tweaks on top of it.
-        QPalette palette = fusionStyle->standardPalette();
-        if (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark) {
-            palette.setColor(QPalette::AlternateBase, QColor(53, 53, 53));
-        }
-        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(QStyleFactory::create(defaultStyleName)); // setting the style also sets the palette
-    }
-
     if (dirPath.isEmpty()) {
         // set default values
         QDir::setSearchPaths("theme", DEFAULT_RESOURCE_PATHS);
diff --git a/cockatrice/src/interface/theme_manager.h b/cockatrice/src/interface/theme_manager.h
index d942f0fef..20854b961 100644
--- a/cockatrice/src/interface/theme_manager.h
+++ b/cockatrice/src/interface/theme_manager.h
@@ -1,9 +1,3 @@
-/**
- * @file theme_manager.h
- * @ingroup CoreSettings
- * @brief TODO: Document this.
- */
-
 #ifndef THEMEMANAGER_H
 #define THEMEMANAGER_H
 
@@ -40,7 +34,6 @@ public:
     };
 
 private:
-    QString defaultStyleName;
     std::array<QBrush, Role::MaxRole + 1> brushes;
     QStringMap availableThemes;
     /*
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
index 1c38214bd..c00fd7cb2 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp
@@ -1,17 +1,38 @@
 #include "color_identity_widget.h"
 
-#include "../../../../client/settings/cache_settings.h"
+#include "../../../../settings/cache_settings.h"
 #include "mana_symbol_widget.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QPixmap>
 #include <QRegularExpression>
 #include <QResizeEvent>
 #include <QSize>
-#include <libcockatrice/utility/qt_utils.h>
 
-ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, const QString &_colorIdentity)
-    : QWidget(parent), colorIdentity(_colorIdentity)
+ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, CardInfoPtr _card) : QWidget(parent), card(_card)
+{
+    layout = new QHBoxLayout(this);
+    layout->setSpacing(5); // Small spacing between icons
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setAlignment(Qt::AlignCenter); // Ensure icons are centered
+    setLayout(layout);
+
+    // Define the full WUBRG set (White, Blue, Black, Red, Green)
+    QString fullColorIdentity = "WUBRG";
+
+    if (card) {
+        manaCost = card->getColors();                       // Get mana cost string
+        QStringList symbols = parseColorIdentity(manaCost); // Parse mana cost string
+
+        populateManaSymbolWidgets();
+    }
+    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageDrawUnusedColorIdentitiesChanged, this,
+            &ColorIdentityWidget::toggleUnusedVisibility);
+}
+
+ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, QString _manaCost)
+    : QWidget(parent), card(nullptr), manaCost(_manaCost)
 {
     layout = new QHBoxLayout(this);
     layout->setSpacing(5); // Small spacing between icons
@@ -25,21 +46,12 @@ ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, const QString &_colorI
             &ColorIdentityWidget::toggleUnusedVisibility);
 }
 
-ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, const CardInfoPtr &card)
-    : ColorIdentityWidget(parent, card->getColors())
-{
-}
-
 void ColorIdentityWidget::populateManaSymbolWidgets()
 {
     // Define the full WUBRG set (White, Blue, Black, Red, Green)
     QString fullColorIdentity = "WUBRG";
-    QStringList symbols = parseColorIdentity(colorIdentity); // Parse mana cost string
+    QStringList symbols = parseColorIdentity(manaCost); // Parse mana cost string
 
-    // clear old layout
-    QtUtils::clearLayoutRec(layout);
-
-    // populate mana symbols
     if (SettingsCache::instance().getVisualDeckStorageDrawUnusedColorIdentities()) {
         for (const QString symbol : fullColorIdentity) {
             auto *manaSymbol = new ManaSymbolWidget(this, symbol, symbols.contains(symbol));
@@ -53,18 +65,15 @@ void ColorIdentityWidget::populateManaSymbolWidgets()
     }
 }
 
-void ColorIdentityWidget::setColorIdentity(const QString &_colorIdentity)
-{
-    if (colorIdentity == _colorIdentity) {
-        return;
-    }
-
-    colorIdentity = _colorIdentity;
-    populateManaSymbolWidgets();
-}
-
 void ColorIdentityWidget::toggleUnusedVisibility()
 {
+    if (layout != nullptr) {
+        QLayoutItem *item;
+        while ((item = layout->takeAt(0)) != nullptr) {
+            item->widget()->deleteLater(); // Delete the widget
+            delete item;                   // Delete the layout item
+        }
+    }
     populateManaSymbolWidgets();
 }
 
@@ -89,12 +98,12 @@ void ColorIdentityWidget::resizeEvent(QResizeEvent *event)
     }
 }
 
-QStringList ColorIdentityWidget::parseColorIdentity(const QString &manaString)
+QStringList ColorIdentityWidget::parseColorIdentity(const QString &cmc)
 {
     QStringList symbols;
 
     // Handle split costs (e.g., "3U // 4UU")
-    QStringList splitCosts = manaString.split(" // ");
+    QStringList splitCosts = cmc.split(" // ");
     for (const QString &part : splitCosts) {
         QRegularExpression regex(R"(\{([^}]+)\}|(\d+)|([WUBRGCSPX]))");
         QRegularExpressionMatchIterator matches = regex.globalMatch(part);
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h
index 6512ba890..6a2f4c180 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h
+++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h
@@ -1,34 +1,28 @@
-/**
- * @file color_identity_widget.h
- * @ingroup CardExtraInfoWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef COLOR_IDENTITY_WIDGET_H
 #define COLOR_IDENTITY_WIDGET_H
 
+#include "../../../../card/card_info.h"
+
 #include <QHBoxLayout>
 #include <QWidget>
-#include <libcockatrice/card/card_info.h>
 
 class ColorIdentityWidget : public QWidget
 {
     Q_OBJECT
 public:
-    explicit ColorIdentityWidget(QWidget *parent, const QString &_colorIdentity = "");
-    explicit ColorIdentityWidget(QWidget *parent, const CardInfoPtr &card);
-
+    explicit ColorIdentityWidget(QWidget *parent, CardInfoPtr card);
+    explicit ColorIdentityWidget(QWidget *parent, QString manaCost);
     void populateManaSymbolWidgets();
 
-    static QStringList parseColorIdentity(const QString &manaString);
+    QStringList parseColorIdentity(const QString &manaString);
 
 public slots:
-    void setColorIdentity(const QString &_colorIdentity);
     void resizeEvent(QResizeEvent *event) override;
     void toggleUnusedVisibility();
 
 private:
-    QString colorIdentity;
+    CardInfoPtr card;
+    QString manaCost;
     QHBoxLayout *layout;
 };
 
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
index fcbb69c2e..e5d1127aa 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
@@ -4,6 +4,7 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QPixmap>
 #include <QResizeEvent>
 #include <QSize>
 #include <qregularexpression.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 26a186c59..e9d1ce20d 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h
@@ -1,15 +1,10 @@
-/**
- * @file mana_cost_widget.h
- * @ingroup CardExtraInfoWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef MANA_COST_WIDGET_H
 #define MANA_COST_WIDGET_H
 
+#include "../../../../card/card_info.h"
+
 #include <QHBoxLayout>
 #include <QWidget>
-#include <libcockatrice/card/card_info.h>
 
 class ManaCostWidget : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
index 07cc382ad..aae22190b 100644
--- a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
@@ -1,6 +1,6 @@
 #include "mana_symbol_widget.h"
 
-#include "../../../../client/settings/cache_settings.h"
+#include "../../../../settings/cache_settings.h"
 
 #include <QResizeEvent>
 
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h
index 8d2c6813f..02aaf6087 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,9 +1,3 @@
-/**
- * @file mana_symbol_widget.h
- * @ingroup CardExtraInfoWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef MANA_SYMBOL_WIDGET_H
 #define MANA_SYMBOL_WIDGET_H
 
@@ -20,18 +14,18 @@ public:
     void toggleSymbol();
     void setColorActive(bool active);
     void updateOpacity();
-    [[nodiscard]] bool isColorActive() const
+    bool isColorActive() const
     {
         return isActive;
-    }
-    [[nodiscard]] QString getSymbol() const
+    };
+    QString getSymbol() const
     {
         return symbol;
-    }
-    [[nodiscard]] QChar getSymbolChar() const
+    };
+    QChar getSymbolChar() const
     {
         return symbol[0];
-    }
+    };
 
     void loadManaIcon();
 
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 fa304816f..dcd4cc9aa 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
@@ -1,15 +1,15 @@
 #include "card_group_display_widget.h"
 
+#include "../../../../database/card_database_manager.h"
+#include "../../../../deck/deck_list_model.h"
+#include "../../../../utility/card_info_comparator.h"
+#include "../../../../utility/deck_list_sort_filter_proxy_model.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
 
 #include <QResizeEvent>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h>
 
 CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
                                                DeckListModel *_deckListModel,
-                                               QItemSelectionModel *_selectionModel,
                                                QPersistentModelIndex _trackedIndex,
                                                QString _zoneName,
                                                QString _cardGroupCategory,
@@ -17,8 +17,8 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
                                                QStringList _activeSortCriteria,
                                                int bannerOpacity,
                                                CardSizeWidget *_cardSizeWidget)
-    : QWidget(parent), deckListModel(_deckListModel), selectionModel(_selectionModel), trackedIndex(_trackedIndex),
-      zoneName(_zoneName), cardGroupCategory(_cardGroupCategory), activeGroupCriteria(_activeGroupCriteria),
+    : QWidget(parent), deckListModel(_deckListModel), trackedIndex(_trackedIndex), zoneName(_zoneName),
+      cardGroupCategory(_cardGroupCategory), activeGroupCriteria(_activeGroupCriteria),
       activeSortCriteria(_activeSortCriteria), cardSizeWidget(_cardSizeWidget)
 {
     layout = new QVBoxLayout(this);
@@ -32,122 +32,26 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
     CardGroupDisplayWidget::updateCardDisplays();
 
     connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
-    if (selectionModel) {
-        connect(selectionModel, &QItemSelectionModel::selectionChanged, this,
-                &CardGroupDisplayWidget::onSelectionChanged);
-    }
     connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);
-    connect(deckListModel, &QAbstractItemModel::dataChanged, this, &CardGroupDisplayWidget::onDataChanged);
 }
 
-// Just here so it can get overwritten in subclasses.
-void CardGroupDisplayWidget::resizeEvent(QResizeEvent *event)
+void CardGroupDisplayWidget::clearAllDisplayWidgets()
 {
-    QWidget::resizeEvent(event);
-}
-
-// =====================================================================================================================
-//                                                    User Interaction
-// =====================================================================================================================
-
-void CardGroupDisplayWidget::mousePressEvent(QMouseEvent *event)
-{
-    QWidget::mousePressEvent(event);
-    if (selectionModel) {
-        selectionModel->clearSelection();
+    for (auto idx : indexToWidgetMap.keys()) {
+        auto displayWidget = indexToWidgetMap.value(idx);
+        removeFromLayout(displayWidget);
+        indexToWidgetMap.remove(idx);
+        delete displayWidget;
     }
 }
 
-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());
-
-    for (auto &range : selected) {
-        for (int row = range.top(); row <= range.bottom(); ++row) {
-            QModelIndex idx = range.model()->index(row, 0, range.parent());
-
-            if (proxyModel) {
-                idx = proxyModel->mapToSource(idx);
-            }
-
-            auto it = indexToWidgetMap.find(QPersistentModelIndex(idx));
-            if (it != indexToWidgetMap.end()) {
-                // Highlight all copies of this card
-                for (auto widget : it.value()) {
-                    if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(widget)) {
-                        displayWidget->setHighlighted(true);
-                    }
-                }
-            }
-        }
-    }
-
-    for (auto &range : deselected) {
-        for (int row = range.top(); row <= range.bottom(); ++row) {
-            QModelIndex idx = range.model()->index(row, 0, range.parent());
-            if (proxyModel)
-                idx = proxyModel->mapToSource(idx);
-
-            auto it = indexToWidgetMap.find(QPersistentModelIndex(idx));
-            if (it != indexToWidgetMap.end()) {
-                // Un-highlight all copies of this card
-                for (auto widget : it.value()) {
-                    if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(widget)) {
-                        displayWidget->setHighlighted(false);
-                    }
-                }
-            }
-        }
-    }
-}
-
-void CardGroupDisplayWidget::refreshSelectionForIndex(const QPersistentModelIndex &persistent)
-{
-    if (!selectionModel || !indexToWidgetMap.contains(persistent)) {
-        return;
-    }
-
-    // Convert persistent index to regular index for selection check
-    QModelIndex idx = QModelIndex(persistent);
-
-    // Check if this index is selected
-    // We need to check against the selection model's model (which might be a proxy)
-    bool isSelected = false;
-    if (auto proxyModel = qobject_cast<QAbstractProxyModel *>(selectionModel->model())) {
-        // Map source index to proxy
-        QModelIndex proxyIdx = proxyModel->mapFromSource(idx);
-        isSelected = selectionModel->isSelected(proxyIdx);
-    } else {
-        isSelected = selectionModel->isSelected(idx);
-    }
-
-    // Apply selection state to all widgets for this index
-    for (auto widget : indexToWidgetMap[persistent]) {
-        if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(widget)) {
-            displayWidget->setHighlighted(isSelected);
-        }
-    }
-}
-
-// =====================================================================================================================
-//                                             Display Widget Management
-// =====================================================================================================================
-
 QWidget *CardGroupDisplayWidget::constructWidgetForIndex(QPersistentModelIndex index)
 {
-    auto cardName = index.sibling(index.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
-    auto cardProviderId =
-        index.sibling(index.row(), DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::EditRole).toString();
+    if (indexToWidgetMap.contains(index)) {
+        return indexToWidgetMap[index];
+    }
+    auto cardName = deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString();
+    auto cardProviderId = deckListModel->data(index.sibling(index.row(), 4), Qt::EditRole).toString();
 
     auto widget = new CardInfoPictureWithTextOverlayWidget(getLayoutParent(), true);
     widget->setScaleFactor(cardSizeWidget->getSlider()->value());
@@ -157,8 +61,7 @@ QWidget *CardGroupDisplayWidget::constructWidgetForIndex(QPersistentModelIndex i
     connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &CardGroupDisplayWidget::onHover);
     connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, widget, &CardInfoPictureWidget::setScaleFactor);
 
-    indexToWidgetMap[index].append(widget);
-
+    indexToWidgetMap.insert(index, widget);
     return widget;
 }
 
@@ -170,7 +73,7 @@ void CardGroupDisplayWidget::updateCardDisplays()
 
     // This doesn't really matter since overwrite the whole lessThan function to just compare dynamically anyway.
     proxy.setSortRole(Qt::EditRole);
-    proxy.sort(DeckListModelColumns::CARD_NAME, Qt::AscendingOrder);
+    proxy.sort(1, Qt::AscendingOrder);
 
     // 1. trackedIndex is a source index → map it to proxy space
     QModelIndex proxyParent = proxy.mapFromSource(trackedIndex);
@@ -185,33 +88,10 @@ void CardGroupDisplayWidget::updateCardDisplays()
         // 4. persist the source index
         QPersistentModelIndex persistent(sourceIndex);
 
-        // Get the card amount
-        int cardAmount =
-            sourceIndex.sibling(sourceIndex.row(), DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt();
-
-        // Create multiple widgets for the card count
-        for (int copy = 0; copy < cardAmount; ++copy) {
-            addToLayout(constructWidgetForIndex(persistent));
-        }
+        addToLayout(constructWidgetForIndex(persistent));
     }
 }
 
-void CardGroupDisplayWidget::clearAllDisplayWidgets()
-{
-    auto it = indexToWidgetMap.begin();
-    while (it != indexToWidgetMap.end()) {
-        for (auto displayWidget : it.value()) {
-            removeFromLayout(displayWidget);
-            delete displayWidget;
-        }
-        it = indexToWidgetMap.erase(it);
-    }
-}
-
-// =====================================================================================================================
-//                                           DeckListModel Signal Responses
-// =====================================================================================================================
-
 void CardGroupDisplayWidget::onCardAddition(const QModelIndex &parent, int first, int last)
 {
     if (!trackedIndex.isValid()) {
@@ -226,13 +106,7 @@ void CardGroupDisplayWidget::onCardAddition(const QModelIndex &parent, int first
             // Persist the index
             QPersistentModelIndex persistent(child);
 
-            // Get the card amount for the newly added card
-            int cardAmount = child.sibling(child.row(), DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt();
-
-            // Insert multiple copies
-            for (int copy = 0; copy < cardAmount; ++copy) {
-                insertIntoLayout(constructWidgetForIndex(persistent), row);
-            }
+            insertIntoLayout(constructWidgetForIndex(persistent), row);
         }
     }
 }
@@ -241,111 +115,18 @@ void CardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first,
 {
     Q_UNUSED(first);
     Q_UNUSED(last);
-
-    if (parent != trackedIndex) {
-        return;
-    }
-
-    // Use iterator so we can remove while iterating
-    auto it = indexToWidgetMap.begin();
-    while (it != indexToWidgetMap.end()) {
-        const QPersistentModelIndex &idx = it.key();
-        bool shouldRemove = !idx.isValid() || it.value().isEmpty();
-
-        if (shouldRemove) {
-            // Clean up widgets
-            for (auto widget : it.value()) {
-                removeFromLayout(widget);
-                widget->deleteLater();
-            }
-
-            // Erase and advance iterator
-            it = indexToWidgetMap.erase(it);
-        } else {
-            ++it;
-        }
-    }
-
-    if (!trackedIndex.isValid()) {
-        emit cleanupRequested(this);
-    }
-}
-
-void CardGroupDisplayWidget::onDataChanged(const QModelIndex &topLeft,
-                                           const QModelIndex &bottomRight,
-                                           const QVector<int> &roles)
-{
-    if (topLeft.parent() != trackedIndex && bottomRight.parent() != trackedIndex) {
-        return;
-    }
-
-    // Check if CARD_AMOUNT column changed
-    bool amountChanged = (topLeft.column() <= DeckListModelColumns::CARD_AMOUNT &&
-                          bottomRight.column() >= DeckListModelColumns::CARD_AMOUNT) ||
-                         roles.isEmpty() || roles.contains(Qt::EditRole);
-
-    if (!amountChanged) {
-        return;
-    }
-
-    // For each affected row, adjust widget count
-    for (int row = topLeft.row(); row <= bottomRight.row(); ++row) {
-        QModelIndex idx = deckListModel->index(row, 0, trackedIndex);
-
-        if (!idx.isValid()) {
-            continue;
-        }
-
-        QPersistentModelIndex persistent(idx);
-        int newAmount = idx.sibling(idx.row(), DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt();
-
-        // Get current widget count
-        int currentWidgetCount = indexToWidgetMap.contains(persistent) ? indexToWidgetMap.value(persistent).count() : 0;
-
-        if (newAmount == currentWidgetCount) {
-            // Still refresh selection even if count didn't change
-            refreshSelectionForIndex(persistent);
-            continue;
-        }
-
-        if (newAmount < currentWidgetCount) {
-            // Remove excess widgets
-            int toRemove = currentWidgetCount - newAmount;
-
-            for (int i = 0; i < toRemove; ++i) {
-                if (!indexToWidgetMap[persistent].isEmpty()) {
-                    QWidget *widget = indexToWidgetMap[persistent].takeLast();
-                    removeFromLayout(widget);
-                    widget->deleteLater();
-                }
-            }
-
-            // If all widgets removed, clean up the map entry
-            if (indexToWidgetMap[persistent].isEmpty()) {
-                indexToWidgetMap.remove(persistent);
-            }
-        } else {
-            int toAdd = newAmount - currentWidgetCount;
-            int insertBase = 0;
-
-            // Count widgets belonging to rows before this one
-            for (int r = 0; r < row; ++r) {
-                QModelIndex prevIdx = deckListModel->index(r, 0, trackedIndex);
-                QPersistentModelIndex prevPersistent(prevIdx);
-
-                if (indexToWidgetMap.contains(prevPersistent)) {
-                    insertBase += indexToWidgetMap.value(prevPersistent).size();
-                }
-            }
-
-            // Insert after existing copies of this card
-            for (int i = 0; i < toAdd; ++i) {
-                insertIntoLayout(constructWidgetForIndex(persistent), insertBase + currentWidgetCount + i);
+    if (parent == trackedIndex) {
+        for (const QPersistentModelIndex &idx : indexToWidgetMap.keys()) {
+            if (!idx.isValid()) {
+                removeFromLayout(indexToWidgetMap.value(idx));
+                indexToWidgetMap.value(idx)->deleteLater();
+                indexToWidgetMap.remove(idx);
             }
         }
 
-        // Always refresh selection state after modifying widgets
-        refreshSelectionForIndex(persistent);
+        if (!trackedIndex.isValid()) {
+            emit cleanupRequested(this);
+        }
     }
 }
 
@@ -355,4 +136,19 @@ void CardGroupDisplayWidget::onActiveSortCriteriaChanged(QStringList _activeSort
 
     clearAllDisplayWidgets();
     updateCardDisplays();
+}
+
+void CardGroupDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card)
+{
+    emit cardClicked(event, card);
+}
+
+void CardGroupDisplayWidget::onHover(const ExactCard &card)
+{
+    emit cardHovered(card);
+}
+
+void CardGroupDisplayWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
 }
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
index 0f1209b29..14ac494cf 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h
@@ -1,21 +1,15 @@
-/**
- * @file card_group_display_widget.h
- * @ingroup DeckEditorCardGroupWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_GROUP_DISPLAY_WIDGET_H
 #define CARD_GROUP_DISPLAY_WIDGET_H
 
+#include "../../../../card/card_info.h"
+#include "../../../../deck/deck_list_model.h"
 #include "../../general/display/banner_widget.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
 #include "../card_size_widget.h"
 
-#include <QItemSelectionModel>
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class CardGroupDisplayWidget : public QWidget
 {
@@ -24,7 +18,6 @@ class CardGroupDisplayWidget : public QWidget
 public:
     CardGroupDisplayWidget(QWidget *parent,
                            DeckListModel *deckListModel,
-                           QItemSelectionModel *selectionModel,
                            QPersistentModelIndex trackedIndex,
                            QString zoneName,
                            QString cardGroupCategory,
@@ -32,14 +25,11 @@ public:
                            QStringList activeSortCriteria,
                            int bannerOpacity,
                            CardSizeWidget *cardSizeWidget);
-    void onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
-    void refreshSelectionForIndex(const QPersistentModelIndex &persistent);
     void clearAllDisplayWidgets();
 
     DeckListModel *deckListModel;
-    QItemSelectionModel *selectionModel;
     QPersistentModelIndex trackedIndex;
-    QMap<QPersistentModelIndex, QList<QWidget *>> indexToWidgetMap;
+    QHash<QPersistentModelIndex, QWidget *> indexToWidgetMap;
     QString zoneName;
     QString cardGroupCategory;
     QString activeGroupCriteria;
@@ -47,14 +37,12 @@ public:
     CardSizeWidget *cardSizeWidget;
 
 public slots:
-    void mousePressEvent(QMouseEvent *event) override;
     void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card);
     void onHover(const ExactCard &card);
     virtual QWidget *constructWidgetForIndex(QPersistentModelIndex index);
     virtual void updateCardDisplays();
     virtual void onCardAddition(const QModelIndex &parent, int first, int last);
     virtual void onCardRemoval(const QModelIndex &parent, int first, int last);
-    void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
     void onActiveSortCriteriaChanged(QStringList activeSortCriteria);
     void resizeEvent(QResizeEvent *event) override;
 
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
index a192d13d8..391edb2da 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
@@ -1,13 +1,15 @@
 #include "flat_card_group_display_widget.h"
 
+#include "../../../../database/card_database_manager.h"
+#include "../../../../deck/deck_list_model.h"
+#include "../../../../utility/card_info_comparator.h"
+#include "../card_info_picture_with_text_overlay_widget.h"
+
 #include <QResizeEvent>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <utility>
 
 FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
                                                        DeckListModel *_deckListModel,
-                                                       QItemSelectionModel *_selectionModel,
                                                        QPersistentModelIndex _trackedIndex,
                                                        QString _zoneName,
                                                        QString _cardGroupCategory,
@@ -17,7 +19,6 @@ FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
                                                        CardSizeWidget *_cardSizeWidget)
     : CardGroupDisplayWidget(parent,
                              _deckListModel,
-                             _selectionModel,
                              std::move(_trackedIndex),
                              _zoneName,
                              _cardGroupCategory,
@@ -31,17 +32,13 @@ FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
 
     layout->addWidget(flowWidget);
 
-    // Clear all existing widgets
     for (const QPersistentModelIndex &idx : indexToWidgetMap.keys()) {
-        for (auto widget : indexToWidgetMap.value(idx)) {
-            FlatCardGroupDisplayWidget::removeFromLayout(widget);
-            widget->deleteLater();
-        }
+        FlatCardGroupDisplayWidget::removeFromLayout(indexToWidgetMap.value(idx));
+        indexToWidgetMap.value(idx)->deleteLater();
         indexToWidgetMap.remove(idx);
     }
 
     FlatCardGroupDisplayWidget::updateCardDisplays();
-
     disconnect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
     disconnect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);
 
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h
index e07152b34..0a0fe85ed 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,9 +1,3 @@
-/**
- * @file flat_card_group_display_widget.h
- * @ingroup DeckEditorCardGroupWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef FLAT_CARD_GROUP_DISPLAY_WIDGET_H
 #define FLAT_CARD_GROUP_DISPLAY_WIDGET_H
 
@@ -17,7 +11,6 @@ class FlatCardGroupDisplayWidget : public CardGroupDisplayWidget
 public:
     FlatCardGroupDisplayWidget(QWidget *parent,
                                DeckListModel *deckListModel,
-                               QItemSelectionModel *selectionModel,
                                QPersistentModelIndex trackedIndex,
                                QString zoneName,
                                QString cardGroupCategory,
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
index dca8ee2a5..c549ceefe 100644
--- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
@@ -1,12 +1,14 @@
 #include "overlapped_card_group_display_widget.h"
 
+#include "../../../../database/card_database_manager.h"
+#include "../../../../deck/deck_list_model.h"
+#include "../../../../utility/card_info_comparator.h"
+#include "../card_info_picture_with_text_overlay_widget.h"
+
 #include <QResizeEvent>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent,
                                                                    DeckListModel *_deckListModel,
-                                                                   QItemSelectionModel *_selectionModel,
                                                                    QPersistentModelIndex _trackedIndex,
                                                                    QString _zoneName,
                                                                    QString _cardGroupCategory,
@@ -16,7 +18,6 @@ OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *pare
                                                                    CardSizeWidget *_cardSizeWidget)
     : CardGroupDisplayWidget(parent,
                              _deckListModel,
-                             _selectionModel,
                              _trackedIndex,
                              _zoneName,
                              _cardGroupCategory,
@@ -30,12 +31,9 @@ OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *pare
 
     layout->addWidget(overlapWidget);
 
-    // Clear all existing widgets
     for (const QPersistentModelIndex &idx : indexToWidgetMap.keys()) {
-        for (auto widget : indexToWidgetMap.value(idx)) {
-            OverlappedCardGroupDisplayWidget::removeFromLayout(widget);
-            widget->deleteLater();
-        }
+        OverlappedCardGroupDisplayWidget::removeFromLayout(indexToWidgetMap.value(idx));
+        indexToWidgetMap.value(idx)->deleteLater();
         indexToWidgetMap.remove(idx);
     }
 
diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h
index 288e46129..0cba41172 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,9 +1,3 @@
-/**
- * @file overlapped_card_group_display_widget.h
- * @ingroup DeckEditorCardGroupWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef OVERLAPPED_CARD_GROUP_DISPLAY_WIDGET_H
 #define OVERLAPPED_CARD_GROUP_DISPLAY_WIDGET_H
 
@@ -17,7 +11,6 @@ class OverlappedCardGroupDisplayWidget : public CardGroupDisplayWidget
 public:
     OverlappedCardGroupDisplayWidget(QWidget *parent,
                                      DeckListModel *deckListModel,
-                                     QItemSelectionModel *selectionModel,
                                      QPersistentModelIndex trackedIndex,
                                      QString zoneName,
                                      QString cardGroupCategory,
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 4930fbbfd..d11590a05 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
@@ -1,16 +1,18 @@
 #include "card_info_display_widget.h"
 
+#include "../../../database/card_database_manager.h"
 #include "../../../game/board/card_item.h"
+#include "../../../main.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
 
 #include <QApplication>
 #include <QScreen>
 #include <QVBoxLayout>
-#include <libcockatrice/card/database/card_database_manager.h>
+#include <utility>
 
 CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *parent, Qt::WindowFlags flags)
-    : QFrame(parent, flags), aspectRatio(CardDimensions::HEIGHT_F / CardDimensions::WIDTH_F)
+    : QFrame(parent, flags), aspectRatio((qreal)CARD_HEIGHT / (qreal)CARD_WIDTH)
 {
     setContentsMargins(3, 3, 3, 3);
     pic = new CardInfoPictureWidget();
@@ -27,7 +29,7 @@ CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *pa
     layout->addWidget(text, 0, Qt::AlignCenter);
     setLayout(layout);
 
-    setFrameStyle(static_cast<int>(QFrame::Panel) | QFrame::Raised);
+    setFrameStyle(QFrame::Panel | QFrame::Raised);
 
     int pixmapHeight = QGuiApplication::primaryScreen()->geometry().height() / 3;
     int pixmapWidth = static_cast<int>(pixmapHeight / aspectRatio);
@@ -49,7 +51,7 @@ void CardInfoDisplayWidget::setCard(const ExactCard &card)
     if (exactCard)
         connect(exactCard.getCardPtr().data(), &QObject::destroyed, this, &CardInfoDisplayWidget::clear);
 
-    text->setCard(exactCard);
+    text->setCard(exactCard.getCardPtr());
     pic->setCard(exactCard);
 }
 
diff --git a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
index d44c4c205..070dcf835 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
@@ -1,17 +1,12 @@
-/**
- * @file card_info_display_widget.h
- * @ingroup CardWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef CARDINFOWIDGET_H
 #define CARDINFOWIDGET_H
 
+#include "../../../card/exact_card.h"
+#include "card_ref.h"
+
 #include <QComboBox>
 #include <QFrame>
 #include <QStringList>
-#include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/utility/card_ref.h>
 
 class CardInfoPictureWidget;
 class CardInfoTextWidget;
diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
index 21bee8f54..6168fe903 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
@@ -1,15 +1,15 @@
 #include "card_info_frame_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../database/card_database_manager.h"
 #include "../../../game/board/card_item.h"
+#include "../../../settings/cache_settings.h"
 #include "card_info_display_widget.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
 
 #include <QSplitter>
 #include <QVBoxLayout>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/relation/card_relation.h>
+#include <utility>
 
 CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent)
     : QTabWidget(parent), viewTransformationButton(nullptr), cardTextOnly(false)
@@ -154,7 +154,7 @@ void CardInfoFrameWidget::setCard(const ExactCard &card)
 
     setViewTransformationButtonVisibility(hasTransformation(exactCard.getInfo()));
 
-    text->setCard(exactCard);
+    text->setCard(exactCard.getCardPtr());
     pic->setCard(exactCard);
 }
 
diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
index 11b991e87..b23c447bf 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
@@ -1,16 +1,11 @@
-/**
- * @file card_info_frame_widget.h
- * @ingroup CardWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef CARDFRAME_H
 #define CARDFRAME_H
 
+#include "../../../card/exact_card.h"
+#include "card_ref.h"
+
 #include <QPushButton>
 #include <QTabWidget>
-#include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/utility/card_ref.h>
 
 class AbstractCardItem;
 class CardInfoPictureWidget;
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
index e5b0c4872..e7acabce9 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp
@@ -1,6 +1,6 @@
 #include "card_info_picture_art_crop_widget.h"
 
-#include "../../../interface/card_picture_loader/card_picture_loader.h"
+#include "../../../picture_loader/picture_loader.h"
 
 CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent)
     : CardInfoPictureWidget(parent, false, false)
@@ -8,17 +8,19 @@ CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent)
     hide();
 }
 
-QPixmap CardInfoPictureArtCropWidget::getBackground()
+QPixmap CardInfoPictureArtCropWidget::getProcessedBackground(const QSize &targetSize)
 {
     // Load the full-resolution card image, not a pre-scaled one
     QPixmap fullResPixmap;
     if (getCard()) {
-        CardPictureLoader::getPixmap(fullResPixmap, getCard(), QSize(745, 1040)); // or a high default size
+        PictureLoader::getPixmap(fullResPixmap, getCard(), QSize(745, 1040)); // or a high default size
     } else {
-        CardPictureLoader::getCardBackPixmap(fullResPixmap, QSize(745, 1040));
+        PictureLoader::getCardBackPixmap(fullResPixmap, QSize(745, 1040));
     }
+
+    // Fail-safe if loading failed
     if (fullResPixmap.isNull()) {
-        return QPixmap(); // return null qpixmap
+        return QPixmap(targetSize);
     }
 
     const QSize sz = fullResPixmap.size();
@@ -31,7 +33,9 @@ QPixmap CardInfoPictureArtCropWidget::getBackground()
 
     foilRect = foilRect.intersected(fullResPixmap.rect()); // always clamp to source bounds
 
-    // return full resolution image crop
+    // Crop first, then scale for best quality
     QPixmap cropped = fullResPixmap.copy(foilRect);
-    return cropped;
+    QPixmap scaled = cropped.scaled(targetSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+
+    return scaled;
 }
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 0185f758c..8b25af5a8 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,9 +1,3 @@
-/**
- * @file card_info_picture_art_crop_widget.h
- * @ingroup CardWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_INFO_PICTURE_ART_CROP_WIDGET_H
 #define CARD_INFO_PICTURE_ART_CROP_WIDGET_H
 
@@ -16,8 +10,8 @@ class CardInfoPictureArtCropWidget : public CardInfoPictureWidget
 public:
     explicit CardInfoPictureArtCropWidget(QWidget *parent = nullptr);
 
-    // Returns a cropped version of the pixmap
-    QPixmap getBackground();
+    // Returns a processed (cropped & scaled) version of the pixmap
+    QPixmap getProcessedBackground(const QSize &targetSize);
 };
 
 #endif // CARD_INFO_PICTURE_ART_CROP_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
index 185bb20d1..02ba37b74 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp
@@ -1,10 +1,11 @@
 #include "card_info_picture_enlarged_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../../interface/card_picture_loader/card_picture_loader.h"
+#include "../../../picture_loader/picture_loader.h"
+#include "../../../settings/cache_settings.h"
 
 #include <QPainterPath>
 #include <QStylePainter>
+#include <utility>
 
 /**
  * @brief Constructs a CardPictureEnlargedWidget.
@@ -33,13 +34,10 @@ CardInfoPictureEnlargedWidget::CardInfoPictureEnlargedWidget(QWidget *parent) :
  */
 void CardInfoPictureEnlargedWidget::loadPixmap(const QSize &size)
 {
-    // Handle DPI scaling
-    qreal dpr = devicePixelRatio();   // Get the actual scaling factor
-    QSize availableSize = size * dpr; // Convert to physical pixel size
     if (card) {
-        CardPictureLoader::getPixmap(enlargedPixmap, card, availableSize);
+        PictureLoader::getPixmap(enlargedPixmap, card, size);
     } else {
-        CardPictureLoader::getCardBackPixmap(enlargedPixmap, availableSize);
+        PictureLoader::getCardBackPixmap(enlargedPixmap, size);
     }
     pixmapDirty = false;
 }
@@ -80,35 +78,25 @@ void CardInfoPictureEnlargedWidget::paintEvent(QPaintEvent *event)
         loadPixmap(size());
     }
 
-    qreal dpr = enlargedPixmap.devicePixelRatio();
+    // Scale the size of the pixmap to fit the widget while maintaining the aspect ratio
+    QSize scaledSize = enlargedPixmap.size().scaled(size().width(), size().height(), Qt::KeepAspectRatio);
 
-    QSize logicalPixmapSize(enlargedPixmap.width() / dpr, enlargedPixmap.height() / dpr);
+    // Calculate the position to center the scaled pixmap
+    QPoint topLeft{(width() - scaledSize.width()) / 2, (height() - scaledSize.height()) / 2};
 
-    // Scale the pixmap to fit the widget (logical → logical)
-    QSize scaledLogicalSize = logicalPixmapSize.scaled(size(), Qt::KeepAspectRatio);
-
-    // Convert scaled logical size → physical size for scaled()
-    QSize scaledPhysicalSize = scaledLogicalSize * dpr;
-
-    // Pixmap scaled in PHYSICAL pixels
-    QPixmap finalPixmap = enlargedPixmap.scaled(scaledPhysicalSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-
-    finalPixmap.setDevicePixelRatio(dpr);
-
-    // Center inside widget
-    QPoint topLeft{(width() - scaledLogicalSize.width()) / 2, (height() - scaledLogicalSize.height()) / 2};
-
-    // Rounded corner radius based on logical width
-    qreal radius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * scaledLogicalSize.width() : 0.0;
+    // Define the radius for rounded corners
+    // Adjust the radius as needed for rounded corners
+    qreal radius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * scaledSize.width() : 0.;
 
     QStylePainter painter(this);
     // Fill the background with transparent color to ensure rounded corners are rendered properly
     painter.fillRect(rect(), Qt::transparent); // Use the transparent background
 
     QPainterPath shape;
-    shape.addRoundedRect(QRect(topLeft, scaledLogicalSize), radius, radius);
+    shape.addRoundedRect(QRect(topLeft, scaledSize), radius, radius);
     painter.setClipPath(shape); // Set the clipping path
 
     // Draw the pixmap scaled to the calculated size
-    painter.drawPixmap(QRect(topLeft, scaledLogicalSize), finalPixmap);
+    painter.drawItemPixmap(QRect(topLeft, scaledSize), Qt::AlignCenter,
+                           enlargedPixmap.scaled(scaledSize, Qt::KeepAspectRatio, Qt::SmoothTransformation));
 }
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h
index 10eb32940..6a2628847 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
@@ -1,15 +1,10 @@
-/**
- * @file card_info_picture_enlarged_widget.h
- * @ingroup CardWigets
- * @ingroup DeckEditorWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_PICTURE_ENLARGED_WIDGET_H
 #define CARD_PICTURE_ENLARGED_WIDGET_H
 
+#include "../../../card/exact_card.h"
+
+#include <QPixmap>
 #include <QWidget>
-#include <libcockatrice/card/printing/exact_card.h>
 
 class CardInfoPictureEnlargedWidget final : public QWidget
 {
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
index 555d69381..2375bc483 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
@@ -1,9 +1,10 @@
 #include "card_info_picture_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../database/card_database_manager.h"
 #include "../../../game/board/card_item.h"
-#include "../../../interface/card_picture_loader/card_picture_loader.h"
-#include "../../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../../picture_loader/picture_loader.h"
+#include "../../../settings/cache_settings.h"
+#include "../../../tabs/tab_supervisor.h"
 #include "../../window_main.h"
 
 #include <QMenu>
@@ -11,22 +12,8 @@
 #include <QScreen>
 #include <QStylePainter>
 #include <QWidget>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/relation/card_relation.h>
 #include <utility>
 
-static constexpr qreal MTG_CARD_ASPECT_RATIO = 1.396;
-// static constexpr qreal YUGIOH_CARD_ASPECT_RATIO = 1.457;
-static constexpr qreal ASPECT_RATIO = MTG_CARD_ASPECT_RATIO;
-
-static constexpr int BASE_WIDTH = 200;
-static constexpr int BASE_HEIGHT = 200;
-
-static constexpr int ENLARGED_PIXMAP_OFFSET = 10;
-
-static constexpr int HOVER_ACTIVATE_THRESHOLD_MS = 500;
-static constexpr int ANIMATION_OFFSET = 10; // Adjust this for how much the widget moves up
-
 /**
  * @class CardInfoPictureWidget
  * @brief Widget that displays an enlarged image of a card, loading the image based on the card's info or showing a
@@ -46,11 +33,15 @@ static constexpr int ANIMATION_OFFSET = 10; // Adjust this for how much the widg
 CardInfoPictureWidget::CardInfoPictureWidget(QWidget *parent, const bool _hoverToZoomEnabled, const bool _raiseOnEnter)
     : QWidget(parent), pixmapDirty(true), hoverToZoomEnabled(_hoverToZoomEnabled), raiseOnEnter(_raiseOnEnter)
 {
-    setMinimumHeight(BASE_HEIGHT);
+    setMinimumHeight(baseHeight);
     if (hoverToZoomEnabled) {
         setMouseTracking(true);
     }
 
+    enlargedPixmapWidget = new CardInfoPictureEnlargedWidget(this->window());
+    enlargedPixmapWidget->hide();
+    connect(this, &QObject::destroyed, enlargedPixmapWidget, &CardInfoPictureEnlargedWidget::deleteLater);
+
     hoverTimer = new QTimer(this);
     hoverTimer->setSingleShot(true);
     connect(hoverTimer, &QTimer::timeout, this, &CardInfoPictureWidget::showEnlargedPixmap);
@@ -59,12 +50,12 @@ CardInfoPictureWidget::CardInfoPictureWidget(QWidget *parent, const bool _hoverT
     originalPos = this->pos();
 
     // Create the animation
-    animation = new QPropertyAnimation(this, "pos", this);
+    animation = new QPropertyAnimation(this, "pos");
     animation->setDuration(200); // 200ms animation duration
     animation->setEasingCurve(QEasingCurve::OutQuad);
 
     animation->setStartValue(originalPos);
-    animation->setEndValue(originalPos - QPoint(0, ANIMATION_OFFSET));
+    animation->setEndValue(originalPos - QPoint(0, animationOffset));
 
     connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
         Q_UNUSED(_roundCardCorners);
@@ -131,8 +122,8 @@ void CardInfoPictureWidget::resizeEvent(QResizeEvent *event)
  */
 void CardInfoPictureWidget::setScaleFactor(const int scale)
 {
-    const int newWidth = BASE_WIDTH * scale / 100;
-    const int newHeight = static_cast<int>(newWidth * ASPECT_RATIO);
+    const int newWidth = baseWidth * scale / 100;
+    const int newHeight = static_cast<int>(newWidth * aspectRatio);
 
     scaleFactor = scale;
 
@@ -160,11 +151,11 @@ void CardInfoPictureWidget::updatePixmap()
  */
 void CardInfoPictureWidget::loadPixmap()
 {
-    CardPictureLoader::getCardBackLoadingInProgressPixmap(resizedPixmap, size());
+    PictureLoader::getCardBackLoadingInProgressPixmap(resizedPixmap, size());
     if (exactCard) {
-        CardPictureLoader::getPixmap(resizedPixmap, exactCard, size());
+        PictureLoader::getPixmap(resizedPixmap, exactCard, size());
     } else {
-        CardPictureLoader::getCardBackLoadingFailedPixmap(resizedPixmap, size());
+        PictureLoader::getCardBackLoadingFailedPixmap(resizedPixmap, size());
     }
 
     pixmapDirty = false;
@@ -191,7 +182,7 @@ void CardInfoPictureWidget::paintEvent(QPaintEvent *event)
 
     QPixmap transformedPixmap = resizedPixmap; // Default pixmap
     if (SettingsCache::instance().getAutoRotateSidewaysLayoutCards()) {
-        if (exactCard.getInfo().getUiAttributes().landscapeOrientation) {
+        if (exactCard.getInfo().getLandscapeOrientation()) {
             // Rotate pixmap 90 degrees to the left
             QTransform transform;
             transform.rotate(90);
@@ -238,8 +229,8 @@ void CardInfoPictureWidget::paintEvent(QPaintEvent *event)
  */
 QSize CardInfoPictureWidget::sizeHint() const
 {
-    return {static_cast<int>(BASE_WIDTH * scaleFactor / 100.0),
-            static_cast<int>(BASE_WIDTH * scaleFactor / 100.0 * ASPECT_RATIO)};
+    return {static_cast<int>(baseWidth * scaleFactor / 100.0),
+            static_cast<int>(baseWidth * scaleFactor / 100.0 * aspectRatio)};
 }
 
 /**
@@ -256,7 +247,7 @@ void CardInfoPictureWidget::enterEvent(QEvent *event)
 
     // If hover-to-zoom is enabled, start the hover timer
     if (hoverToZoomEnabled) {
-        hoverTimer->start(HOVER_ACTIVATE_THRESHOLD_MS);
+        hoverTimer->start(hoverActivateThresholdInMs);
     }
 
     // Emit signal indicating a card is being hovered on
@@ -268,7 +259,7 @@ void CardInfoPictureWidget::enterEvent(QEvent *event)
         } else {
             originalPos = this->pos(); // Update the baseline position
             animation->setStartValue(originalPos);
-            animation->setEndValue(originalPos - QPoint(0, ANIMATION_OFFSET));
+            animation->setEndValue(originalPos - QPoint(0, animationOffset));
         }
         animation->setDirection(QAbstractAnimation::Forward);
         animation->start();
@@ -285,7 +276,7 @@ void CardInfoPictureWidget::leaveEvent(QEvent *event)
 
     if (hoverToZoomEnabled) {
         hoverTimer->stop();
-        destroyEnlargedPixmapWidget();
+        enlargedPixmapWidget->hide();
     }
 
     if (raiseOnEnter) {
@@ -302,7 +293,7 @@ void CardInfoPictureWidget::moveEvent(QMoveEvent *event)
     QWidget::moveEvent(event);
 
     hoverTimer->stop();
-    destroyEnlargedPixmapWidget();
+    enlargedPixmapWidget->hide();
 
     if (animation->state() == QAbstractAnimation::Running) {
         return;
@@ -318,20 +309,20 @@ void CardInfoPictureWidget::mouseMoveEvent(QMouseEvent *event)
 {
     QWidget::mouseMoveEvent(event);
 
-    if (hoverToZoomEnabled && enlargedPixmapWidget && enlargedPixmapWidget->isVisible()) {
+    if (hoverToZoomEnabled && enlargedPixmapWidget->isVisible()) {
         const QPoint cursorPos = QCursor::pos();
         const QRect screenGeometry = QGuiApplication::screenAt(cursorPos)->geometry();
         const QSize widgetSize = enlargedPixmapWidget->size();
 
-        int newX = cursorPos.x() + ENLARGED_PIXMAP_OFFSET;
-        int newY = cursorPos.y() + ENLARGED_PIXMAP_OFFSET;
+        int newX = cursorPos.x() + enlargedPixmapOffset;
+        int newY = cursorPos.y() + enlargedPixmapOffset;
 
         // Adjust if out of bounds
         if (newX + widgetSize.width() > screenGeometry.right()) {
-            newX = cursorPos.x() - widgetSize.width() - ENLARGED_PIXMAP_OFFSET;
+            newX = cursorPos.x() - widgetSize.width() - enlargedPixmapOffset;
         }
         if (newY + widgetSize.height() > screenGeometry.bottom()) {
-            newY = cursorPos.y() - widgetSize.height() - ENLARGED_PIXMAP_OFFSET;
+            newY = cursorPos.y() - widgetSize.height() - enlargedPixmapOffset;
         }
 
         enlargedPixmapWidget->move(newX, newY);
@@ -343,14 +334,16 @@ void CardInfoPictureWidget::mousePressEvent(QMouseEvent *event)
     QWidget::mousePressEvent(event);
     if (event->button() == Qt::RightButton) {
         createRightClickMenu()->popup(QCursor::pos());
+    } else {
+        emit cardClicked();
     }
 
-    emit cardClicked(event);
+    emit cardClicked();
 }
 
 void CardInfoPictureWidget::hideEvent(QHideEvent *event)
 {
-    destroyEnlargedPixmapWidget();
+    enlargedPixmapWidget->hide();
     QWidget::hideEvent(event);
 }
 
@@ -450,45 +443,31 @@ QMenu *CardInfoPictureWidget::createAddToOpenDeckMenu()
  * If card information is available, the enlarged pixmap is loaded, positioned near the cursor,
  * and displayed.
  */
-void CardInfoPictureWidget::showEnlargedPixmap()
+void CardInfoPictureWidget::showEnlargedPixmap() const
 {
     if (!exactCard) {
         return;
     }
 
-    // Lazy creation of the enlarged widget
-    if (!enlargedPixmapWidget) {
-        enlargedPixmapWidget = new CardInfoPictureEnlargedWidget(const_cast<CardInfoPictureWidget *>(this)->window());
-        enlargedPixmapWidget->hide();
-        connect(this, &QObject::destroyed, enlargedPixmapWidget, &CardInfoPictureEnlargedWidget::deleteLater);
-    }
-
-    const QSize enlargedSize(static_cast<int>(size().width() * 2), static_cast<int>(size().width() * ASPECT_RATIO * 2));
+    const QSize enlargedSize(static_cast<int>(size().width() * 2), static_cast<int>(size().width() * aspectRatio * 2));
     enlargedPixmapWidget->setCardPixmap(exactCard, enlargedSize);
 
     const QPoint cursorPos = QCursor::pos();
     const QRect screenGeometry = QGuiApplication::screenAt(cursorPos)->geometry();
     const QSize widgetSize = enlargedPixmapWidget->size();
 
-    int newX = cursorPos.x() + ENLARGED_PIXMAP_OFFSET;
-    int newY = cursorPos.y() + ENLARGED_PIXMAP_OFFSET;
+    int newX = cursorPos.x() + enlargedPixmapOffset;
+    int newY = cursorPos.y() + enlargedPixmapOffset;
 
+    // Adjust if out of bounds
     if (newX + widgetSize.width() > screenGeometry.right()) {
-        newX = cursorPos.x() - widgetSize.width() - ENLARGED_PIXMAP_OFFSET;
+        newX = cursorPos.x() - widgetSize.width() - enlargedPixmapOffset;
     }
     if (newY + widgetSize.height() > screenGeometry.bottom()) {
-        newY = cursorPos.y() - widgetSize.height() - ENLARGED_PIXMAP_OFFSET;
+        newY = cursorPos.y() - widgetSize.height() - enlargedPixmapOffset;
     }
 
     enlargedPixmapWidget->move(newX, newY);
 
     enlargedPixmapWidget->show();
 }
-
-void CardInfoPictureWidget::destroyEnlargedPixmapWidget()
-{
-    if (enlargedPixmapWidget) {
-        enlargedPixmapWidget->deleteLater();
-        enlargedPixmapWidget = nullptr;
-    }
-}
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
index 5eb2d88d9..f70104898 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
@@ -1,17 +1,12 @@
-/**
- * @file card_info_picture_widget.h
- * @ingroup CardWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_INFO_PICTURE_H
 #define CARD_INFO_PICTURE_H
 
+#include "../../../card/exact_card.h"
 #include "card_info_picture_enlarged_widget.h"
 
 #include <QPropertyAnimation>
+#include <QTimer>
 #include <QWidget>
-#include <libcockatrice/card/printing/exact_card.h>
 
 inline Q_LOGGING_CATEGORY(CardInfoPictureWidgetLog, "card_info_picture_widget");
 
@@ -43,7 +38,7 @@ signals:
     void hoveredOnCard(const ExactCard &hoveredCard);
     void cardScaleFactorChanged(int _scale);
     void cardChanged(const ExactCard &card);
-    void cardClicked(QMouseEvent *event);
+    void cardClicked();
 
 protected:
     void resizeEvent(QResizeEvent *event) override;
@@ -63,22 +58,27 @@ protected:
     {
         return resizedPixmap;
     }
-    void showEnlargedPixmap();
-    void destroyEnlargedPixmapWidget();
+    void showEnlargedPixmap() const;
 
 private:
     ExactCard exactCard;
+    qreal magicTheGatheringCardAspectRatio = 1.396;
+    qreal yuGiOhCardAspectRatio = 1.457;
+    qreal aspectRatio = magicTheGatheringCardAspectRatio;
+    int baseWidth = 200;
+    int baseHeight = 200;
     double scaleFactor = 100;
     QPixmap resizedPixmap;
     bool pixmapDirty;
     bool hoverToZoomEnabled;
     bool raiseOnEnter;
-
+    int hoverActivateThresholdInMs = 500;
     CardInfoPictureEnlargedWidget *enlargedPixmapWidget = nullptr;
-
+    int enlargedPixmapOffset = 10;
     QTimer *hoverTimer;
     QPropertyAnimation *animation;
-    QPoint originalPos; // Store the original position
+    QPoint originalPos;             // Store the original position
+    const int animationOffset = 10; // Adjust this for how much the widget moves up
 
     QMenu *createRightClickMenu();
     QMenu *createViewRelatedCardsMenu();
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
index 2f0aeccfd..1545dc4f6 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
@@ -3,6 +3,7 @@
 #include <QFontMetrics>
 #include <QPainterPath>
 #include <QStylePainter>
+#include <QTextOption>
 
 /**
  * @brief Constructs a CardPictureWithTextOverlay widget.
@@ -24,7 +25,7 @@ CardInfoPictureWithTextOverlayWidget::CardInfoPictureWithTextOverlayWidget(QWidg
                                                                            const int fontSize,
                                                                            const Qt::Alignment alignment)
     : CardInfoPictureWidget(parent, hoverToZoomEnabled, raiseOnEnter), textColor(textColor), outlineColor(outlineColor),
-      fontSize(fontSize), textAlignment(alignment), highlighted(false)
+      fontSize(fontSize), textAlignment(alignment)
 {
     this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 }
@@ -81,16 +82,6 @@ void CardInfoPictureWithTextOverlayWidget::setTextAlignment(const Qt::Alignment
     update();
 }
 
-void CardInfoPictureWithTextOverlayWidget::setHighlighted(bool _highlighted)
-{
-    if (highlighted == _highlighted) {
-        return;
-    }
-
-    highlighted = _highlighted;
-    update();
-}
-
 void CardInfoPictureWithTextOverlayWidget::mousePressEvent(QMouseEvent *event)
 {
     emit imageClicked(event, this);
@@ -107,6 +98,11 @@ void CardInfoPictureWithTextOverlayWidget::paintEvent(QPaintEvent *event)
     // Call the base class's paintEvent to draw the card image
     CardInfoPictureWidget::paintEvent(event);
 
+    // If no overlay text, skip drawing the text
+    if (overlayText.isEmpty()) {
+        return;
+    }
+
     QStylePainter painter(this);
 
     // Get the pixmap from the base class using the getter
@@ -120,36 +116,6 @@ void CardInfoPictureWithTextOverlayWidget::paintEvent(QPaintEvent *event)
     const QPoint topLeft{(width() - scaledSize.width()) / 2, (height() - scaledSize.height()) / 2};
     const QRect pixmapRect(topLeft, scaledSize);
 
-    if (highlighted) {
-        painter.save();
-        painter.setRenderHint(QPainter::Antialiasing, true);
-
-        // Soft glow and border around the pixmap
-        const int padding = 4; // glow extends a little beyond image
-        QRect glowRect = pixmapRect.adjusted(-padding, -padding, padding, padding);
-
-        QPainterPath path;
-        int radius = 8; // rounded corners
-        path.addRoundedRect(glowRect, radius, radius);
-
-        // Soft outer glow
-        QColor glowColor(0, 150, 255, 80); // subtle blu
-        painter.setPen(QPen(glowColor, 6));
-        painter.drawPath(path);
-
-        // Thin inner border for crispness
-        QColor borderColor(0, 150, 255, 200);
-        painter.setPen(QPen(borderColor, 2));
-        painter.drawRoundedRect(pixmapRect, radius, radius);
-
-        painter.restore();
-    }
-
-    // If no overlay text, skip drawing the text
-    if (overlayText.isEmpty()) {
-        return;
-    }
-
     // Calculate the optimal font size
     QFont font = painter.font();
     int optimalFontSize = fontSize; // Start with the user-defined font size
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h
index eed827292..97cee1a8c 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
@@ -1,10 +1,3 @@
-/**
- * @file card_info_picture_with_text_overlay_widget.h
- * @ingroup CardWidgets
- * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_PICTURE_WITH_TEXT_OVERLAY_H
 #define CARD_PICTURE_WITH_TEXT_OVERLAY_H
 
@@ -32,7 +25,6 @@ public:
     void setOutlineColor(const QColor &color);
     void setFontSize(int size);
     void setTextAlignment(Qt::Alignment alignment);
-    void setHighlighted(bool _highlighted);
 
     [[nodiscard]] QSize sizeHint() const override;
 signals:
@@ -54,7 +46,6 @@ private:
     QColor outlineColor;
     int fontSize;
     Qt::Alignment textAlignment;
-    bool highlighted;
 };
 
 #endif // CARD_PICTURE_WITH_TEXT_OVERLAY_H
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 f5f343807..9f217f603 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
@@ -1,60 +1,36 @@
 #include "card_info_text_widget.h"
 
+#include "../../../card/game_specific_terms.h"
 #include "../../../game/board/card_item.h"
 
 #include <QGridLayout>
 #include <QLabel>
-#include <QScrollArea>
-#include <QScrollBar>
 #include <QTextEdit>
-#include <libcockatrice/card/game_specific_terms.h>
-#include <libcockatrice/card/relation/card_relation.h>
 
 CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent), info(nullptr)
 {
-    propsLabel = new QLabel;
-    propsLabel->setOpenExternalLinks(false);
-    propsLabel->setWordWrap(true);
-    connect(propsLabel, SIGNAL(linkActivated(const QString &)), this, SIGNAL(linkActivated(const QString &)));
+    nameLabel = new QLabel;
+    nameLabel->setOpenExternalLinks(false);
+    nameLabel->setWordWrap(true);
+    connect(nameLabel, SIGNAL(linkActivated(const QString &)), this, SIGNAL(linkActivated(const QString &)));
 
     textLabel = new QTextEdit();
     textLabel->setReadOnly(true);
-    textLabel->setMinimumSize(35, 35);
-
-    propsScroll = new QScrollArea(this);
-    propsScroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    propsScroll->setWidgetResizable(true);
-    propsScroll->setAlignment(Qt::AlignLeft | Qt::AlignTop);
-    propsScroll->setContentsMargins(0, 0, 0, 0);
-    propsScroll->setFrameStyle(QFrame::NoFrame);
-    propsScroll->setWidget(propsLabel);
-
-    // blend into normal background color, note that themes may override this!
-    propsScroll->viewport()->setStyleSheet("QWidget{background: transparent}");
 
     auto *grid = new QGridLayout(this);
-    grid->addWidget(propsScroll, 0, 0);
-    grid->addWidget(textLabel, 1, 0);
-    grid->setRowStretch(0, 2);
+    grid->addWidget(nameLabel, 0, 0);
+    grid->addWidget(textLabel, 1, 0, -1, 2);
     grid->setRowStretch(1, 1);
+    grid->setColumnStretch(1, 1);
 
     retranslateUi();
 }
 
-void CardInfoTextWidget::setTexts(const QString &propsText, const QString &textText)
+void CardInfoTextWidget::setCard(CardInfoPtr card)
 {
-    propsScroll->setMaximumHeight(0); // reset the max height, otherwise the scrollbar will blink in and out sometimes
-    propsLabel->setText(propsText);
-    propsScroll->setMinimumWidth(propsLabel->minimumWidth() + propsScroll->verticalScrollBar()->width());
-    propsScroll->setMaximumHeight(propsLabel->sizeHint().height());
-    textLabel->setText(textText);
-}
-
-void CardInfoTextWidget::setCard(const ExactCard &exactCard)
-{
-    auto card = exactCard.getCardPtr();
     if (card == nullptr) {
-        setTexts("", "");
+        nameLabel->setText("");
+        textLabel->setText("");
         return;
     }
 
@@ -62,15 +38,6 @@ 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()) {
-        QString setShort = exactCard.getPrinting().getSet()->getShortName().toHtmlEscaped();
-        QString cardNum = exactCard.getPrinting().getProperty("num").toHtmlEscaped();
-
-        text += QString("<tr><td>%1</td><td></td><td>%2</td></tr>").arg(tr("Set:"), setShort);
-
-        text += QString("<tr><td>%1</td><td></td><td>%2</td></tr>").arg(tr("Collector Number:"), cardNum);
-    }
-
     QStringList cardProps = card->getProperties();
     for (const QString &key : cardProps) {
         if (key.contains("-"))
@@ -93,12 +60,14 @@ void CardInfoTextWidget::setCard(const ExactCard &exactCard)
     }
 
     text += "</table>";
-    setTexts(text, card->getText());
+    nameLabel->setText(text);
+    textLabel->setText(card->getText());
 }
 
 void CardInfoTextWidget::setInvalidCardName(const QString &cardName)
 {
-    setTexts(tr("Unknown card:") + " " + cardName, "");
+    nameLabel->setText(tr("Unknown card:") + " " + cardName);
+    textLabel->setText("");
 }
 
 void CardInfoTextWidget::retranslateUi()
@@ -107,5 +76,5 @@ void CardInfoTextWidget::retranslateUi()
      * There's no way we can really translate the text currently being rendered.
      * The best we can do is invalidate the current text.
      */
-    setTexts("", "");
+    setInvalidCardName("");
 }
diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h
index 95b588882..903bd541f 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h
@@ -1,18 +1,10 @@
-/**
- * @file card_info_text_widget.h
- * @ingroup CardWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef CARDINFOTEXT_H
 #define CARDINFOTEXT_H
 
-#include "libcockatrice/card/printing/exact_card.h"
+#include "../../../card/card_info.h"
 
 #include <QFrame>
-#include <libcockatrice/card/card_info.h>
 class QLabel;
-class QScrollArea;
 class QTextEdit;
 
 class CardInfoTextWidget : public QFrame
@@ -20,11 +12,9 @@ class CardInfoTextWidget : public QFrame
     Q_OBJECT
 
 private:
-    QLabel *propsLabel;
-    QScrollArea *propsScroll;
+    QLabel *nameLabel;
     QTextEdit *textLabel;
     CardInfoPtr info;
-    void setTexts(const QString &propsText, const QString &textText);
 
 public:
     explicit CardInfoTextWidget(QWidget *parent = nullptr);
@@ -34,7 +24,7 @@ public:
 signals:
     void linkActivated(const QString &link);
 public slots:
-    void setCard(const ExactCard &card);
+    void setCard(CardInfoPtr card);
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
index 14e45743d..2b81b26d5 100644
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
@@ -1,5 +1,6 @@
 #include "card_size_widget.h"
 
+#include "../../../settings/cache_settings.h"
 #include "../printing_selector/printing_selector.h"
 #include "../visual_deck_storage/visual_deck_storage_widget.h"
 
diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.h b/cockatrice/src/interface/widgets/cards/card_size_widget.h
index 638c263ea..1631fa562 100644
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.h
@@ -1,11 +1,3 @@
-/**
- * @file card_size_widget.h
- * @ingroup CardWidgets
- * @ingroup DeckEditorWidgets
- * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #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 a8a97a4ca..4a8f55cab 100644
--- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
@@ -1,15 +1,14 @@
 #include "deck_card_zone_display_widget.h"
 
+#include "../../../deck/deck_list_model.h"
+#include "../../../utility/card_info_comparator.h"
 #include "card_group_display_widgets/flat_card_group_display_widget.h"
 #include "card_group_display_widgets/overlapped_card_group_display_widget.h"
-#include "libcockatrice/card/database/card_database_manager.h"
 
 #include <QResizeEvent>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                                                      DeckListModel *_deckListModel,
-                                                     QItemSelectionModel *_selectionModel,
                                                      QPersistentModelIndex _trackedIndex,
                                                      QString _zoneName,
                                                      QString _activeGroupCriteria,
@@ -18,12 +17,10 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                                                      int bannerOpacity,
                                                      int subBannerOpacity,
                                                      CardSizeWidget *_cardSizeWidget)
-    : QWidget(parent), deckListModel(_deckListModel), selectionModel(_selectionModel), trackedIndex(_trackedIndex),
-      zoneName(_zoneName), activeGroupCriteria(_activeGroupCriteria), activeSortCriteria(_activeSortCriteria),
-      displayType(_displayType), bannerOpacity(bannerOpacity), subBannerOpacity(subBannerOpacity),
-      cardSizeWidget(_cardSizeWidget)
+    : QWidget(parent), deckListModel(_deckListModel), trackedIndex(_trackedIndex), zoneName(_zoneName),
+      activeGroupCriteria(_activeGroupCriteria), activeSortCriteria(_activeSortCriteria), displayType(_displayType),
+      bannerOpacity(bannerOpacity), subBannerOpacity(subBannerOpacity), cardSizeWidget(_cardSizeWidget)
 {
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
@@ -40,65 +37,31 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
     displayCards();
 
     connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::onCategoryAddition);
-    if (selectionModel) {
-        connect(selectionModel, &QItemSelectionModel::selectionChanged, this,
-                &DeckCardZoneDisplayWidget::onSelectionChanged);
-    }
     connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &DeckCardZoneDisplayWidget::onCategoryRemoval);
 }
 
-// =====================================================================================================================
-//                                                    User Interaction
-// =====================================================================================================================
-
-void DeckCardZoneDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card)
+void DeckCardZoneDisplayWidget::cleanupInvalidCardGroup(CardGroupDisplayWidget *displayWidget)
 {
-    emit cardClicked(event, card, zoneName);
-}
-
-void DeckCardZoneDisplayWidget::onHover(const ExactCard &card)
-{
-    emit cardHovered(card);
-}
-
-void DeckCardZoneDisplayWidget::onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
-{
-    for (auto &range : selected) {
-        for (int row = range.top(); row <= range.bottom(); ++row) {
-            QModelIndex idx = range.model()->index(row, 0, range.parent());
-            auto it = indexToWidgetMap.find(QPersistentModelIndex(idx));
-            if (it != indexToWidgetMap.end()) {
-                // it.value()->setHighlighted(true);
-            }
-        }
-    }
-
-    for (auto &range : deselected) {
-        for (int row = range.top(); row <= range.bottom(); ++row) {
-            QModelIndex idx = range.model()->index(row, 0, range.parent());
-            auto it = indexToWidgetMap.find(QPersistentModelIndex(idx));
-            if (it != indexToWidgetMap.end()) {
-                // it.value()->setHighlighted(false);
-            }
+    cardGroupLayout->removeWidget(displayWidget);
+    displayWidget->setParent(nullptr);
+    for (auto idx : indexToWidgetMap.keys()) {
+        if (!idx.isValid()) {
+            indexToWidgetMap.remove(idx);
         }
     }
+    delete displayWidget;
 }
 
-// =====================================================================================================================
-//                                             Display Widget Management
-// =====================================================================================================================
-
 void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex index)
 {
+    auto categoryName = deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString();
     if (indexToWidgetMap.contains(index)) {
         return;
     }
-
-    auto categoryName = index.sibling(index.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
     if (displayType == DisplayType::Overlap) {
         auto *displayWidget = new OverlappedCardGroupDisplayWidget(
-            cardGroupContainer, deckListModel, selectionModel, index, zoneName, categoryName, activeGroupCriteria,
-            activeSortCriteria, subBannerOpacity, cardSizeWidget);
+            cardGroupContainer, deckListModel, index, zoneName, categoryName, activeGroupCriteria, activeSortCriteria,
+            subBannerOpacity, cardSizeWidget);
         connect(displayWidget, &OverlappedCardGroupDisplayWidget::cardClicked, this,
                 &DeckCardZoneDisplayWidget::onClick);
         connect(displayWidget, &OverlappedCardGroupDisplayWidget::cardHovered, this,
@@ -110,9 +73,9 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex
         cardGroupLayout->addWidget(displayWidget);
         indexToWidgetMap.insert(index, displayWidget);
     } else if (displayType == DisplayType::Flat) {
-        auto *displayWidget = new FlatCardGroupDisplayWidget(cardGroupContainer, deckListModel, selectionModel, index,
-                                                             zoneName, categoryName, activeGroupCriteria,
-                                                             activeSortCriteria, subBannerOpacity, cardSizeWidget);
+        auto *displayWidget =
+            new FlatCardGroupDisplayWidget(cardGroupContainer, deckListModel, index, zoneName, categoryName,
+                                           activeGroupCriteria, activeSortCriteria, subBannerOpacity, cardSizeWidget);
         connect(displayWidget, &FlatCardGroupDisplayWidget::cardClicked, this, &DeckCardZoneDisplayWidget::onClick);
         connect(displayWidget, &FlatCardGroupDisplayWidget::cardHovered, this, &DeckCardZoneDisplayWidget::onHover);
         connect(displayWidget, &CardGroupDisplayWidget::cleanupRequested, this,
@@ -129,7 +92,7 @@ void DeckCardZoneDisplayWidget::displayCards()
     QSortFilterProxyModel proxy;
     proxy.setSourceModel(deckListModel);
     proxy.setSortRole(Qt::EditRole);
-    proxy.sort(DeckListModelColumns::CARD_NAME, Qt::AscendingOrder);
+    proxy.sort(1, Qt::AscendingOrder);
 
     // 1. trackedIndex is a source index → map it to proxy space
     QModelIndex proxyParent = proxy.mapFromSource(trackedIndex);
@@ -148,45 +111,6 @@ void DeckCardZoneDisplayWidget::displayCards()
     }
 }
 
-void DeckCardZoneDisplayWidget::refreshDisplayType(const DisplayType &_displayType)
-{
-    displayType = _displayType;
-    QLayoutItem *item;
-    while ((item = cardGroupLayout->takeAt(0)) != nullptr) {
-        if (item->widget()) {
-            item->widget()->deleteLater();
-        } else if (item->layout()) {
-            item->layout()->deleteLater();
-        }
-        delete item;
-    }
-
-    indexToWidgetMap.clear();
-
-    // We gotta wait for all the deleteLater's to finish so we fire after the next event cycle
-
-    auto timer = new QTimer(this);
-    timer->setSingleShot(true);
-    connect(timer, &QTimer::timeout, this, [this]() { displayCards(); });
-    timer->start();
-}
-
-void DeckCardZoneDisplayWidget::cleanupInvalidCardGroup(CardGroupDisplayWidget *displayWidget)
-{
-    cardGroupLayout->removeWidget(displayWidget);
-    displayWidget->setParent(nullptr);
-    for (auto idx : indexToWidgetMap.keys()) {
-        if (!idx.isValid()) {
-            indexToWidgetMap.remove(idx);
-        }
-    }
-    delete displayWidget;
-}
-
-// =====================================================================================================================
-//                                           DeckListModel Signal Responses
-// =====================================================================================================================
-
 void DeckCardZoneDisplayWidget::onCategoryAddition(const QModelIndex &parent, int first, int last)
 {
     if (!trackedIndex.isValid()) {
@@ -219,6 +143,48 @@ void DeckCardZoneDisplayWidget::onCategoryRemoval(const QModelIndex &parent, int
     }
 }
 
+void DeckCardZoneDisplayWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    for (QObject *child : layout->children()) {
+        QWidget *widget = qobject_cast<QWidget *>(child);
+        if (widget) {
+            widget->setMaximumWidth(width());
+        }
+    }
+}
+void DeckCardZoneDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card)
+{
+    emit cardClicked(event, card, zoneName);
+}
+void DeckCardZoneDisplayWidget::onHover(const ExactCard &card)
+{
+    emit cardHovered(card);
+}
+
+void DeckCardZoneDisplayWidget::refreshDisplayType(const DisplayType &_displayType)
+{
+    displayType = _displayType;
+    QLayoutItem *item;
+    while ((item = cardGroupLayout->takeAt(0)) != nullptr) {
+        if (item->widget()) {
+            item->widget()->deleteLater();
+        } else if (item->layout()) {
+            item->layout()->deleteLater();
+        }
+        delete item;
+    }
+
+    indexToWidgetMap.clear();
+
+    // We gotta wait for all the deleteLater's to finish so we fire after the next event cycle
+
+    auto timer = new QTimer(this);
+    timer->setSingleShot(true);
+    connect(timer, &QTimer::timeout, this, [this]() { displayCards(); });
+    timer->start();
+}
+
 void DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged(QString _activeGroupCriteria)
 {
     activeGroupCriteria = _activeGroupCriteria;
@@ -235,13 +201,10 @@ QList<QString> DeckCardZoneDisplayWidget::getGroupCriteriaValueList()
 {
     QList<QString> groupCriteriaValues;
 
-    QList<const DecklistCardNode *> nodes = deckListModel->getCardNodesForZone(zoneName);
+    QList<ExactCard> cardsInZone = deckListModel->getCardsForZone(zoneName);
 
-    for (auto node : nodes) {
-        CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(node->getName());
-        if (info) {
-            groupCriteriaValues.append(info->getProperty(activeGroupCriteria));
-        }
+    for (const ExactCard &cardInZone : cardsInZone) {
+        groupCriteriaValues.append(cardInZone.getInfo().getProperty(activeGroupCriteria));
     }
 
     groupCriteriaValues.removeDuplicates();
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 dc0f3d734..e71d0792b 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,12 +1,8 @@
-/**
- * @file deck_card_zone_display_widget.h
- * @ingroup DeckEditorWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_CARD_ZONE_DISPLAY_WIDGET_H
 #define DECK_CARD_ZONE_DISPLAY_WIDGET_H
 
+#include "../../../card/card_info.h"
+#include "../../../deck/deck_list_model.h"
 #include "../general/display/banner_widget.h"
 #include "../general/layout_containers/overlap_widget.h"
 #include "../visual_deck_editor/visual_deck_editor_widget.h"
@@ -16,7 +12,6 @@
 
 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class DeckCardZoneDisplayWidget : public QWidget
 {
@@ -25,7 +20,6 @@ class DeckCardZoneDisplayWidget : public QWidget
 public:
     DeckCardZoneDisplayWidget(QWidget *parent,
                               DeckListModel *deckListModel,
-                              QItemSelectionModel *selectionModel,
                               QPersistentModelIndex trackedIndex,
                               QString zoneName,
                               QString activeGroupCriteria,
@@ -34,12 +28,11 @@ public:
                               int bannerOpacity,
                               int subBannerOpacity,
                               CardSizeWidget *_cardSizeWidget);
-    void onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
     DeckListModel *deckListModel;
-    QItemSelectionModel *selectionModel;
     QPersistentModelIndex trackedIndex;
     QString zoneName;
     void addCardsToOverlapWidget();
+    void resizeEvent(QResizeEvent *event) override;
 
 public slots:
     void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card);
diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
index b27fe274f..b284b3f05 100644
--- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
@@ -1,6 +1,6 @@
 #include "deck_preview_card_picture_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../settings/cache_settings.h"
 
 #include <QApplication>
 #include <QFileInfo>
@@ -8,6 +8,7 @@
 #include <QMouseEvent>
 #include <QPainterPath>
 #include <QStylePainter>
+#include <QTextOption>
 
 /**
  * @brief Constructs a CardPictureWithTextOverlay widget.
@@ -17,6 +18,7 @@
  * @param outlineColor The color of the outline around the text.
  * @param fontSize The font size of the overlay text.
  * @param alignment The alignment of the text within the overlay.
+ * @param _deckLoader The Deck Loader holding the Deck associated with this preview.
  *
  * Sets the widget's size policy and default border style.
  */
diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h
index acb67a49a..568ab0f51 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
@@ -1,10 +1,3 @@
-/**
- * @file deck_preview_card_picture_widget.h
- * @ingroup CardWidgets
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_PREVIEW_CARD_PICTURE_WIDGET_H
 #define DECK_PREVIEW_CARD_PICTURE_WIDGET_H
 
@@ -13,7 +6,6 @@
 #include <QColor>
 #include <QSize>
 #include <QTextOption>
-#include <QTimer>
 
 class DeckPreviewCardPictureWidget final : public CardInfoPictureWithTextOverlayWidget
 {
diff --git a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
deleted file mode 100644
index 089abc5c8..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "abstract_analytics_panel_widget.h"
-
-#include "deck_list_statistics_analyzer.h"
-
-#include <QPushButton>
-
-AbstractAnalyticsPanelWidget::AbstractAnalyticsPanelWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer)
-    : QWidget(parent), analyzer(analyzer)
-{
-    layout = new QVBoxLayout(this);
-
-    bannerAndSettingsContainer = new QWidget(this);
-
-    bannerAndSettingsLayout = new QHBoxLayout(bannerAndSettingsContainer);
-    bannerAndSettingsContainer->setLayout(bannerAndSettingsLayout);
-    bannerWidget = new BannerWidget(this, "Analytics Widget", Qt::Vertical, 100);
-    bannerWidget->setMaximumHeight(100);
-
-    bannerAndSettingsLayout->addWidget(bannerWidget, 1);
-
-    // config button
-    configureButton = new QPushButton(this);
-    configureButton->setIcon(QPixmap("theme:icons/cogwheel"));
-    configureButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-    connect(configureButton, &QPushButton::clicked, this, &AbstractAnalyticsPanelWidget::applyConfigFromDialog);
-    bannerAndSettingsLayout->addWidget(configureButton, 0);
-
-    layout->addWidget(bannerAndSettingsContainer);
-
-    connect(analyzer, &DeckListStatisticsAnalyzer::statsUpdated, this, &AbstractAnalyticsPanelWidget::updateDisplay);
-}
-
-bool AbstractAnalyticsPanelWidget::applyConfigFromDialog()
-{
-    QDialog *dlg = createConfigDialog(this);
-    if (!dlg) {
-        return false;
-    }
-
-    bool ok = dlg->exec() == QDialog::Accepted;
-    if (ok) {
-        // dialog must expose its final config as JSON
-        auto newCfg = extractConfigFromDialog(dlg);
-        loadConfig(newCfg);
-        updateDisplay();
-    }
-    dlg->deleteLater();
-    return ok;
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h
deleted file mode 100644
index 23374a9e1..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef COCKATRICE_DECK_ANALYTICS_WIDGET_BASE_H
-#define COCKATRICE_DECK_ANALYTICS_WIDGET_BASE_H
-
-#include "../general/display/banner_widget.h"
-
-#include <QDialog>
-#include <QJsonObject>
-#include <QVBoxLayout>
-#include <QWidget>
-
-class DeckListStatisticsAnalyzer;
-
-class AbstractAnalyticsPanelWidget : public QWidget
-{
-    Q_OBJECT
-public slots:
-    virtual void updateDisplay() = 0;
-    // Widgets must return a config dialog
-    virtual QDialog *createConfigDialog(QWidget *parent) = 0;
-
-public:
-    explicit AbstractAnalyticsPanelWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer);
-
-    void setDisplayTitle(const QString &title)
-    {
-        displayTitle = title;
-        if (bannerWidget) {
-            bannerWidget->setText(displayTitle);
-        }
-    }
-
-    QString displayTitleText() const
-    {
-        return displayTitle;
-    }
-
-    virtual QJsonObject saveConfig() const
-    {
-        return {};
-    }
-    virtual void loadConfig(const QJsonObject &)
-    {
-    }
-
-    // Unified helper to run config dialog and update widget
-    bool applyConfigFromDialog();
-
-    // Dialog → JSON must be supplied by each subclass
-    virtual QJsonObject extractConfigFromDialog(QDialog *dlg) const = 0;
-
-protected:
-    DeckListStatisticsAnalyzer *analyzer;
-    QVBoxLayout *layout;
-    QWidget *bannerAndSettingsContainer;
-    QHBoxLayout *bannerAndSettingsLayout;
-    QString displayTitle;
-    BannerWidget *bannerWidget;
-    QPushButton *configureButton;
-};
-
-#endif // COCKATRICE_DECK_ANALYTICS_WIDGET_BASE_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
deleted file mode 100644
index c83e6d982..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "add_analytics_panel_dialog.h"
-
-#include "analytics_panel_widget_factory.h"
-
-#include <QDialogButtonBox>
-#include <QVBoxLayout>
-
-AddAnalyticsPanelDialog::AddAnalyticsPanelDialog(QWidget *parent) : QDialog(parent)
-{
-    setWindowTitle(tr("Add Analytics Panel"));
-
-    layout = new QVBoxLayout(this);
-
-    typeCombo = new QComboBox(this);
-
-    // Populate using descriptors
-    const auto widgets = AnalyticsPanelWidgetFactory::instance().availableWidgets();
-
-    for (const auto &desc : widgets) {
-        // Show translated title to user
-        typeCombo->addItem(desc.title, desc.type);
-    }
-
-    layout->addWidget(typeCombo);
-
-    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
-
-    layout->addWidget(buttons);
-
-    connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h
deleted file mode 100644
index aa44734c2..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#ifndef COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
-#define COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
-
-#include "analytics_panel_widget_factory.h"
-
-#include <QComboBox>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QVBoxLayout>
-
-class AddAnalyticsPanelDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    explicit AddAnalyticsPanelDialog(QWidget *parent);
-
-    QString selectedType() const
-    {
-        return typeCombo->currentData().toString();
-    }
-
-private:
-    QVBoxLayout *layout;
-    QComboBox *typeCombo;
-    QDialogButtonBox *buttons;
-};
-
-#endif // COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
deleted file mode 100644
index 7af641689..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "analytics_panel_widget_factory.h"
-
-#include "abstract_analytics_panel_widget.h"
-
-AnalyticsPanelWidgetFactory &AnalyticsPanelWidgetFactory::instance()
-{
-    static AnalyticsPanelWidgetFactory f;
-    return f;
-}
-
-void AnalyticsPanelWidgetFactory::registerWidget(const Descriptor &desc)
-{
-    widgets.insert(desc.type, desc);
-}
-
-AbstractAnalyticsPanelWidget *
-AnalyticsPanelWidgetFactory::create(const QString &type, QWidget *parent, DeckListStatisticsAnalyzer *analyzer) const
-{
-    auto it = widgets.find(type);
-    if (it == widgets.end())
-        return nullptr;
-
-    auto w = it->creator(parent, analyzer);
-
-    w->setDisplayTitle(it->title);
-
-    return w;
-}
-
-QList<AnalyticsPanelWidgetFactory::Descriptor> AnalyticsPanelWidgetFactory::availableWidgets() const
-{
-    return widgets.values();
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h
deleted file mode 100644
index 6c5856d70..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef COCKATRICE_DECK_ANALYTICS_WIDGET_FACTORY_H
-#define COCKATRICE_DECK_ANALYTICS_WIDGET_FACTORY_H
-
-#include <QMap>
-#include <QString>
-#include <QStringList>
-#include <QWidget>
-#include <functional>
-
-class AbstractAnalyticsPanelWidget;
-class DeckListStatisticsAnalyzer;
-
-class AnalyticsPanelWidgetFactory
-{
-public:
-    using Creator = std::function<AbstractAnalyticsPanelWidget *(QWidget *, DeckListStatisticsAnalyzer *)>;
-
-    struct Descriptor
-    {
-        QString type;  // stable ID ("manaProdDevotion")
-        QString title; // translated, user-facing
-        Creator creator;
-    };
-
-    static AnalyticsPanelWidgetFactory &instance();
-
-    // NEW: richer registration
-    void registerWidget(const Descriptor &desc);
-
-    AbstractAnalyticsPanelWidget *
-    create(const QString &type, QWidget *parent, DeckListStatisticsAnalyzer *analyzer) const;
-
-    // NEW: expose widgets to UI
-    QList<Descriptor> availableWidgets() const;
-
-private:
-    AnalyticsPanelWidgetFactory() = default; // Ensure private constructor
-    AnalyticsPanelWidgetFactory(const AnalyticsPanelWidgetFactory &) = delete;
-    AnalyticsPanelWidgetFactory &operator=(const AnalyticsPanelWidgetFactory &) = delete;
-
-    QMap<QString, Descriptor> widgets;
-};
-
-#endif
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.cpp b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.cpp
deleted file mode 100644
index d4129a3d0..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "analytics_panel_widget_registrar.h"
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h
deleted file mode 100644
index 70d6df94f..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef COCKATRICE_DECK_ANALYTICS_WIDGET_REGISTRAR_H
-#define COCKATRICE_DECK_ANALYTICS_WIDGET_REGISTRAR_H
-
-#include "analytics_panel_widget_factory.h"
-
-class AnalyticsPanelWidgetRegistrar
-{
-public:
-    AnalyticsPanelWidgetRegistrar(const QString &type,
-                                  const QString &title,
-                                  AnalyticsPanelWidgetFactory::Creator creator)
-    {
-        AnalyticsPanelWidgetFactory::instance().registerWidget({type, title, creator});
-    }
-};
-
-#endif // COCKATRICE_DECK_ANALYTICS_WIDGET_REGISTRAR_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
deleted file mode 100644
index 51129a4b4..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "draw_probability_config.h"
-
-QJsonObject DrawProbabilityConfig::toJson() const
-{
-    QJsonObject o;
-    o["criteria"] = criteria;
-    o["atLeast"] = atLeast;
-    o["quantity"] = quantity;
-    o["drawn"] = drawn;
-    return o;
-}
-DrawProbabilityConfig DrawProbabilityConfig::fromJson(const QJsonObject &o)
-{
-    DrawProbabilityConfig cfg;
-    if (o.contains("criteria")) {
-        cfg.criteria = o["criteria"].toString();
-    }
-    if (o.contains("atLeast")) {
-        cfg.atLeast = o["atLeast"].toBool(true);
-    }
-    if (o.contains("quantity")) {
-        cfg.quantity = o["quantity"].toInt(1);
-    }
-    if (o.contains("drawn")) {
-        cfg.drawn = o["drawn"].toInt(7);
-    }
-    return cfg;
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.h
deleted file mode 100644
index bbe61a68e..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef COCKATRICE_DRAW_PROBABILITY_CONFIG_H
-#define COCKATRICE_DRAW_PROBABILITY_CONFIG_H
-
-#include <QJsonObject>
-#include <QString>
-
-struct DrawProbabilityConfig
-{
-    QString criteria = "name"; // name, type, subtype, cmc
-    bool atLeast = true;       // true = at least, false = exactly
-    int quantity = 1;          // N
-    int drawn = 7;             // M
-
-    QJsonObject toJson() const;
-
-    static DrawProbabilityConfig fromJson(const QJsonObject &o);
-};
-
-#endif
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
deleted file mode 100644
index 71f88c0fc..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "draw_probability_config_dialog.h"
-
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QLabel>
-#include <QSpinBox>
-
-DrawProbabilityConfigDialog::DrawProbabilityConfigDialog(QWidget *parent) : QDialog(parent)
-{
-    form = new QFormLayout(this);
-
-    // Criteria
-    labelCriteria = new QLabel(this);
-    criteria = new QComboBox(this);
-    criteria->addItem(QString(), "name");
-    criteria->addItem(QString(), "type");
-    criteria->addItem(QString(), "subtype");
-    criteria->addItem(QString(), "cmc");
-    form->addRow(labelCriteria, criteria);
-
-    // Exactness
-    labelExactness = new QLabel(this);
-    exactness = new QComboBox(this);
-    exactness->addItem(QString(), true);
-    exactness->addItem(QString(), false);
-    form->addRow(labelExactness, exactness);
-
-    // Quantity
-    labelQuantity = new QLabel(this);
-    quantity = new QSpinBox(this);
-    quantity->setRange(1, 60);
-    form->addRow(labelQuantity, quantity);
-
-    // Drawn
-    labelDrawn = new QLabel(this);
-    drawn = new QSpinBox(this);
-    drawn->setRange(1, 60);
-    drawn->setValue(7);
-    form->addRow(labelDrawn, drawn);
-
-    // Button box
-    auto *bb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
-    form->addWidget(bb);
-
-    connect(bb, &QDialogButtonBox::accepted, this, &DrawProbabilityConfigDialog::accept);
-    connect(bb, &QDialogButtonBox::rejected, this, &QDialog::reject);
-
-    retranslateUi();
-}
-
-void DrawProbabilityConfigDialog::retranslateUi()
-{
-    setWindowTitle(tr("Draw Probability Settings"));
-
-    labelCriteria->setText(tr("Criteria:"));
-    criteria->setItemText(0, tr("Card Name"));
-    criteria->setItemText(1, tr("Type"));
-    criteria->setItemText(2, tr("Subtype"));
-    criteria->setItemText(3, tr("Mana Value"));
-
-    labelExactness->setText(tr("Exactness:"));
-    exactness->setItemText(0, tr("At least"));
-    exactness->setItemText(1, tr("Exactly"));
-
-    labelQuantity->setText(tr("Quantity (N):"));
-    labelDrawn->setText(tr("Cards drawn (M):"));
-
-    // i18n-friendly suffixes
-    quantity->setSuffix(tr(" cards"));
-    drawn->setSuffix(tr(" cards"));
-}
-
-void DrawProbabilityConfigDialog::setFromConfig(const DrawProbabilityConfig &_config)
-{
-    cfg = _config;
-
-    criteria->setCurrentIndex(criteria->findData(_config.criteria));
-    exactness->setCurrentIndex(exactness->findData(_config.atLeast));
-    quantity->setValue(_config.quantity);
-    drawn->setValue(_config.drawn);
-}
-
-void DrawProbabilityConfigDialog::accept()
-{
-    cfg.criteria = criteria->currentData().toString();
-    cfg.atLeast = exactness->currentData().toBool();
-    cfg.quantity = quantity->value();
-    cfg.drawn = drawn->value();
-
-    QDialog::accept();
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h
deleted file mode 100644
index 44b1f0eec..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include "draw_probability_config.h"
-
-#include <QDialog>
-#include <QFormLayout>
-
-class QComboBox;
-class QSpinBox;
-class QLabel;
-
-class DrawProbabilityConfigDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    explicit DrawProbabilityConfigDialog(QWidget *parent = nullptr);
-
-    void retranslateUi();
-
-    void setFromConfig(const DrawProbabilityConfig &_config);
-    DrawProbabilityConfig result() const
-    {
-        return cfg;
-    }
-
-protected:
-    void accept() override;
-
-private:
-    DrawProbabilityConfig cfg;
-
-    QFormLayout *form;
-
-    // Widgets
-    QComboBox *criteria;
-    QComboBox *exactness;
-    QSpinBox *quantity;
-    QSpinBox *drawn;
-
-    QLabel *labelCriteria;
-    QLabel *labelExactness;
-    QLabel *labelQuantity;
-    QLabel *labelDrawn;
-};
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
deleted file mode 100644
index 4931aeaa4..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-#include "draw_probability_widget.h"
-
-#include "draw_probability_config_dialog.h"
-
-#include <QComboBox>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QHBoxLayout>
-#include <QHeaderView>
-#include <QLabel>
-#include <QMap>
-#include <QSpinBox>
-#include <QTableWidgetItem>
-#include <QWidget>
-#include <QtMath>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-
-DrawProbabilityWidget::DrawProbabilityWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer)
-    : AbstractAnalyticsPanelWidget(parent, analyzer)
-{
-    controls = new QWidget(this);
-    controlLayout = new QHBoxLayout(controls);
-    controlLayout->setContentsMargins(11, 0, 11, 0);
-
-    labelPrefix = new QLabel(this);
-    controlLayout->addWidget(labelPrefix);
-
-    criteriaCombo = new QComboBox(this);
-    // Give these things item-data so we can translate the actual user-facing strings
-    criteriaCombo->addItem(QString(), "name");
-    criteriaCombo->addItem(QString(), "type");
-    criteriaCombo->addItem(QString(), "subtype");
-    criteriaCombo->addItem(QString(), "cmc");
-    controlLayout->addWidget(criteriaCombo);
-
-    exactnessCombo = new QComboBox(this);
-    exactnessCombo->addItem(QString(), true);  // At least
-    exactnessCombo->addItem(QString(), false); // Exactly
-    controlLayout->addWidget(exactnessCombo);
-
-    quantitySpin = new QSpinBox(this);
-    quantitySpin->setRange(1, 60);
-    controlLayout->addWidget(quantitySpin);
-
-    labelMiddle = new QLabel(this);
-    controlLayout->addWidget(labelMiddle);
-
-    drawnSpin = new QSpinBox(this);
-    drawnSpin->setRange(1, 60);
-    drawnSpin->setValue(7);
-    controlLayout->addWidget(drawnSpin);
-
-    labelSuffix = new QLabel(this);
-    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
-    resultTable = new QTableWidget(this);
-    resultTable->setColumnCount(3);
-    resultTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
-    resultTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
-    layout->addWidget(resultTable);
-
-    // Connections
-    connect(criteriaCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this] {
-        config.criteria = criteriaCombo->currentData().toString();
-        updateDisplay();
-    });
-
-    connect(exactnessCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this] {
-        config.atLeast = exactnessCombo->currentData().toBool();
-        updateDisplay();
-    });
-
-    connect(quantitySpin, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int v) {
-        config.quantity = v;
-        updateDisplay();
-    });
-
-    connect(drawnSpin, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int v) {
-        config.drawn = v;
-        updateDisplay();
-    });
-
-    retranslateUi();
-    applyConfigToToolbar();
-    updateFilterOptions();
-}
-
-void DrawProbabilityWidget::retranslateUi()
-{
-    bannerWidget->setText(tr("Draw Probability"));
-
-    labelPrefix->setText(tr("Probability of drawing"));
-
-    criteriaCombo->setItemText(0, tr("Card Name"));
-    criteriaCombo->setItemText(1, tr("Type"));
-    criteriaCombo->setItemText(2, tr("Subtype"));
-    criteriaCombo->setItemText(3, tr("Mana Value"));
-
-    exactnessCombo->setItemText(0, tr("At least"));
-    exactnessCombo->setItemText(1, tr("Exactly"));
-
-    labelMiddle->setText(tr("card(s) having drawn at least"));
-    labelSuffix->setText(tr("cards"));
-
-    resultTable->setHorizontalHeaderLabels({tr("Category"), tr("Qty"), tr("Odds (%)")});
-}
-
-QDialog *DrawProbabilityWidget::createConfigDialog(QWidget *parent)
-{
-    auto *dlg = new DrawProbabilityConfigDialog(parent);
-    dlg->setFromConfig(config);
-    return dlg;
-}
-
-QJsonObject DrawProbabilityWidget::extractConfigFromDialog(QDialog *dlg) const
-{
-    auto *dp = qobject_cast<DrawProbabilityConfigDialog *>(dlg);
-    return dp ? dp->result().toJson() : QJsonObject{};
-}
-
-void DrawProbabilityWidget::applyConfigToToolbar()
-{
-    auto setComboByData = [](QComboBox *combo, const QVariant &value) {
-        int idx = combo->findData(value);
-        if (idx >= 0) {
-            combo->setCurrentIndex(idx);
-        }
-    };
-
-    setComboByData(criteriaCombo, config.criteria);
-    setComboByData(exactnessCombo, config.atLeast);
-
-    quantitySpin->setValue(config.quantity);
-    drawnSpin->setValue(config.drawn);
-}
-
-void DrawProbabilityWidget::updateDisplay()
-{
-    updateFilterOptions();
-}
-
-void DrawProbabilityWidget::loadConfig(const QJsonObject &cfg)
-{
-    config = DrawProbabilityConfig::fromJson(cfg);
-    applyConfigToToolbar();
-    updateFilterOptions();
-}
-
-void DrawProbabilityWidget::updateFilterOptions()
-{
-    if (!analyzer->getModel()->getDeckList()) {
-        return;
-    }
-
-    const QString criteria = config.criteria;
-    const bool atLeast = config.atLeast;
-    const int quantity = config.quantity;
-    const int drawn = config.drawn;
-
-    QMap<QString, int> categoryCounts;
-    int totalDeckCards = 0;
-
-    const auto nodes = analyzer->getModel()->getCardNodes();
-    for (auto *node : nodes) {
-        CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(node->getName());
-        if (!info) {
-            continue;
-        }
-
-        totalDeckCards += node->getNumber();
-
-        QStringList categories;
-        if (criteria == "name") {
-            categories << info->getName();
-        } else if (criteria == "type") {
-            categories = info->getMainCardType().split(' ', Qt::SkipEmptyParts);
-        } else if (criteria == "subtype") {
-            categories = info->getCardType().split(' ', Qt::SkipEmptyParts);
-        } else if (criteria == "cmc") {
-            categories << QString::number(info->getCmc().toInt());
-        }
-
-        for (const QString &cat : categories) {
-            categoryCounts[cat] += node->getNumber();
-        }
-    }
-
-    resultTable->setRowCount(categoryCounts.size());
-
-    int row = 0;
-    for (auto it = categoryCounts.cbegin(); it != categoryCounts.cend(); ++it, ++row) {
-        const QString &cat = it.key();
-        const int copies = it.value();
-
-        double probability = 0.0;
-        if (atLeast) {
-            for (int k = quantity; k <= drawn && k <= copies; ++k) {
-                probability += hypergeometricProbability(totalDeckCards, copies, drawn, k);
-            }
-        } else {
-            probability = hypergeometricProbability(totalDeckCards, copies, drawn, quantity);
-        }
-
-        resultTable->setItem(row, 0, new QTableWidgetItem(cat));
-        resultTable->setItem(row, 1, new QTableWidgetItem(QString::number(copies)));
-        resultTable->setItem(row, 2, new QTableWidgetItem(QString::number(probability * 100.0, 'f', 2)));
-    }
-}
-
-double DrawProbabilityWidget::hypergeometricProbability(int N, int K, int n, int k)
-{
-    if (k < 0 || k > n || K > N || n > N) {
-        return 0.0;
-    }
-
-    double logP = 0.0;
-    for (int i = 1; i <= k; ++i) {
-        logP += qLn(double(K - k + i) / i);
-    }
-    for (int i = 1; i <= n - k; ++i) {
-        logP += qLn(double(N - K - (n - k) + i) / i);
-    }
-    for (int i = 1; i <= n; ++i) {
-        logP -= qLn(double(N - n + i) / i);
-    }
-
-    return qExp(logP);
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
deleted file mode 100644
index 80015999f..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef COCKATRICE_DRAW_PROBABILITY_WIDGET_H
-#define COCKATRICE_DRAW_PROBABILITY_WIDGET_H
-
-#include "../../abstract_analytics_panel_widget.h"
-#include "../../deck_list_statistics_analyzer.h"
-#include "draw_probability_config.h"
-
-#include <QComboBox>
-#include <QLineEdit>
-#include <QSpinBox>
-#include <QTableWidget>
-
-class DrawProbabilityWidget : public AbstractAnalyticsPanelWidget
-{
-    Q_OBJECT
-public:
-    DrawProbabilityWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer);
-
-    QDialog *createConfigDialog(QWidget *parent) override;
-    QJsonObject extractConfigFromDialog(QDialog *dlg) const override;
-    void applyConfigToToolbar();
-
-public slots:
-    void updateDisplay() override;
-    void loadConfig(const QJsonObject &cfg) override;
-    void retranslateUi();
-
-private slots:
-    void updateFilterOptions();
-
-private:
-    DrawProbabilityConfig config;
-
-    QWidget *controls;
-    QHBoxLayout *controlLayout;
-    QLabel *labelPrefix;
-    QLabel *labelMiddle;
-    QLabel *labelSuffix;
-    QLineEdit *cardNameEdit;
-    QComboBox *criteriaCombo;  // Card Name / Type / Subtype / Mana Value
-    QComboBox *filterCombo;    // The actual value
-    QComboBox *exactnessCombo; // At least / Exactly
-    QSpinBox *quantitySpin;    // N
-    QSpinBox *drawnSpin;       // M
-
-    QSpinBox *manaValueSpin;
-
-    QTableWidget *resultTable;
-
-    double hypergeometricProbability(int N, int K, int n, int k);
-    double calculateProbability(int totalCards, int copies, int drawn, bool atLeast);
-};
-
-#endif // COCKATRICE_DRAW_PROBABILITY_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
deleted file mode 100644
index 2f9f60752..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "mana_base_config.h"
-
-QJsonObject ManaBaseConfig::toJson() const
-{
-    QJsonObject jsonObject;
-    QJsonArray jsonArray;
-    jsonObject["displayType"] = displayType;
-    for (auto &filter : filters) {
-        jsonArray.append(filter);
-    }
-    jsonObject["filters"] = jsonArray;
-    return jsonObject;
-}
-
-ManaBaseConfig ManaBaseConfig::fromJson(const QJsonObject &o)
-
-{
-    ManaBaseConfig config;
-
-    if (o.contains("displayType")) {
-        config.displayType = o["displayType"].toString();
-    }
-
-    if (o.contains("filters")) {
-        config.filters.clear();
-        for (auto v : o["filters"].toArray()) {
-            config.filters << v.toString();
-        }
-    }
-
-    return config;
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h
deleted file mode 100644
index d01f88b8b..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#ifndef COCKATRICE_MANA_BASE_CONFIG_H
-#define COCKATRICE_MANA_BASE_CONFIG_H
-
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QStringList>
-
-struct ManaBaseConfig
-{
-    QString displayType; // "pie" or "bar" or "combinedBar"
-    QStringList filters; // which colors to show, empty = all
-
-    QJsonObject toJson() const;
-
-    static ManaBaseConfig fromJson(const QJsonObject &o);
-};
-
-#endif // COCKATRICE_MANA_BASE_CONFIG_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
deleted file mode 100644
index 3317486ea..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "mana_base_config_dialog.h"
-
-#include <QPushButton>
-
-ManaBaseConfigDialog::ManaBaseConfigDialog(DeckListStatisticsAnalyzer *analyzer,
-                                           ManaBaseConfig initial,
-                                           QWidget *parent)
-    : QDialog(parent), config(initial)
-{
-    layout = new QVBoxLayout(this);
-
-    displayTypeLabel = new QLabel(this);
-    layout->addWidget(displayTypeLabel);
-
-    displayType = new QComboBox(this);
-    layout->addWidget(displayType);
-
-    filterLabel = new QLabel(this);
-    layout->addWidget(filterLabel);
-
-    filterList = new QListWidget(this);
-    filterList->setSelectionMode(QAbstractItemView::MultiSelection);
-    layout->addWidget(filterList);
-
-    QStringList colors = analyzer->getManaBase().keys();
-    colors.sort();
-    filterList->addItems(colors);
-
-    // select initial filters
-    for (int i = 0; i < filterList->count(); ++i) {
-        if (config.filters.contains(filterList->item(i)->text()))
-            filterList->item(i)->setSelected(true);
-    }
-
-    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
-    layout->addWidget(buttons);
-
-    connect(buttons, &QDialogButtonBox::accepted, this, &ManaBaseConfigDialog::accept);
-    connect(buttons, &QDialogButtonBox::rejected, this, &ManaBaseConfigDialog::reject);
-
-    retranslateUi();
-}
-
-void ManaBaseConfigDialog::retranslateUi()
-{
-    setWindowTitle(tr("Mana Base Configuration"));
-
-    displayTypeLabel->setText(tr("Display type:"));
-
-    displayType->clear();
-    displayType->addItems({tr("pie"), tr("bar"), tr("combinedBar")});
-
-    filterLabel->setText(tr("Filter Colors (optional):"));
-
-    buttons->button(QDialogButtonBox::Ok)->setText(tr("OK"));
-    buttons->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
-}
-
-void ManaBaseConfigDialog::accept()
-{
-    config.displayType = displayType->currentText();
-    config.filters.clear();
-    for (auto *item : filterList->selectedItems()) {
-        config.filters << item->text();
-    }
-    QDialog::accept();
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h
deleted file mode 100644
index a816f154f..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#ifndef COCKATRICE_MANA_BASE_ADD_DIALOG_H
-#define COCKATRICE_MANA_BASE_ADD_DIALOG_H
-
-#include "../../deck_list_statistics_analyzer.h"
-#include "mana_base_config.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QLabel>
-#include <QListWidget>
-#include <QVBoxLayout>
-
-class ManaBaseConfigDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    ManaBaseConfigDialog(DeckListStatisticsAnalyzer *analyzer, ManaBaseConfig initial = {}, QWidget *parent = nullptr);
-    void retranslateUi();
-
-    void accept() override;
-
-    ManaBaseConfig result() const
-    {
-        return config;
-    }
-
-private:
-    ManaBaseConfig config;
-    QVBoxLayout *layout;
-    QLabel *displayTypeLabel;
-    QComboBox *displayType;
-    QLabel *filterLabel;
-    QListWidget *filterList;
-    QDialogButtonBox *buttons;
-};
-
-#endif // COCKATRICE_MANA_BASE_ADD_DIALOG_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
deleted file mode 100644
index 0093c360b..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "mana_base_widget.h"
-
-#include "../../../general/display/charts/bars/bar_widget.h"
-#include "../../../general/display/charts/bars/color_bar.h"
-#include "../../../general/display/charts/pies/color_pie.h"
-#include "../../analytics_panel_widget_registrar.h"
-#include "mana_base_config_dialog.h"
-
-#include <QDialog>
-#include <QListWidget>
-#include <libcockatrice/utility/color.h>
-
-namespace
-{
-
-AnalyticsPanelWidgetRegistrar registerManaBase{
-    "manaBase", ManaBaseWidget::tr("Mana Base"),
-    [](QWidget *parent, DeckListStatisticsAnalyzer *analyzer) { return new ManaBaseWidget(parent, analyzer); }};
-
-} // anonymous namespace
-
-ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaBaseConfig cfg)
-    : AbstractAnalyticsPanelWidget(parent, analyzer), config(std::move(cfg))
-{
-    barContainer = new QWidget(this);
-    barLayout = new QHBoxLayout(barContainer);
-    layout->addWidget(barContainer);
-
-    updateDisplay();
-}
-
-void ManaBaseWidget::updateDisplay()
-{
-    // Clear previous widgets
-    while (QLayoutItem *item = barLayout->takeAt(0)) {
-        if (item->widget()) {
-            item->widget()->deleteLater();
-        }
-        delete item;
-    }
-
-    auto &pipCount = analyzer->getProductionPipCount();
-    auto &cardCount = analyzer->getProductionCardCount();
-
-    QHash<QString, int> manaMap;
-    for (auto key : pipCount.keys()) {
-        manaMap[key] = pipCount[key];
-    }
-
-    // Apply filters
-    if (!config.filters.isEmpty()) {
-        QHash<QString, int> filtered;
-        for (auto f : config.filters) {
-            if (manaMap.contains(f)) {
-                filtered[f] = manaMap[f];
-            }
-        }
-        manaMap = filtered;
-    }
-
-    // Determine maximum for bar charts
-    int highest = 1;
-    for (auto val : manaMap) {
-        highest = std::max(highest, val);
-    }
-
-    // Convert to QMap for ColorBar / ColorPie (sorted)
-    QMap<QString, int> mapSorted;
-    for (auto it = manaMap.begin(); it != manaMap.end(); ++it) {
-        mapSorted.insert(it.key(), it.value());
-    }
-
-    // Choose display mode
-    if (config.displayType == "bar") {
-        const QList<QPair<QString, int>> sortedColors = GameSpecificColors::MTG::sortManaMapWUBRGCFirst(mapSorted);
-        static const QHash<QString, QColor> colorMap = {
-            {"W", QColor(248, 231, 185)}, {"U", QColor(14, 104, 171)}, {"B", QColor(21, 11, 0)},
-            {"R", QColor(211, 32, 42)},   {"G", QColor(0, 115, 62)},   {"C", QColor(150, 150, 150)},
-        };
-
-        for (const auto &[color, count] : sortedColors) {
-            QString label = QString("%1 %2 (%3)").arg(color).arg(count).arg(cardCount.value(color));
-
-            BarWidget *bar = new BarWidget(label, count, highest, colorMap.value(color, Qt::gray), this);
-
-            barLayout->addWidget(bar);
-        }
-    } else if (config.displayType == "combinedBar") {
-        ColorBar *cb = new ColorBar(mapSorted, this);
-        cb->setMinimumHeight(30);
-        barLayout->addWidget(cb);
-    } else if (config.displayType == "pie") {
-        ColorPie *pie = new ColorPie(mapSorted, this);
-        pie->setMinimumSize(200, 200);
-        barLayout->addWidget(pie);
-    }
-
-    update();
-}
-QSize ManaBaseWidget::sizeHint() const
-{
-    return QSize(800, 150);
-}
-
-QDialog *ManaBaseWidget::createConfigDialog(QWidget *parent)
-{
-    ManaBaseConfigDialog *dlg = new ManaBaseConfigDialog(analyzer, config, parent);
-    return dlg;
-}
-
-QJsonObject ManaBaseWidget::extractConfigFromDialog(QDialog *dlg) const
-{
-    auto *mc = qobject_cast<ManaBaseConfigDialog *>(dlg);
-    if (!mc) {
-        return {};
-    }
-    return mc->result().toJson();
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
deleted file mode 100644
index 39380c07e..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @file mana_base_widget.h
- * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
- */
-
-#ifndef MANA_BASE_WIDGET_H
-#define MANA_BASE_WIDGET_H
-
-#include "../../../general/display/banner_widget.h"
-#include "../../abstract_analytics_panel_widget.h"
-#include "../../deck_list_statistics_analyzer.h"
-#include "mana_base_config.h"
-
-#include <QHBoxLayout>
-#include <QWidget>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <utility>
-
-class ManaBaseWidget : public AbstractAnalyticsPanelWidget
-{
-    Q_OBJECT
-
-public slots:
-    QSize sizeHint() const override;
-    void updateDisplay() override;
-    QDialog *createConfigDialog(QWidget *parent) override;
-
-public:
-    ManaBaseWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaBaseConfig cfg = {});
-
-    QJsonObject saveConfig() const override
-    {
-        return config.toJson();
-    }
-    void loadConfig(const QJsonObject &o) override
-    {
-        config = ManaBaseConfig::fromJson(o);
-        updateDisplay();
-    }
-
-    QJsonObject extractConfigFromDialog(QDialog *dlg) const override;
-
-private:
-    ManaBaseConfig config;
-    QWidget *barContainer;
-    QHBoxLayout *barLayout;
-};
-
-#endif // MANA_BASE_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
deleted file mode 100644
index a0ccedc74..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-#include "mana_curve_category_widget.h"
-
-#include "libcockatrice/utility/color.h"
-#include "libcockatrice/utility/qt_utils.h"
-#include "mana_curve_config.h"
-#include "mana_curve_total_widget.h"
-
-constexpr int MIN_ROW_HEIGHT = 100; // Minimum readable height per row
-
-ManaCurveCategoryWidget::ManaCurveCategoryWidget(QWidget *parent) : QWidget(parent)
-{
-    layout = new QVBoxLayout(this);
-    layout->setSpacing(4);
-    layout->setContentsMargins(0, 0, 0, 0);
-
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-}
-
-// Same as minimum for now
-QSize ManaCurveCategoryWidget::sizeHint() const
-{
-    if (layout->isEmpty()) {
-        return QSize(0, 0);
-    }
-
-    // Calculate exact height needed for all rows
-    int rowCount = layout->count();
-
-    int totalHeight = rowCount * MIN_ROW_HEIGHT;
-    totalHeight += (rowCount - 1) * layout->spacing();
-
-    return QSize(0, totalHeight);
-}
-
-QSize ManaCurveCategoryWidget::minimumSizeHint() const
-{
-    if (layout->isEmpty()) {
-        return QSize(0, 0);
-    }
-
-    // Calculate actual minimum based on number of rows
-    int rowCount = layout->count();
-
-    int totalHeight = rowCount * MIN_ROW_HEIGHT;
-    totalHeight += (rowCount - 1) * layout->spacing();
-
-    return QSize(0, totalHeight);
-}
-
-void ManaCurveCategoryWidget::updateDisplay(int minCmc,
-                                            int maxCmc,
-                                            int highest,
-                                            QHash<QString, QHash<int, int>> qCategoryCounts,
-                                            QHash<QString, QHash<int, QStringList>> qCategoryCards,
-                                            const ManaCurveConfig &config)
-{
-    // Clear previous content
-    QtUtils::clearLayoutRec(layout);
-
-    if (!config.showCategoryRows) {
-        return; // nothing to show
-    }
-
-    // Collect categories
-    QStringList categories = qCategoryCounts.keys();
-
-    // Apply filters
-    if (!config.filters.isEmpty()) {
-        QStringList filtered;
-        for (const QString &cat : categories) {
-            if (config.filters.contains(cat)) {
-                filtered.append(cat);
-            }
-        }
-        categories = filtered;
-    }
-
-    std::sort(categories.begin(), categories.end());
-
-    for (const QString &cat : categories) {
-        QWidget *row = new QWidget(this);
-        row->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-
-        row->setFixedHeight(MIN_ROW_HEIGHT);
-
-        QHBoxLayout *rowLayout = new QHBoxLayout(row);
-        rowLayout->setContentsMargins(0, 0, 0, 0);
-        rowLayout->setSpacing(4);
-
-        QLabel *categoryLabel = new QLabel(cat, row);
-        categoryLabel->setFixedWidth(80);
-        rowLayout->addWidget(categoryLabel);
-
-        QVector<BarData> catBars;
-        const auto cmcCounts = qCategoryCounts.value(cat);
-        const auto cmcCards = qCategoryCards.value(cat);
-
-        for (int cmc = minCmc; cmc <= maxCmc; ++cmc) {
-            int val = cmcCounts.value(cmc, 0);
-            QStringList cards = cmcCards.value(cmc);
-
-            QVector<BarSegment> segments;
-            if (val > 0) {
-                segments.push_back({cat, val, cards, GameSpecificColors::MTG::colorHelper(cat)});
-            }
-
-            catBars.push_back({QString::number(cmc), segments});
-        }
-
-        auto *catChart = new BarChartWidget(row);
-        catChart->setHighest(highest);
-        catChart->setBars(catBars);
-        catChart->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
-        rowLayout->addWidget(catChart);
-        layout->addWidget(row);
-    }
-
-    // Update geometry after adding all widgets
-    updateGeometry();
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h
deleted file mode 100644
index c6aa6f1f0..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
-#define COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
-
-#include "../../../general/display/charts/bars/bar_chart_widget.h"
-#include "mana_curve_config.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QWidget>
-
-class ManaCurveCategoryWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit ManaCurveCategoryWidget(QWidget *parent);
-    void updateDisplay(int minCmc,
-                       int maxCmc,
-                       int highest,
-                       QHash<QString, QHash<int, int>> qCategoryCounts,
-                       QHash<QString, QHash<int, QStringList>> qCategoryCards,
-                       const ManaCurveConfig &config);
-
-public slots:
-    QSize sizeHint() const override;
-    QSize minimumSizeHint() const override;
-
-private:
-    QVBoxLayout *layout;
-};
-
-#endif // COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
deleted file mode 100644
index 0dfef1b66..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "mana_curve_config.h"
-
-QJsonObject ManaCurveConfig::toJson() const
-{
-    QJsonObject jsonObject;
-    jsonObject["groupBy"] = groupBy;
-    QJsonArray jsonArray;
-    for (auto &filter : filters) {
-        jsonArray.append(filter);
-    }
-    jsonObject["filters"] = jsonArray;
-    jsonObject["showMain"] = showMain;
-    jsonObject["showCategoryRows"] = showCategoryRows;
-    return jsonObject;
-}
-
-ManaCurveConfig ManaCurveConfig::fromJson(const QJsonObject &o)
-{
-    ManaCurveConfig config;
-
-    if (o.contains("groupBy")) {
-        config.groupBy = o["groupBy"].toString();
-    }
-
-    if (o.contains("filters")) {
-        config.filters.clear();
-        for (auto v : o["filters"].toArray()) {
-            config.filters << v.toString();
-        }
-    }
-
-    if (o.contains("showMain")) {
-        config.showMain = o["showMain"].toBool(true);
-    }
-
-    if (o.contains("showCategoryRows")) {
-        config.showCategoryRows = o["showCategoryRows"].toBool(true);
-    }
-
-    return config;
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h
deleted file mode 100644
index 55222dd98..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#ifndef COCKATRICE_MANA_CURVE_CONFIG_H
-#define COCKATRICE_MANA_CURVE_CONFIG_H
-
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QStringList>
-
-struct ManaCurveConfig
-{
-    QString groupBy = "type"; // "type", "color", "subtype", etc.
-    QStringList filters;      // empty = all
-    bool showMain = true;
-    bool showCategoryRows = true;
-
-    QJsonObject toJson() const;
-
-    static ManaCurveConfig fromJson(const QJsonObject &o);
-};
-
-#endif // COCKATRICE_MANA_CURVE_CONFIG_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
deleted file mode 100644
index 38199656c..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "mana_curve_config_dialog.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QListWidget>
-#include <QVBoxLayout>
-
-ManaCurveConfigDialog::ManaCurveConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent)
-    : QDialog(parent), analyzer(analyzer)
-{
-    auto *lay = new QVBoxLayout(this);
-
-    labelGroupBy = new QLabel(this);
-    lay->addWidget(labelGroupBy);
-
-    groupBy = new QComboBox(this);
-    lay->addWidget(groupBy);
-
-    labelFilters = new QLabel(this);
-    lay->addWidget(labelFilters);
-
-    filterList = new QListWidget(this);
-    filterList->setSelectionMode(QAbstractItemView::MultiSelection);
-    lay->addWidget(filterList);
-
-    showMain = new QCheckBox(this);
-    showMain->setChecked(true);
-    lay->addWidget(showMain);
-
-    showCatRows = new QCheckBox(this);
-    showCatRows->setChecked(true);
-    lay->addWidget(showCatRows);
-
-    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
-    lay->addWidget(buttons);
-    connect(buttons, &QDialogButtonBox::accepted, this, &ManaCurveConfigDialog::accept);
-    connect(buttons, &QDialogButtonBox::rejected, this, &ManaCurveConfigDialog::reject);
-
-    // populate dynamic data
-    QStringList cats = analyzer->getManaCurveByType().keys();
-    cats.append(analyzer->getManaCurveByColor().keys());
-    cats.removeDuplicates();
-    cats.sort();
-    filterList->addItems(cats);
-
-    groupBy->addItems({"type", "color", "subtype", "power", "toughness"});
-
-    retranslateUi();
-}
-
-void ManaCurveConfigDialog::retranslateUi()
-{
-    labelGroupBy->setText(tr("Group By:"));
-    groupBy->setItemText(0, tr("type"));
-    groupBy->setItemText(1, tr("color"));
-    groupBy->setItemText(2, tr("subtype"));
-    groupBy->setItemText(3, tr("power"));
-    groupBy->setItemText(4, tr("toughness"));
-
-    labelFilters->setText(tr("Filters (optional):"));
-
-    showMain->setText(tr("Show main bar row"));
-    showCatRows->setText(tr("Show per-category rows"));
-}
-
-void ManaCurveConfigDialog::setFromConfig(const ManaCurveConfig &cfg)
-{
-    groupBy->setCurrentText(cfg.groupBy);
-    // restore filters
-    for (int i = 0; i < filterList->count(); ++i)
-        filterList->item(i)->setSelected(cfg.filters.contains(filterList->item(i)->text()));
-
-    showMain->setChecked(cfg.showMain);
-    showCatRows->setChecked(cfg.showCategoryRows);
-}
-
-void ManaCurveConfigDialog::accept()
-{
-    cfg.groupBy = groupBy->currentText();
-
-    cfg.filters.clear();
-    for (auto *item : filterList->selectedItems())
-        cfg.filters << item->text();
-
-    cfg.showMain = showMain->isChecked();
-    cfg.showCategoryRows = showCatRows->isChecked();
-
-    QDialog::accept();
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h
deleted file mode 100644
index 17e6776e5..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef COCKATRICE_MANA_CURVE_ADD_DIALOG_H
-#define COCKATRICE_MANA_CURVE_ADD_DIALOG_H
-
-#include "../../deck_list_statistics_analyzer.h"
-#include "mana_curve_config.h"
-
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-
-class QListWidget;
-class QCheckBox;
-class QComboBox;
-
-class ManaCurveConfigDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    explicit ManaCurveConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent = nullptr);
-    void retranslateUi();
-    void setFromConfig(const ManaCurveConfig &cfg);
-
-    ManaCurveConfig result() const
-    {
-        return cfg;
-    }
-
-private:
-    ManaCurveConfig cfg;
-    DeckListStatisticsAnalyzer *analyzer;
-
-    QLabel *labelGroupBy;
-    QComboBox *groupBy;
-    QLabel *labelFilters;
-    QListWidget *filterList;
-    QDialogButtonBox *buttons;
-    QCheckBox *showMain;
-    QCheckBox *showCatRows;
-
-private slots:
-    void accept() override;
-};
-
-#endif // COCKATRICE_MANA_CURVE_ADD_DIALOG_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
deleted file mode 100644
index f059ff873..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "mana_curve_total_widget.h"
-
-#include "../../../general/display/charts/bars/bar_chart_widget.h"
-#include "libcockatrice/utility/color.h"
-#include "libcockatrice/utility/qt_utils.h"
-#include "mana_curve_config.h"
-
-#include <QHBoxLayout>
-
-ManaCurveTotalWidget::ManaCurveTotalWidget(QWidget *parent) : QWidget(parent)
-{
-    layout = new QHBoxLayout(this);
-
-    label = new QLabel(this);
-    label->setFixedWidth(80);
-    layout->addWidget(label);
-
-    barChart = new BarChartWidget(this);
-    layout->addWidget(barChart, 1);
-
-    setMinimumHeight(200);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-}
-
-QSize ManaCurveTotalWidget::sizeHint() const
-{
-    return {0, 280};
-}
-
-QSize ManaCurveTotalWidget::minimumSizeHint() const
-{
-    return {0, 200};
-}
-
-void ManaCurveTotalWidget::updateDisplay(const QString &categoryName,
-                                         int minCmc,
-                                         int maxCmc,
-                                         int highest,
-                                         const QMap<int, QMap<QString, int>> &cmcMap,
-                                         const QMap<QString, QMap<int, QStringList>> &cardsMap,
-                                         const ManaCurveConfig &config)
-{
-    QVector<BarData> mainBars;
-    mainBars.reserve(maxCmc - minCmc + 1);
-
-    for (int cmc = minCmc; cmc <= maxCmc; ++cmc) {
-        QVector<BarSegment> segments;
-
-        const auto cmcIt = cmcMap.constFind(cmc);
-        if (cmcIt != cmcMap.cend()) {
-            for (auto it = cmcIt->cbegin(); it != cmcIt->cend(); ++it) {
-                const QString &category = it.key();
-
-                if (!config.filters.isEmpty() && !config.filters.contains(category))
-                    continue;
-
-                const int value = it.value();
-
-                QStringList cards;
-                const auto catIt = cardsMap.constFind(category);
-                if (catIt != cardsMap.cend())
-                    cards = catIt->value(cmc);
-
-                segments.push_back({category, value, cards, GameSpecificColors::MTG::colorHelper(category)});
-            }
-        }
-
-        std::sort(segments.begin(), segments.end(),
-                  [](const BarSegment &a, const BarSegment &b) { return a.category < b.category; });
-
-        mainBars.push_back({QString::number(cmc), segments});
-    }
-
-    label->setText(categoryName);
-
-    barChart->setHighest(highest);
-    barChart->setBars(mainBars);
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h
deleted file mode 100644
index 203f75345..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
-#define COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
-#include "../../../general/display/charts/bars/bar_chart_widget.h"
-#include "mana_curve_config.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QWidget>
-
-class ManaCurveTotalWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit ManaCurveTotalWidget(QWidget *parent);
-    QSize sizeHint() const;
-    QSize minimumSizeHint() const;
-    void updateDisplay(const QString &categoryName,
-                       int minCmc,
-                       int maxCmc,
-                       int highest,
-                       const QMap<int, QMap<QString, int>> &cmcMap,
-                       const QMap<QString, QMap<int, QStringList>> &cardsMap,
-                       const ManaCurveConfig &config);
-
-private:
-    QHBoxLayout *layout;
-    QLabel *label;
-    BarChartWidget *barChart;
-};
-
-#endif // COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
deleted file mode 100644
index e09ecfe87..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-#include "mana_curve_widget.h"
-
-#include "../../../general/display/charts/bars/bar_chart_background_widget.h"
-#include "../../../general/display/charts/bars/bar_chart_widget.h"
-#include "../../../general/display/charts/bars/segmented_bar_widget.h"
-#include "../../analytics_panel_widget_registrar.h"
-#include "../../deck_list_statistics_analyzer.h"
-#include "libcockatrice/utility/color.h"
-#include "libcockatrice/utility/qt_utils.h"
-#include "mana_curve_config_dialog.h"
-
-#include <QInputDialog>
-#include <QJsonArray>
-#include <QLabel>
-#include <QPushButton>
-#include <QSettings>
-
-namespace
-{
-
-AnalyticsPanelWidgetRegistrar registerManaCurve{
-    "manaCurve", ManaCurveWidget::tr("Mana Curve"),
-    [](QWidget *parent, DeckListStatisticsAnalyzer *analyzer) { return new ManaCurveWidget(parent, analyzer); }};
-
-} // anonymous namespace
-
-ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaCurveConfig cfg)
-    : AbstractAnalyticsPanelWidget(parent, analyzer), config(cfg)
-{
-    setLayout(layout);
-
-    totalWidget = new ManaCurveTotalWidget(this);
-    totalWidget->setHidden(true);
-    layout->addWidget(totalWidget);
-
-    categoryWidget = new ManaCurveCategoryWidget(this);
-    categoryWidget->setHidden(true);
-    layout->addWidget(categoryWidget);
-
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
-    connect(analyzer, &DeckListStatisticsAnalyzer::statsUpdated, this, &ManaCurveWidget::updateDisplay);
-
-    updateDisplay();
-}
-
-QDialog *ManaCurveWidget::createConfigDialog(QWidget *parent)
-{
-    auto *dlg = new ManaCurveConfigDialog(analyzer, parent);
-    dlg->setFromConfig(config);
-    return dlg;
-}
-
-QJsonObject ManaCurveWidget::extractConfigFromDialog(QDialog *dlg) const
-{
-    auto *mc = qobject_cast<ManaCurveConfigDialog *>(dlg);
-    return mc ? mc->result().toJson() : QJsonObject{};
-}
-
-static void buildMapsByCategory(const QHash<QString, QHash<int, int>> &categoryCounts,
-                                const QHash<QString, QHash<int, QStringList>> &categoryCards,
-                                QMap<int, QMap<QString, int>> &outCmcMap,
-                                QMap<QString, QMap<int, QStringList>> &outCardsMap)
-{
-    outCmcMap.clear();
-    outCardsMap.clear();
-
-    for (auto catIt = categoryCounts.cbegin(); catIt != categoryCounts.cend(); ++catIt) {
-        const QString &category = catIt.key();
-        const auto &countsByCmc = catIt.value();
-
-        for (auto it = countsByCmc.cbegin(); it != countsByCmc.cend(); ++it)
-            outCmcMap[it.key()][category] = it.value();
-    }
-
-    for (auto catIt = categoryCards.cbegin(); catIt != categoryCards.cend(); ++catIt) {
-        const QString &category = catIt.key();
-        const auto &cardsByCmc = catIt.value();
-
-        for (auto it = cardsByCmc.cbegin(); it != cardsByCmc.cend(); ++it)
-            outCardsMap[category][it.key()] = it.value();
-    }
-}
-
-static void findGlobalCmcRange(const QHash<QString, QHash<int, int>> &categoryCounts, int &minCmc, int &maxCmc)
-{
-    minCmc = 0;
-    maxCmc = 0;
-
-    for (const auto &countsByCmc : categoryCounts) {
-        for (auto it = countsByCmc.cbegin(); it != countsByCmc.cend(); ++it)
-            maxCmc = qMax(maxCmc, it.key());
-    }
-}
-
-void ManaCurveWidget::updateDisplay()
-{
-    QHash<QString, QHash<int, int>> categoryCounts;
-    QHash<QString, QHash<int, QStringList>> categoryCards;
-
-    if (config.groupBy == "color") {
-        categoryCounts = analyzer->getManaCurveByColor();
-        categoryCards = analyzer->getManaCurveCardsByColor();
-    } else if (config.groupBy == "subtype") {
-        categoryCounts = analyzer->getManaCurveBySubtype();
-        categoryCards = analyzer->getManaCurveCardsBySubtype();
-    } else if (config.groupBy == "power") {
-        categoryCounts = analyzer->getManaCurveByPower();
-        categoryCards = analyzer->getManaCurveCardsByPower();
-    } else {
-        categoryCounts = analyzer->getManaCurveByType();
-        categoryCards = analyzer->getManaCurveCardsByType();
-    }
-
-    QMap<int, QMap<QString, int>> cmcMap;
-    QMap<QString, QMap<int, QStringList>> cardsMap;
-    buildMapsByCategory(categoryCounts, categoryCards, cmcMap, cardsMap);
-
-    int minCmc = 0;
-    int maxCmc = 0;
-    findGlobalCmcRange(categoryCounts, minCmc, maxCmc);
-
-    int highest = 1;
-    for (int cmc = minCmc; cmc <= maxCmc; ++cmc) {
-        int sum = 0;
-
-        const auto cmcIt = cmcMap.constFind(cmc);
-        if (cmcIt != cmcMap.cend()) {
-            for (auto it = cmcIt->cbegin(); it != cmcIt->cend(); ++it) {
-                if (!config.filters.isEmpty() && !config.filters.contains(it.key())) {
-                    continue;
-                }
-
-                sum += it.value();
-            }
-        }
-
-        highest = qMax(highest, sum);
-    }
-
-    totalWidget->updateDisplay(config.groupBy, minCmc, maxCmc, highest, cmcMap, cardsMap, config);
-
-    totalWidget->setVisible(config.showMain);
-
-    categoryWidget->updateDisplay(minCmc, maxCmc, highest, categoryCounts, categoryCards, config);
-
-    categoryWidget->setVisible(config.showCategoryRows);
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
deleted file mode 100644
index da59da9a8..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @file mana_curve_widget.h
- * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
- */
-
-#ifndef MANA_CURVE_WIDGET_H
-#define MANA_CURVE_WIDGET_H
-
-#include "../../abstract_analytics_panel_widget.h"
-#include "mana_curve_category_widget.h"
-#include "mana_curve_config.h"
-#include "mana_curve_total_widget.h"
-
-#include <QVBoxLayout>
-
-class SegmentedBarWidget;
-class DeckListStatisticsAnalyzer;
-
-class ManaCurveWidget : public AbstractAnalyticsPanelWidget
-{
-    Q_OBJECT
-
-public slots:
-    // QSize sizeHint() const override;
-    void updateDisplay() override;
-    QDialog *createConfigDialog(QWidget *parent) override;
-
-public:
-    ManaCurveWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaCurveConfig cfg = {});
-
-    QJsonObject saveConfig() const override
-    {
-        return config.toJson();
-    }
-    void loadConfig(const QJsonObject &o) override
-    {
-        config = ManaCurveConfig::fromJson(o);
-        updateDisplay();
-    };
-
-    QJsonObject extractConfigFromDialog(QDialog *dlg) const override;
-
-private:
-    ManaCurveConfig config;
-    ManaCurveTotalWidget *totalWidget;
-    ManaCurveCategoryWidget *categoryWidget;
-};
-
-#endif // MANA_CURVE_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
deleted file mode 100644
index ee57cb1e2..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "mana_devotion_config.h"
-
-QJsonObject ManaDevotionConfig::toJson() const
-{
-    QJsonObject jsonObject;
-    QJsonArray jsonArray;
-    jsonObject["displayType"] = displayType;
-    for (auto &filter : filters) {
-        jsonArray.append(filter);
-    }
-    jsonObject["filters"] = jsonArray;
-    return jsonObject;
-}
-
-ManaDevotionConfig ManaDevotionConfig::fromJson(const QJsonObject &o)
-{
-    ManaDevotionConfig config;
-
-    if (o.contains("displayType")) {
-        config.displayType = o["displayType"].toString();
-    }
-
-    if (o.contains("filters")) {
-        config.filters.clear();
-        for (auto v : o["filters"].toArray()) {
-            config.filters << v.toString();
-        }
-    }
-
-    return config;
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h
deleted file mode 100644
index 08be146e5..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef COCKATRICE_MANA_DEVOTION_CONFIG_H
-#define COCKATRICE_MANA_DEVOTION_CONFIG_H
-
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QStringList>
-
-struct ManaDevotionConfig
-{
-    QString displayType; // "pie" or "bar" or "combinedBar"
-    QStringList filters; // which colors to show, empty = all
-
-    QJsonObject toJson() const;
-
-    static ManaDevotionConfig fromJson(const QJsonObject &o);
-};
-
-#endif // COCKATRICE_MANA_DEVOTION_CONFIG_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
deleted file mode 100644
index 80fd03928..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "mana_devotion_config_dialog.h"
-
-ManaDevotionConfigDialog::ManaDevotionConfigDialog(DeckListStatisticsAnalyzer *analyzer,
-                                                   ManaDevotionConfig initial,
-                                                   QWidget *parent)
-    : QDialog(parent), config(initial)
-{
-    layout = new QVBoxLayout(this);
-
-    labelDisplayType = new QLabel(this);
-    layout->addWidget(labelDisplayType);
-
-    displayType = new QComboBox(this);
-    layout->addWidget(displayType);
-
-    labelFilters = new QLabel(this);
-    layout->addWidget(labelFilters);
-
-    filterList = new QListWidget(this);
-    filterList->setSelectionMode(QAbstractItemView::MultiSelection);
-
-    QStringList colors = analyzer->getDevotionPipCount().keys();
-    colors.sort();
-    filterList->addItems(colors);
-    layout->addWidget(filterList);
-
-    // select initial filters
-    for (int i = 0; i < filterList->count(); ++i) {
-        if (config.filters.contains(filterList->item(i)->text()))
-            filterList->item(i)->setSelected(true);
-    }
-
-    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
-    layout->addWidget(buttons);
-    connect(buttons, &QDialogButtonBox::accepted, this, &ManaDevotionConfigDialog::accept);
-    connect(buttons, &QDialogButtonBox::rejected, this, &ManaDevotionConfigDialog::reject);
-
-    // populate combo box items
-    displayType->addItems({"pie", "bar", "combinedBar"});
-
-    retranslateUi();
-}
-
-void ManaDevotionConfigDialog::retranslateUi()
-{
-    labelDisplayType->setText(tr("Display type:"));
-    displayType->setItemText(0, tr("pie"));
-    displayType->setItemText(1, tr("bar"));
-    displayType->setItemText(2, tr("combinedBar"));
-
-    labelFilters->setText(tr("Filter Colors (optional):"));
-}
-
-void ManaDevotionConfigDialog::accept()
-{
-    config.displayType = displayType->currentText();
-    config.filters.clear();
-    for (auto *item : filterList->selectedItems()) {
-        config.filters << item->text();
-    }
-    QDialog::accept();
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h
deleted file mode 100644
index fd804e2af..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#ifndef COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
-#define COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
-
-#include "../../deck_list_statistics_analyzer.h"
-#include "mana_devotion_config.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QListWidget>
-#include <QVBoxLayout>
-
-class ManaDevotionConfigDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    ManaDevotionConfigDialog(DeckListStatisticsAnalyzer *analyzer,
-                             ManaDevotionConfig initial = {},
-                             QWidget *parent = nullptr);
-    void retranslateUi();
-
-    void accept() override;
-
-    ManaDevotionConfig result() const
-    {
-        return config;
-    }
-
-private:
-    ManaDevotionConfig config;
-    QVBoxLayout *layout;
-    QLabel *labelDisplayType;
-    QComboBox *displayType;
-    QLabel *labelFilters;
-    QListWidget *filterList;
-    QDialogButtonBox *buttons;
-};
-
-#endif // COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
deleted file mode 100644
index 709577ff2..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "mana_devotion_widget.h"
-
-#include "../../../general/display/charts/bars/bar_widget.h"
-#include "../../../general/display/charts/bars/color_bar.h"
-#include "../../../general/display/charts/pies/color_pie.h"
-#include "../../analytics_panel_widget_registrar.h"
-#include "../../deck_list_statistics_analyzer.h"
-#include "mana_devotion_config_dialog.h"
-
-#include <QHash>
-#include <QInputDialog>
-
-namespace
-{
-
-AnalyticsPanelWidgetRegistrar registerManaDevotion{
-    "manaDevotion", ManaDevotionWidget::tr("Mana Devotion"),
-    [](QWidget *parent, DeckListStatisticsAnalyzer *analyzer) { return new ManaDevotionWidget(parent, analyzer); }};
-
-} // anonymous namespace
-
-ManaDevotionWidget::ManaDevotionWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaDevotionConfig cfg)
-    : AbstractAnalyticsPanelWidget(parent, analyzer), config(std::move(cfg))
-{
-    barContainer = new QWidget(this);
-    barLayout = new QHBoxLayout(barContainer);
-    barContainer->setLayout(barLayout);
-    layout->addWidget(barContainer);
-
-    updateDisplay();
-}
-
-void ManaDevotionWidget::updateDisplay()
-{
-    // Clear previous widgets
-    while (QLayoutItem *item = barLayout->takeAt(0)) {
-        if (item->widget()) {
-            item->widget()->deleteLater();
-        }
-        delete item;
-    }
-
-    auto &pipCount = analyzer->getDevotionPipCount();
-    auto &cardCount = analyzer->getDevotionCardCount();
-
-    // Convert keys to single QChar form
-    QHash<QChar, int> devoMap;
-    for (auto key : pipCount.keys()) {
-        devoMap[key[0]] = pipCount[key];
-    }
-
-    // Apply filters
-    if (!config.filters.isEmpty()) {
-        QHash<QChar, int> filtered;
-        for (auto f : config.filters) {
-            if (devoMap.contains(f[0])) {
-                filtered[f[0]] = devoMap[f[0]];
-            }
-        }
-        devoMap = filtered;
-    }
-
-    // Determine maximum for bar charts
-    int highest = 1;
-    for (auto val : devoMap) {
-        highest = std::max(highest, val);
-    }
-
-    // Convert to QMap<QString,int> for ColorBar / ColorPie
-    QMap<QString, int> mapSorted;
-    for (auto it = devoMap.begin(); it != devoMap.end(); ++it) {
-        mapSorted.insert(QString(it.key()), it.value());
-    }
-
-    // Color map
-    QHash<QChar, QColor> colors = {{'W', QColor(248, 231, 185)}, {'U', QColor(14, 104, 171)},
-                                   {'B', QColor(21, 11, 0)},     {'R', QColor(211, 32, 42)},
-                                   {'G', QColor(0, 115, 62)},    {'C', QColor(150, 150, 150)}};
-
-    // Choose display mode
-    if (config.displayType == "bar") {
-        // One BarWidget per devotion color
-        for (auto c : devoMap.keys()) {
-            QString label = QString("%1 %2 (%3)").arg(c).arg(devoMap[c]).arg(cardCount.value(QString(c)));
-
-            BarWidget *bar = new BarWidget(label, devoMap[c], highest, colors.value(c, Qt::gray), this);
-
-            barLayout->addWidget(bar);
-        }
-    } else if (config.displayType == "combinedBar") {
-        // Stacked devotion bar
-        ColorBar *cb = new ColorBar(mapSorted, this);
-        cb->setMinimumHeight(30);
-        barLayout->addWidget(cb);
-    } else if (config.displayType == "pie") {
-        // Devotion pie chart
-        ColorPie *pie = new ColorPie(mapSorted, this);
-        pie->setMinimumSize(200, 200);
-        barLayout->addWidget(pie);
-    }
-
-    update();
-}
-
-QDialog *ManaDevotionWidget::createConfigDialog(QWidget *parent)
-{
-    ManaDevotionConfigDialog *dlg = new ManaDevotionConfigDialog(analyzer, config, parent);
-    return dlg;
-}
-
-QJsonObject ManaDevotionWidget::extractConfigFromDialog(QDialog *dlg) const
-{
-    auto *mc = qobject_cast<ManaDevotionConfigDialog *>(dlg);
-    if (!mc) {
-        return {};
-    }
-    return mc->result().toJson();
-}
-
-QSize ManaDevotionWidget::sizeHint() const
-{
-    return QSize(800, 150);
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
deleted file mode 100644
index 833f12938..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file mana_devotion_widget.h
- * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
- */
-
-#ifndef MANA_DEVOTION_WIDGET_H
-#define MANA_DEVOTION_WIDGET_H
-#include "../../../general/display/banner_widget.h"
-#include "../../abstract_analytics_panel_widget.h"
-#include "mana_devotion_config.h"
-
-#include <QHBoxLayout>
-
-class ManaDevotionWidget : public AbstractAnalyticsPanelWidget
-{
-    Q_OBJECT
-
-public slots:
-    QSize sizeHint() const override;
-    void updateDisplay() override;
-    QDialog *createConfigDialog(QWidget *parent) override;
-
-public:
-    ManaDevotionWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaDevotionConfig cfg = {});
-
-    QJsonObject saveConfig() const override
-    {
-        return config.toJson();
-    }
-    void loadConfig(const QJsonObject &o) override
-    {
-        config = ManaDevotionConfig::fromJson(o);
-        updateDisplay();
-    }
-
-    QJsonObject extractConfigFromDialog(QDialog *dlg) const override;
-
-private:
-    ManaDevotionConfig config;
-    QWidget *barContainer;
-    QHBoxLayout *barLayout;
-};
-
-#endif // MANA_DEVOTION_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
deleted file mode 100644
index f70f32d5b..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "mana_distribution_config.h"
-
-QJsonObject ManaDistributionConfig::toJson() const
-{
-    QJsonObject o;
-    o["displayType"] = displayType;
-
-    QJsonArray jsonArray;
-    for (auto &s : filters) {
-        jsonArray.append(s);
-    }
-    o["filters"] = jsonArray;
-
-    o["showColorRows"] = showColorRows;
-    return o;
-}
-
-ManaDistributionConfig ManaDistributionConfig::fromJson(const QJsonObject &o)
-{
-    ManaDistributionConfig config;
-    if (o.contains("displayType")) {
-        config.displayType = o["displayType"].toString();
-    }
-
-    if (o.contains("filters")) {
-        config.filters.clear();
-        for (auto v : o["filters"].toArray())
-            config.filters << v.toString();
-    }
-
-    if (o.contains("showColorRows")) {
-        config.showColorRows = o["showColorRows"].toBool(true);
-    }
-
-    return config;
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h
deleted file mode 100644
index d1aa0f48e..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
-#define COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
-
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QStringList>
-
-struct ManaDistributionConfig
-{
-    QString displayType = "pie"; // "pie" or "bar"
-    QStringList filters;         // empty = all colors
-    bool showColorRows = true;
-
-    QJsonObject toJson() const;
-
-    static ManaDistributionConfig fromJson(const QJsonObject &o);
-};
-
-#endif // COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
deleted file mode 100644
index 7fe4d94e4..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "mana_distribution_config_dialog.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QListWidget>
-#include <QVBoxLayout>
-
-static const QStringList kColors = {"W", "U", "B", "R", "G", "C"};
-
-ManaDistributionConfigDialog::ManaDistributionConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent)
-    : QDialog(parent), analyzer(analyzer)
-{
-    auto *lay = new QVBoxLayout(this);
-
-    // Labels
-    labelDisplayType = new QLabel(this);
-    lay->addWidget(labelDisplayType);
-
-    displayType = new QComboBox(this);
-    lay->addWidget(displayType);
-
-    labelFilters = new QLabel(this);
-    lay->addWidget(labelFilters);
-
-    filterList = new QListWidget(this);
-    filterList->setSelectionMode(QAbstractItemView::MultiSelection);
-    filterList->addItems(kColors); // dynamic/fixed, no translation needed
-    lay->addWidget(filterList);
-
-    showColorRows = new QCheckBox(this);
-    showColorRows->setChecked(true);
-    lay->addWidget(showColorRows);
-
-    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
-    lay->addWidget(buttons);
-    connect(buttons, &QDialogButtonBox::accepted, this, &ManaDistributionConfigDialog::accept);
-    connect(buttons, &QDialogButtonBox::rejected, this, &ManaDistributionConfigDialog::reject);
-
-    displayType->addItems({"pie", "bar"}); // combo items
-
-    retranslateUi();
-}
-
-void ManaDistributionConfigDialog::retranslateUi()
-{
-    labelDisplayType->setText(tr("Top display type:"));
-    displayType->setItemText(0, tr("pie"));
-    displayType->setItemText(1, tr("bar"));
-
-    labelFilters->setText(tr("Colors:"));
-
-    showColorRows->setText(tr("Show per-color rows"));
-
-    // QDialogButtonBox buttons are automatically translated
-}
-
-void ManaDistributionConfigDialog::setFromConfig(const ManaDistributionConfig &cfgIn)
-{
-    cfg = cfgIn;
-
-    displayType->setCurrentText(cfg.displayType);
-
-    for (int i = 0; i < filterList->count(); ++i)
-        filterList->item(i)->setSelected(cfg.filters.contains(filterList->item(i)->text()));
-
-    showColorRows->setChecked(cfg.showColorRows);
-}
-
-void ManaDistributionConfigDialog::accept()
-{
-    cfg.displayType = displayType->currentText();
-
-    // Filters
-    cfg.filters.clear();
-    for (auto *item : filterList->selectedItems())
-        cfg.filters << item->text();
-
-    cfg.showColorRows = showColorRows->isChecked();
-
-    QDialog::accept();
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h
deleted file mode 100644
index 57c88e29d..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef COCKATRICE_MANA_DISTRIBUTION_ADD_DIALOG_H
-#define COCKATRICE_MANA_DISTRIBUTION_ADD_DIALOG_H
-
-#include "mana_distribution_config.h"
-
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QStringList>
-
-class QComboBox;
-class QListWidget;
-class QCheckBox;
-class DeckListStatisticsAnalyzer;
-
-class ManaDistributionConfigDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    explicit ManaDistributionConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent = nullptr);
-    void retranslateUi();
-
-    void setFromConfig(const ManaDistributionConfig &cfg);
-    const ManaDistributionConfig &config() const
-    {
-        return cfg;
-    }
-
-public slots:
-    void accept() override;
-
-private:
-    DeckListStatisticsAnalyzer *analyzer;
-
-    QLabel *labelDisplayType;
-    QComboBox *displayType;
-    QLabel *labelFilters;
-    QListWidget *filterList;
-    QCheckBox *showColorRows;
-    QDialogButtonBox *buttons;
-
-    ManaDistributionConfig cfg;
-};
-
-#endif // COCKATRICE_MANA_DISTRIBUTION_ADD_DIALOG_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
deleted file mode 100644
index 8a5e14858..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "mana_distribution_single_display_widget.h"
-
-#include "../../../cards/additional_info/mana_symbol_widget.h"
-
-#include <QVBoxLayout>
-
-ManaDistributionSingleDisplayWidget::ManaDistributionSingleDisplayWidget(const QString &colorSymbol, QWidget *parent)
-    : QWidget(parent)
-{
-    auto layout = new QVBoxLayout(this);
-    layout->setAlignment(Qt::AlignHCenter);
-
-    symbolLabel = new ManaSymbolWidget(this, colorSymbol, true, false);
-    symbolLabel->setFixedSize(40, 40);
-
-    devotionBar = new QProgressBar(this);
-    devotionBar->setRange(0, 100);
-    devotionBar->setTextVisible(false);
-
-    devotionLabel = new QLabel(this);
-    devotionLabel->setAlignment(Qt::AlignCenter);
-
-    productionBar = new QProgressBar(this);
-    productionBar->setRange(0, 100);
-    productionBar->setTextVisible(false);
-
-    productionLabel = new QLabel(this);
-    productionLabel->setAlignment(Qt::AlignCenter);
-
-    layout->addWidget(symbolLabel);
-    layout->addWidget(devotionBar);
-    layout->addWidget(devotionLabel);
-    layout->addWidget(productionBar);
-    layout->addWidget(productionLabel);
-
-    setLayout(layout);
-}
-
-void ManaDistributionSingleDisplayWidget::setDevotion(int pips, int cards, int percent)
-{
-    devotionBar->setValue(percent);
-    devotionLabel->setText(QString(tr("%1 pips (%2 cards)")).arg(pips).arg(cards));
-}
-
-void ManaDistributionSingleDisplayWidget::setProduction(int pips, int cards, int percent)
-{
-    productionBar->setValue(percent);
-    productionLabel->setText(QString(tr("%1 mana (%2 cards)")).arg(pips).arg(cards));
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h
deleted file mode 100644
index e33d0cec1..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
-#define COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QProgressBar>
-#include <QWidget>
-
-class ManaDistributionSingleDisplayWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit ManaDistributionSingleDisplayWidget(const QString &colorSymbol, QWidget *parent = nullptr);
-
-    void setDevotion(int pips, int cards, int percent);
-    void setProduction(int pips, int cards, int percent);
-
-private:
-    QLabel *symbolLabel;
-
-    QProgressBar *devotionBar;
-    QLabel *devotionLabel;
-
-    QProgressBar *productionBar;
-    QLabel *productionLabel;
-};
-
-#endif // COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
deleted file mode 100644
index 8eaea1426..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#include "mana_distribution_widget.h"
-
-#include "../../analytics_panel_widget_registrar.h"
-#include "mana_distribution_config_dialog.h"
-
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QVBoxLayout>
-
-namespace
-{
-AnalyticsPanelWidgetRegistrar registerManaDistribution{
-    "manaProdDevotion", ManaDistributionWidget::tr("Mana Production + Devotion"),
-    [](QWidget *parent, DeckListStatisticsAnalyzer *analyzer) { return new ManaDistributionWidget(parent, analyzer); }};
-
-} // anonymous namespace
-
-static const QStringList kColors = {"W", "U", "B", "R", "G", "C"};
-
-ManaDistributionWidget::ManaDistributionWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer)
-    : AbstractAnalyticsPanelWidget(parent, analyzer)
-{
-    container = new QWidget(this);
-    containerLayout = new QVBoxLayout(container);
-
-    devotionBarTop = new ColorBar({}, this);
-    devotionPieTop = new ColorPie({}, this);
-    productionBarTop = new ColorBar({}, this);
-    productionPieTop = new ColorPie({}, this);
-
-    containerLayout->addWidget(devotionBarTop);
-    containerLayout->addWidget(devotionPieTop);
-    containerLayout->addWidget(productionBarTop);
-    containerLayout->addWidget(productionPieTop);
-
-    devotionPieTop->hide();
-    productionPieTop->hide();
-
-    row = new QHBoxLayout();
-    containerLayout->addLayout(row);
-
-    for (const QString &c : kColors) {
-        auto *w = new ManaDistributionSingleDisplayWidget(c, this);
-        row->addWidget(w);
-        rows[c] = w;
-    }
-
-    layout->addWidget(container);
-}
-
-void ManaDistributionWidget::updateDisplay()
-{
-    const auto &devPips = analyzer->getDevotionPipCount();
-    const auto &devCards = analyzer->getDevotionCardCount();
-    const auto &prodPips = analyzer->getProductionPipCount();
-    const auto &prodCards = analyzer->getProductionCardCount();
-
-    QStringList filtered = config.filters.isEmpty() ? kColors : config.filters;
-
-    QMap<QString, int> devMap, prodMap;
-    for (const QString &c : filtered) {
-        devMap[c] = devPips.value(c, 0);
-        prodMap[c] = prodPips.value(c, 0);
-    }
-
-    bool showPie = (config.displayType == "pie");
-
-    devotionBarTop->setVisible(!showPie);
-    productionBarTop->setVisible(!showPie);
-
-    devotionPieTop->setVisible(showPie);
-    productionPieTop->setVisible(showPie);
-
-    if (showPie) {
-        devotionPieTop->setColors(devMap);
-        productionPieTop->setColors(prodMap);
-    } else {
-        devotionBarTop->setColors(devMap);
-        productionBarTop->setColors(prodMap);
-    }
-
-    for (const QString &c : kColors) {
-        auto *w = rows.value(c);
-
-        if (!w) {
-            continue;
-        }
-
-        bool visible = config.showColorRows && filtered.contains(c);
-        w->setVisible(visible);
-        if (!visible) {
-            continue;
-        }
-
-        int dp = devPips.value(c, 0);
-        int dc = devCards.value(c, 0);
-        int pp = prodPips.value(c, 0);
-        int pc = prodCards.value(c, 0);
-
-        // Compute percentages
-        int totalDev = 0;
-        int totalProd = 0;
-        for (const QString &cc : filtered) {
-            totalDev += devPips.value(cc, 0);
-            totalProd += prodPips.value(cc, 0);
-        }
-
-        int devPct = (totalDev > 0) ? int(100.0 * dp / totalDev) : 0;
-        int prodPct = (totalProd > 0) ? int(100.0 * pp / totalProd) : 0;
-
-        w->setDevotion(dp, dc, devPct);
-        w->setProduction(pp, pc, prodPct);
-    }
-}
-
-QDialog *ManaDistributionWidget::createConfigDialog(QWidget *parent)
-{
-    auto *dlg = new ManaDistributionConfigDialog(analyzer, parent);
-    dlg->setWindowTitle(tr("Mana Distribution Settings"));
-    dlg->setFromConfig(config);
-
-    connect(dlg, &QDialog::accepted, [this, dlg]() {
-        config = dlg->config();
-        updateDisplay();
-    });
-
-    return dlg;
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h
deleted file mode 100644
index 2d834f3af..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
-#define COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
-
-#include "../../../general/display/charts/bars/color_bar.h"
-#include "../../../general/display/charts/pies/color_pie.h"
-#include "../../abstract_analytics_panel_widget.h"
-#include "../../deck_list_statistics_analyzer.h"
-#include "mana_distribution_config.h"
-#include "mana_distribution_single_display_widget.h"
-
-#include <QHBoxLayout>
-#include <QMap>
-#include <QVBoxLayout>
-#include <QWidget>
-
-class ManaDistributionWidget : public AbstractAnalyticsPanelWidget
-{
-    Q_OBJECT
-public:
-    explicit ManaDistributionWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer);
-
-    void updateDisplay() override;
-    QDialog *createConfigDialog(QWidget *parent) override;
-    QJsonObject extractConfigFromDialog(QDialog *) const override
-    {
-        return {};
-    }
-
-private:
-    ManaDistributionConfig config;
-
-    QWidget *container;
-    QVBoxLayout *containerLayout;
-
-    QVBoxLayout *topLayout;
-    ColorBar *devotionBarTop;
-    ColorPie *devotionPieTop;
-    ColorBar *productionBarTop;
-    ColorPie *productionPieTop;
-
-    QHBoxLayout *row;
-    QMap<QString, ManaDistributionSingleDisplayWidget *> rows;
-};
-
-#endif // COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
index 147675e21..2131700fd 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
@@ -1,310 +1,36 @@
 #include "deck_analytics_widget.h"
 
-#include "abstract_analytics_panel_widget.h"
-#include "add_analytics_panel_dialog.h"
-#include "analytics_panel_widget_factory.h"
-#include "analyzer_modules/mana_base/mana_base_config.h"
-#include "analyzer_modules/mana_curve/mana_curve_config.h"
-#include "analyzer_modules/mana_devotion/mana_devotion_config.h"
-#include "deck_list_statistics_analyzer.h"
-#include "resizable_panel.h"
-
-#include <QEvent>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QSettings>
-#include <QVBoxLayout>
-
-DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnalyzer *_statsAnalyzer)
-    : QWidget(parent), statsAnalyzer(_statsAnalyzer)
+DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListModel *_deckListModel)
+    : QWidget(parent), deckListModel(_deckListModel)
 {
-    layout = new QVBoxLayout(this);
+    mainLayout = new QVBoxLayout();
+    setLayout(mainLayout);
 
-    // Controls
-    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);
-
-    controlLayout->addWidget(addButton);
-    controlLayout->addWidget(removeButton);
-    controlLayout->addWidget(saveButton);
-    controlLayout->addWidget(loadButton);
-    controlLayout->addWidget(includeSideboardCheckBox);
-
-    layout->addWidget(controlContainer);
-
-    connect(addButton, &QPushButton::clicked, this, &DeckAnalyticsWidget::onAddPanel);
-    connect(removeButton, &QPushButton::clicked, this, &DeckAnalyticsWidget::onRemoveSelected);
-    connect(saveButton, &QPushButton::clicked, this, &DeckAnalyticsWidget::saveLayout);
-    connect(loadButton, &QPushButton::clicked, this, &DeckAnalyticsWidget::loadLayout);
-    connect(includeSideboardCheckBox, &QCheckBox::clicked, this, &DeckAnalyticsWidget::includeSideboardChanged);
-
-    // Scroll area and container
     scrollArea = new QScrollArea(this);
+    scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     scrollArea->setWidgetResizable(true);
-    scrollArea->setFrameShape(QFrame::NoFrame);
+    mainLayout->addWidget(scrollArea);
 
-    panelContainer = new QWidget(scrollArea);
-    panelLayout = new QVBoxLayout(panelContainer);
-    panelLayout->setSpacing(8);
-    panelLayout->setContentsMargins(4, 4, 4, 4);
-    panelLayout->addStretch(1); // push panels up
+    container = new QWidget(scrollArea);
+    containerLayout = new QVBoxLayout(container);
+    container->setLayout(containerLayout);
+    scrollArea->setWidget(container);
 
-    scrollArea->setWidget(panelContainer);
-    layout->addWidget(scrollArea);
+    manaCurveWidget = new ManaCurveWidget(this, deckListModel);
+    containerLayout->addWidget(manaCurveWidget);
 
-    loadLayout();
+    manaDevotionWidget = new ManaDevotionWidget(this, deckListModel);
+    containerLayout->addWidget(manaDevotionWidget);
 
-    retranslateUi();
+    manaBaseWidget = new ManaBaseWidget(this, deckListModel);
+    containerLayout->addWidget(manaBaseWidget);
 }
 
-void DeckAnalyticsWidget::retranslateUi()
+void DeckAnalyticsWidget::refreshDisplays(DeckListModel *_deckModel)
 {
-    addButton->setText(tr("Add Panel"));
-    removeButton->setText(tr("Remove Panel"));
-    saveButton->setText(tr("Save Layout"));
-    loadButton->setText(tr("Load Layout"));
-    includeSideboardCheckBox->setText(tr("Include Sideboard"));
+    deckListModel = _deckModel;
+    manaCurveWidget->setDeckModel(_deckModel);
+    manaDevotionWidget->setDeckModel(_deckModel);
+    manaBaseWidget->setDeckModel(_deckModel);
 }
-
-void DeckAnalyticsWidget::includeSideboardChanged(bool checked)
-{
-    statsAnalyzer->getConfig().includeSideboard = checked;
-    updateDisplays();
-}
-
-void DeckAnalyticsWidget::updateDisplays()
-{
-    statsAnalyzer->analyze();
-}
-
-void DeckAnalyticsWidget::onAddPanel()
-{
-    AddAnalyticsPanelDialog dlg(this);
-    if (dlg.exec() != QDialog::Accepted) {
-        return;
-    }
-
-    QString selection = dlg.selectedType();
-    if (selection.isEmpty()) {
-        return;
-    }
-
-    AbstractAnalyticsPanelWidget *analyticsWidget =
-        AnalyticsPanelWidgetFactory::instance().create(selection, this, statsAnalyzer);
-    if (!analyticsWidget) {
-        return;
-    }
-
-    if (!analyticsWidget->applyConfigFromDialog()) {
-        analyticsWidget->deleteLater();
-        return;
-    }
-
-    addPanelInstance(selection, analyticsWidget, analyticsWidget->saveConfig());
-}
-
-void DeckAnalyticsWidget::addPanelInstance(const QString &typeId,
-                                           AbstractAnalyticsPanelWidget *panel,
-                                           const QJsonObject &cfg)
-{
-    panel->loadConfig(cfg);
-    panel->updateDisplay();
-
-    auto *resPanel = new ResizablePanel(typeId, panel, panelContainer);
-    panelWrappers.push_back(resPanel);
-
-    panelLayout->insertWidget(panelLayout->count() - 1, resPanel);
-
-    // Event filter for selection
-    resPanel->installEventFilter(this);
-    panel->installEventFilter(this);
-
-    // Connect drag-drop signals
-    connect(resPanel, &ResizablePanel::dropRequested, this, &DeckAnalyticsWidget::onPanelDropped);
-}
-
-void DeckAnalyticsWidget::onRemoveSelected()
-{
-    int idx = indexOfSelectedWrapper();
-    if (idx < 0) {
-        return;
-    }
-
-    ResizablePanel *panel = panelWrappers.takeAt(idx);
-    selectWrapper(nullptr);
-
-    panel->deleteLater();
-}
-
-void DeckAnalyticsWidget::saveLayout()
-{
-    QJsonArray arr;
-
-    for (auto *wrapper : panelWrappers) {
-        QJsonObject entry;
-        entry["type"] = wrapper->getTypeId();
-        entry["config"] = wrapper->panel->saveConfig();
-        entry["height"] = wrapper->getCurrentHeight();
-        arr.append(entry);
-    }
-
-    QSettings s;
-    s.setValue("deckAnalytics/layout", QString::fromUtf8(QJsonDocument(arr).toJson(QJsonDocument::Compact)));
-}
-
-void DeckAnalyticsWidget::loadLayout()
-{
-    if (!loadLayoutInternal()) {
-        addDefaultPanels();
-    }
-}
-
-void DeckAnalyticsWidget::addDefaultPanels()
-{
-    struct DefaultPanel
-    {
-        QString type;
-        QJsonObject cfg;
-    };
-
-    // Prepare configs
-    QJsonObject manaCurveCfg = ManaCurveConfig{}.toJson();
-    QJsonObject manaBaseCfg = ManaBaseConfig{"combinedBar", {}}.toJson();
-    QJsonObject manaDevotionCfg = ManaDevotionConfig{"combinedBar", {}}.toJson();
-    QVector<DefaultPanel> defaults = {
-        {"manaCurve", manaCurveCfg}, {"manaBase", manaBaseCfg}, {"manaDevotion", manaDevotionCfg}};
-
-    for (auto &d : defaults) {
-        AbstractAnalyticsPanelWidget *w = AnalyticsPanelWidgetFactory::instance().create(d.type, this, statsAnalyzer);
-        if (!w) {
-            continue;
-        }
-
-        w->loadConfig(d.cfg);
-        addPanelInstance(d.type, w, d.cfg);
-    }
-}
-
-bool DeckAnalyticsWidget::loadLayoutInternal()
-{
-    QSettings s;
-    QString layoutData = s.value("deckAnalytics/layout").toString();
-    if (layoutData.isEmpty()) {
-        return false;
-    }
-
-    QJsonDocument doc = QJsonDocument::fromJson(layoutData.toUtf8());
-    if (!doc.isArray()) {
-        return false;
-    }
-
-    clearPanels();
-
-    for (auto v : doc.array()) {
-        if (!v.isObject()) {
-            continue;
-        }
-        QJsonObject o = v.toObject();
-        QString type = o["type"].toString();
-        QJsonObject cfg = o["config"].toObject();
-
-        AbstractAnalyticsPanelWidget *w = AnalyticsPanelWidgetFactory::instance().create(type, this, statsAnalyzer);
-        if (!w) {
-            continue;
-        }
-
-        addPanelInstance(type, w, cfg);
-
-        // Restore height AFTER adding the panel
-        if (o.contains("height")) {
-            panelWrappers.last()->setHeightFromSaved(o["height"].toInt());
-        }
-    }
-
-    return true;
-}
-
-void DeckAnalyticsWidget::clearPanels()
-{
-    selectWrapper(nullptr);
-    while (!panelWrappers.isEmpty()) {
-        ResizablePanel *p = panelWrappers.takeLast();
-        p->deleteLater();
-    }
-}
-
-bool DeckAnalyticsWidget::eventFilter(QObject *obj, QEvent *event)
-{
-    if (event->type() == QEvent::MouseButtonPress) {
-        for (auto *p : panelWrappers) {
-            if (obj == p || obj == p->panel) {
-                selectWrapper(p);
-                break;
-            }
-        }
-    }
-    return QWidget::eventFilter(obj, event);
-}
-
-void DeckAnalyticsWidget::selectWrapper(ResizablePanel *w)
-{
-    // Same wrapper
-    if (selectedWrapper == w) {
-        return;
-    }
-    // Deselect the old one
-    if (selectedWrapper) {
-        selectedWrapper->setSelected(false);
-    }
-    // Set current
-    selectedWrapper = w;
-    // Finally, select new
-    if (selectedWrapper) {
-        selectedWrapper->setSelected(true);
-    }
-}
-
-int DeckAnalyticsWidget::indexOfSelectedWrapper() const
-{
-    if (!selectedWrapper) {
-        return -1;
-    }
-    return panelWrappers.indexOf(selectedWrapper);
-}
-
-void DeckAnalyticsWidget::onPanelDropped(ResizablePanel *dragged, ResizablePanel *target, bool insertBefore)
-{
-    int draggedIdx = panelWrappers.indexOf(dragged);
-    int targetIdx = panelWrappers.indexOf(target);
-
-    if (draggedIdx == -1 || targetIdx == -1 || draggedIdx == targetIdx) {
-        return;
-    }
-
-    // Remove dragged panel from list and layout
-    panelWrappers.removeAt(draggedIdx);
-    panelLayout->removeWidget(dragged);
-
-    // Adjust target index if needed
-    if (draggedIdx < targetIdx) {
-        targetIdx--;
-    }
-
-    // Calculate insertion position
-    int insertIdx = insertBefore ? targetIdx : targetIdx + 1;
-
-    // Insert back into list and layout
-    panelWrappers.insert(insertIdx, dragged);
-    panelLayout->insertWidget(insertIdx, dragged);
-
-    // Clear selection
-    selectWrapper(nullptr);
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
index 09618c3f8..4e9ce36ba 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
@@ -1,75 +1,40 @@
-/**
- * @file deck_analytics_widget.h
- * @ingroup DeckEditorAnalyticsWidgets
- * @brief Main analytics widget container with resizable panels for deck statistics.
- */
-
 #ifndef DECK_ANALYTICS_WIDGET_H
 #define DECK_ANALYTICS_WIDGET_H
 
-#include "abstract_analytics_panel_widget.h"
-#include "deck_list_statistics_analyzer.h"
-#include "resizable_panel.h"
+#include "../../../deck/deck_list_model.h"
+#include "../general/layout_containers/flow_widget.h"
+#include "mana_base_widget.h"
+#include "mana_curve_widget.h"
+#include "mana_devotion_widget.h"
 
-#include <QCheckBox>
-#include <QJsonObject>
+#include <QHBoxLayout>
 #include <QScrollArea>
 #include <QVBoxLayout>
-#include <QVector>
 #include <QWidget>
-
-class LayoutInspector;
+#include <deck_list.h>
 
 class DeckAnalyticsWidget : public QWidget
 {
     Q_OBJECT
 
-public slots:
-    void updateDisplays();
-
 public:
-    explicit DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer);
-    void retranslateUi();
-    void includeSideboardChanged(bool checked);
-
-private slots:
-    void onAddPanel();
-    void onRemoveSelected();
-    void onPanelDropped(ResizablePanel *dragged, ResizablePanel *target, bool insertBefore);
-    void saveLayout();
-    void loadLayout();
-    void addDefaultPanels();
-    bool loadLayoutInternal();
-    void clearPanels();
-
-protected:
-    bool eventFilter(QObject *obj, QEvent *event) override;
-    void selectWrapper(ResizablePanel *panel);
-    int indexOfSelectedWrapper() const;
+    explicit DeckAnalyticsWidget(QWidget *parent, DeckListModel *deckListModel);
+    void setDeckList(const DeckList &_deckListModel);
+    std::map<int, int> analyzeManaCurve();
+    void refreshDisplays(DeckListModel *_deckListModel);
 
 private:
-    void addPanelInstance(const QString &typeId, AbstractAnalyticsPanelWidget *panel, const QJsonObject &cfg = {});
+    DeckListModel *deckListModel;
+    QVBoxLayout *mainLayout;
 
-    QVBoxLayout *layout;
-    QWidget *controlContainer;
-    QHBoxLayout *controlLayout;
-
-    QPushButton *addButton;
-    QPushButton *removeButton;
-    QPushButton *saveButton;
-    QPushButton *loadButton;
-
-    QCheckBox *includeSideboardCheckBox;
+    QWidget *container;
+    QVBoxLayout *containerLayout;
 
     QScrollArea *scrollArea;
-    QWidget *panelContainer;
-    QVBoxLayout *panelLayout;
 
-    QVector<ResizablePanel *> panelWrappers;
-    ResizablePanel *selectedWrapper = nullptr;
-
-    DeckListStatisticsAnalyzer *statsAnalyzer;
-    LayoutInspector *insp = nullptr;
+    ManaCurveWidget *manaCurveWidget;
+    ManaDevotionWidget *manaDevotionWidget;
+    ManaBaseWidget *manaBaseWidget;
 };
 
 #endif // DECK_ANALYTICS_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
deleted file mode 100644
index 073b6d25c..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-#include "deck_list_statistics_analyzer.h"
-
-#include "deck_list_model.h"
-#include "deck_list_statistics_analyzer.h"
-
-#include <QRegularExpression>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list.h>
-
-DeckListStatisticsAnalyzer::DeckListStatisticsAnalyzer(QObject *parent,
-                                                       DeckListModel *_model,
-                                                       DeckListStatisticsAnalyzerConfig _config)
-    : QObject(parent), model(_model), config(_config)
-{
-    connect(model, &DeckListModel::cardsChanged, this, &DeckListStatisticsAnalyzer::analyze);
-}
-
-void DeckListStatisticsAnalyzer::analyze()
-{
-    clearData();
-
-    QList<const DecklistCardNode *> nodes;
-
-    if (config.includeSideboard) {
-        nodes = model->getCardNodes();
-    } else {
-        nodes = model->getCardNodesForZone(DECK_ZONE_MAIN);
-    }
-
-    for (auto node : nodes) {
-        CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(node->getName());
-        if (!info) {
-            continue;
-        }
-
-        const int amount = node->getNumber();
-        QStringList copiesOfName;
-        for (int i = 0; i < amount; i++) {
-            copiesOfName.append(node->getName());
-        }
-
-        // Convert once
-        const int cmc = info->getCmc().toInt();
-        QStringList types = info->getMainCardType().split(' ');
-        QStringList subtypes = info->getCardType().split('-').last().split(" ");
-        QString colors = info->getColors();
-        int power = info->getPowTough().split("/").first().toInt();
-        int toughness = info->getPowTough().split("/").last().toInt();
-
-        // For each copy of card
-        // ---------------- Mana Curve ----------------
-        if (config.computeManaCurve) {
-            manaCurveMap[cmc] += amount;
-        }
-
-        // per-type curve
-        for (auto &t : types) {
-            manaCurveByType[t][cmc] += amount;
-            manaCurveCardsByType[t][cmc] << copiesOfName;
-        }
-
-        // Per-subtype curve
-        for (auto &st : subtypes) {
-            manaCurveBySubtype[st][cmc] += amount;
-            manaCurveCardsBySubtype[st][cmc] << copiesOfName;
-        }
-
-        // per-color curve
-        for (auto &c : colors) {
-            manaCurveByColor[c][cmc] += amount;
-            manaCurveCardsByColor[c][cmc] << copiesOfName;
-        }
-
-        // Power/toughness
-        manaCurveByPower[QString::number(power)][cmc] += amount;
-        manaCurveCardsByPower[QString::number(power)][cmc] << copiesOfName;
-        manaCurveByToughness[QString::number(toughness)][cmc] += amount;
-        manaCurveCardsByToughness[QString::number(toughness)][cmc] << copiesOfName;
-
-        // ========== Category Counts ===========
-        for (auto &t : types) {
-            typeCount[t] += amount;
-        }
-        for (auto &st : subtypes) {
-            subtypeCount[st] += amount;
-        }
-        for (auto &c : colors) {
-            colorCount[c] += amount;
-        }
-        manaValueCount[cmc] += amount;
-
-        // ---------------- Mana Base ----------------
-        if (config.computeManaBase) {
-            auto prod = determineManaProduction(info->getText());
-            for (auto it = prod.begin(); it != prod.end(); ++it) {
-                if (it.value() > 0) {
-                    productionPipCount[it.key()] += it.value() * amount;
-                    productionCardCount[it.key()] += amount;
-                }
-                manaBaseMap[it.key()] += it.value() * amount;
-            }
-        }
-
-        // ---------------- Devotion ----------------
-        if (config.computeDevotion) {
-            auto devo = countManaSymbols(info->getManaCost());
-            for (auto &d : devo) {
-                if (d.second > 0) {
-                    devotionPipCount[QString(d.first)] += d.second * amount;
-                    devotionCardCount[QString(d.first)] += amount;
-                }
-                manaDevotionMap[d.first] += d.second * amount;
-            }
-        }
-    }
-
-    emit statsUpdated();
-}
-
-QHash<QString, int> DeckListStatisticsAnalyzer::determineManaProduction(const QString &rulesText)
-{
-    QHash<QString, int> manaCounts = {{"W", 0}, {"U", 0}, {"B", 0}, {"R", 0}, {"G", 0}, {"C", 0}};
-
-    QString text = rulesText.toLower(); // Normalize case for matching
-
-    // Quick keyword-based checks for any color and colorless mana
-    if (text.contains("{t}: add one mana of any color") || text.contains("add one mana of any color")) {
-        for (const auto &color : {QStringLiteral("W"), QStringLiteral("U"), QStringLiteral("B"), QStringLiteral("R"),
-                                  QStringLiteral("G")}) {
-            manaCounts[color]++;
-        }
-    }
-    if (text.contains("{t}: add {c}") || text.contains("add one colorless mana")) {
-        manaCounts["C"]++;
-    }
-
-    // Optimized regex for specific mana symbols
-    static const QRegularExpression specificColorRegex(R"(\{T\}:\s*Add\s*\{([WUBRG])\})");
-    QRegularExpressionMatch match = specificColorRegex.match(rulesText);
-    if (match.hasMatch()) {
-        manaCounts[match.captured(1)]++;
-    }
-
-    return manaCounts;
-}
-
-std::unordered_map<char, int> DeckListStatisticsAnalyzer::countManaSymbols(const QString &manaString)
-{
-    std::unordered_map<char, int> manaCounts = {{'W', 0}, {'U', 0}, {'B', 0}, {'R', 0}, {'G', 0}};
-
-    int len = manaString.length();
-    for (int i = 0; i < len; ++i) {
-        if (manaString[i] == '{') {
-            ++i; // Move past '{'
-            if (i < len && manaCounts.find(manaString[i].toLatin1()) != manaCounts.end()) {
-                char mana1 = manaString[i].toLatin1();
-                ++i; // Move to next character
-                if (i < len && manaString[i] == '/') {
-                    ++i; // Move past '/'
-                    if (i < len && manaCounts.find(manaString[i].toLatin1()) != manaCounts.end()) {
-                        char mana2 = manaString[i].toLatin1();
-                        manaCounts[mana1]++;
-                        manaCounts[mana2]++;
-                    } else {
-                        // Handle cases like "{W/}" where second part is invalid
-                        manaCounts[mana1]++;
-                    }
-                } else {
-                    manaCounts[mana1]++;
-                }
-            }
-            // Ensure we always skip to the closing '}'
-            while (i < len && manaString[i] != '}') {
-                ++i;
-            }
-        }
-        // Check if the character is a standalone mana symbol (not inside {})
-        else if (manaCounts.find(manaString[i].toLatin1()) != manaCounts.end()) {
-            manaCounts[manaString[i].toLatin1()]++;
-        }
-    }
-
-    return manaCounts;
-}
-
-// Hypergeometric probability: P(X=k)
-double DeckListStatisticsAnalyzer::hypergeometric(int N, int K, int n, int k)
-{
-    if (k < 0 || k > n || K > N) {
-        return 0.0;
-    }
-
-    auto choose = [](int n, int r) -> double {
-        if (r > n)
-            return 0.0;
-        if (r == 0 || r == n)
-            return 1.0;
-        double res = 1.0;
-        for (int i = 1; i <= r; ++i) {
-            res *= (n - r + i);
-            res /= i;
-        }
-        return res;
-    };
-
-    return choose(K, k) * choose(N - K, n - k) / choose(N, n);
-}
-
-void DeckListStatisticsAnalyzer::clearData()
-{
-    manaBaseMap.clear();
-    manaCurveMap.clear();
-    manaDevotionMap.clear();
-
-    devotionPipCount.clear();
-    devotionCardCount.clear();
-
-    productionPipCount.clear();
-    productionCardCount.clear();
-
-    manaCurveByType.clear();
-    manaCurveBySubtype.clear();
-    manaCurveByColor.clear();
-    manaCurveByPower.clear();
-    manaCurveByToughness.clear();
-
-    manaCurveCardsByType.clear();
-    manaCurveCardsBySubtype.clear();
-    manaCurveCardsByColor.clear();
-    manaCurveCardsByPower.clear();
-    manaCurveCardsByToughness.clear();
-
-    typeCount.clear();
-    subtypeCount.clear();
-    colorCount.clear();
-    rarityCount.clear();
-    manaValueCount.clear();
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h b/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h
deleted file mode 100644
index 52ae751bf..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h
+++ /dev/null
@@ -1,187 +0,0 @@
-#ifndef COCKATRICE_DECK_LIST_STATISTICS_ANALYZER_H
-#define COCKATRICE_DECK_LIST_STATISTICS_ANALYZER_H
-
-#include "deck_list_model.h"
-
-#include <QHash>
-#include <QObject>
-#include <unordered_map>
-
-class DeckListModel;
-
-struct DeckListStatisticsAnalyzerConfig
-{
-    bool computeManaBase = true;
-    bool computeManaCurve = true;
-    bool computeDevotion = true;
-    bool computeCategories = true;
-    bool computeCurveBreakdowns = true;
-    bool computeProbabilities = true;
-    bool includeSideboard = false;
-};
-
-class DeckListStatisticsAnalyzer : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit DeckListStatisticsAnalyzer(QObject *parent,
-                                        DeckListModel *model,
-                                        DeckListStatisticsAnalyzerConfig _config = DeckListStatisticsAnalyzerConfig());
-
-    void analyze();
-
-    [[nodiscard]] const QHash<QString, int> &getManaBase() const
-    {
-        return manaBaseMap;
-    }
-    [[nodiscard]] const std::unordered_map<int, int> &getManaCurve() const
-    {
-        return manaCurveMap;
-    }
-    [[nodiscard]] const std::unordered_map<char, int> &getDevotion() const
-    {
-        return manaDevotionMap;
-    }
-
-    const QHash<QString, int> &getDevotionPipCount() const
-    {
-        return devotionPipCount;
-    }
-    const QHash<QString, int> &getDevotionCardCount() const
-    {
-        return devotionCardCount;
-    }
-
-    const QHash<QString, int> &getProductionPipCount() const
-    {
-        return productionPipCount;
-    }
-    const QHash<QString, int> &getProductionCardCount() const
-    {
-        return productionCardCount;
-    }
-
-    const QHash<QString, int> &getTypeCount() const
-    {
-        return typeCount;
-    }
-    const QHash<QString, int> &getSubtypeCount() const
-    {
-        return subtypeCount;
-    }
-    const QHash<QString, int> &getColorCount() const
-    {
-        return colorCount;
-    }
-    const QHash<QString, int> &getRarityCount() const
-    {
-        return rarityCount;
-    }
-    const QHash<int, int> &getManaValueCount() const
-    {
-        return manaValueCount;
-    }
-
-    const QHash<QString, QHash<int, int>> &getManaCurveByType() const
-    {
-        return manaCurveByType;
-    }
-    const QHash<QString, QHash<int, int>> &getManaCurveBySubtype() const
-    {
-        return manaCurveBySubtype;
-    }
-    const QHash<QString, QHash<int, int>> &getManaCurveByColor() const
-    {
-        return manaCurveByColor;
-    }
-    const QHash<QString, QHash<int, int>> &getManaCurveByPower() const
-    {
-        return manaCurveByPower;
-    }
-    const QHash<QString, QHash<int, int>> &getManaCurveByToughness() const
-    {
-        return manaCurveByToughness;
-    }
-
-    const QHash<QString, QHash<int, QStringList>> &getManaCurveCardsByType() const
-    {
-        return manaCurveCardsByType;
-    }
-
-    const QHash<QString, QHash<int, QStringList>> &getManaCurveCardsBySubtype() const
-    {
-        return manaCurveCardsBySubtype;
-    }
-
-    const QHash<QString, QHash<int, QStringList>> &getManaCurveCardsByColor() const
-    {
-        return manaCurveCardsByColor;
-    }
-
-    const QHash<QString, QHash<int, QStringList>> &getManaCurveCardsByPower() const
-    {
-        return manaCurveCardsByPower;
-    }
-
-    const QHash<QString, QHash<int, QStringList>> &getManaCurveCardsByToughness() const
-    {
-        return manaCurveCardsByToughness;
-    }
-
-    DeckListModel *getModel() const
-    {
-        return model;
-    }
-
-    DeckListStatisticsAnalyzerConfig &getConfig()
-    {
-        return config;
-    }
-
-signals:
-    void statsUpdated();
-
-private:
-    DeckListModel *model;
-    DeckListStatisticsAnalyzerConfig config;
-
-    QHash<QString, int> manaBaseMap;
-    std::unordered_map<int, int> manaCurveMap;
-    std::unordered_map<char, int> manaDevotionMap;
-
-    QHash<QString, int> devotionPipCount;  // W/U/B/R/G total symbols
-    QHash<QString, int> devotionCardCount; // how many cards provide devotion
-
-    QHash<QString, int> productionPipCount;  // mana produced by cards
-    QHash<QString, int> productionCardCount; // number of producers
-
-    QHash<QString, int> typeCount;
-    QHash<QString, int> subtypeCount;
-    QHash<QString, int> colorCount;
-    QHash<QString, int> rarityCount;
-    QHash<int, int> manaValueCount;
-
-    QHash<QString, QHash<int, int>> manaCurveByType;
-    QHash<QString, QHash<int, int>> manaCurveBySubtype;
-    QHash<QString, QHash<int, int>> manaCurveByColor;
-    QHash<QString, QHash<int, int>> manaCurveByPower;
-    QHash<QString, QHash<int, int>> manaCurveByToughness;
-
-    QHash<QString, QHash<int, QStringList>> manaCurveCardsByType;
-    QHash<QString, QHash<int, QStringList>> manaCurveCardsBySubtype;
-    QHash<QString, QHash<int, QStringList>> manaCurveCardsByColor;
-    QHash<QString, QHash<int, QStringList>> manaCurveCardsByPower;
-    QHash<QString, QHash<int, QStringList>> manaCurveCardsByToughness;
-
-    // Not storing card info — only numeric results.
-    QHash<QString, QHash<int, QHash<int, double>>> probabilityExact;
-    QHash<QString, QHash<int, QHash<int, double>>> probabilityAtLeast;
-
-    QHash<QString, int> determineManaProduction(const QString &);
-    std::unordered_map<char, int> countManaSymbols(const QString &);
-    double hypergeometric(int N, int K, int n, int k);
-    void clearData();
-};
-
-#endif // COCKATRICE_DECK_LIST_STATISTICS_ANALYZER_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
new file mode 100644
index 000000000..11d87be40
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
@@ -0,0 +1,135 @@
+#include "mana_base_widget.h"
+
+#include "../../../database/card_database.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../deck/deck_loader.h"
+#include "../general/display/banner_widget.h"
+#include "../general/display/bar_widget.h"
+
+#include <QHash>
+#include <QRegularExpression>
+#include <deck_list.h>
+
+ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel)
+    : QWidget(parent), deckListModel(_deckListModel)
+{
+    layout = new QVBoxLayout(this);
+    setLayout(layout);
+
+    bannerWidget = new BannerWidget(this, tr("Mana Base"), Qt::Vertical, 100);
+    bannerWidget->setMaximumHeight(100);
+    layout->addWidget(bannerWidget);
+
+    barContainer = new QWidget(this);
+    barLayout = new QHBoxLayout(barContainer);
+    layout->addWidget(barContainer);
+
+    connect(deckListModel, &DeckListModel::dataChanged, this, &ManaBaseWidget::analyzeManaBase);
+
+    retranslateUi();
+}
+
+void ManaBaseWidget::retranslateUi()
+{
+    bannerWidget->setText(tr("Mana Base"));
+}
+
+void ManaBaseWidget::setDeckModel(DeckListModel *deckModel)
+{
+    deckListModel = deckModel;
+    connect(deckListModel, &DeckListModel::dataChanged, this, &ManaBaseWidget::analyzeManaBase);
+    analyzeManaBase();
+}
+
+void ManaBaseWidget::updateDisplay()
+{
+    // Clear the layout first
+    QLayoutItem *item;
+    while ((item = barLayout->takeAt(0)) != nullptr) {
+        item->widget()->deleteLater();
+        delete item;
+    }
+
+    int highestEntry = 0;
+    for (auto entry : manaBaseMap) {
+        if (entry > highestEntry) {
+            highestEntry = entry;
+        }
+    }
+
+    // Define color mapping for mana types
+    QHash<QString, QColor> manaColors;
+    manaColors.insert("W", QColor(248, 231, 185));
+    manaColors.insert("U", QColor(14, 104, 171));
+    manaColors.insert("B", QColor(21, 11, 0));
+    manaColors.insert("R", QColor(211, 32, 42));
+    manaColors.insert("G", QColor(0, 115, 62));
+    manaColors.insert("C", QColor(150, 150, 150));
+
+    for (auto manaColor : manaBaseMap.keys()) {
+        QColor barColor = manaColors.value(manaColor, Qt::gray);
+        BarWidget *barWidget = new BarWidget(QString(manaColor), manaBaseMap[manaColor], highestEntry, barColor, this);
+        barLayout->addWidget(barWidget);
+    }
+
+    update();
+}
+
+QHash<QString, int> ManaBaseWidget::analyzeManaBase()
+{
+    manaBaseMap.clear();
+    InnerDecklistNode *listRoot = deckListModel->getDeckList()->getRoot();
+    for (int i = 0; i < listRoot->size(); i++) {
+        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+        for (int j = 0; j < currentZone->size(); j++) {
+            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+            if (!currentCard)
+                continue;
+
+            for (int k = 0; k < currentCard->getNumber(); ++k) {
+                CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
+                if (info) {
+                    auto devotion = determineManaProduction(info->getText());
+                    mergeManaCounts(manaBaseMap, devotion);
+                }
+            }
+        }
+    }
+
+    updateDisplay();
+    return manaBaseMap;
+}
+
+QHash<QString, int> ManaBaseWidget::determineManaProduction(const QString &rulesText)
+{
+    QHash<QString, int> manaCounts = {{"W", 0}, {"U", 0}, {"B", 0}, {"R", 0}, {"G", 0}, {"C", 0}};
+
+    QString text = rulesText.toLower(); // Normalize case for matching
+
+    // Quick keyword-based checks for any color and colorless mana
+    if (text.contains("{t}: add one mana of any color") || text.contains("add one mana of any color")) {
+        for (const auto &color : {QStringLiteral("W"), QStringLiteral("U"), QStringLiteral("B"), QStringLiteral("R"),
+                                  QStringLiteral("G")}) {
+            manaCounts[color]++;
+        }
+    }
+    if (text.contains("{t}: add {c}") || text.contains("add one colorless mana")) {
+        manaCounts["C"]++;
+    }
+
+    // Optimized regex for specific mana symbols
+    static const QRegularExpression specificColorRegex(R"(\{T\}:\s*Add\s*\{([WUBRG])\})");
+    QRegularExpressionMatch match = specificColorRegex.match(rulesText);
+    if (match.hasMatch()) {
+        manaCounts[match.captured(1)]++;
+    }
+
+    return manaCounts;
+}
+
+void ManaBaseWidget::mergeManaCounts(QHash<QString, int> &manaCounts1, const QHash<QString, int> &manaCounts2)
+{
+    for (auto it = manaCounts2.constBegin(); it != manaCounts2.constEnd(); ++it) {
+        manaCounts1[it.key()] += it.value();
+    }
+}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
new file mode 100644
index 000000000..ce79bc77b
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
@@ -0,0 +1,37 @@
+#ifndef MANA_BASE_WIDGET_H
+#define MANA_BASE_WIDGET_H
+
+#include "../../../deck/deck_list_model.h"
+#include "../general/display/banner_widget.h"
+
+#include <QHBoxLayout>
+#include <QWidget>
+#include <deck_list.h>
+#include <utility>
+
+class ManaBaseWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ManaBaseWidget(QWidget *parent, DeckListModel *deckListModel);
+    QHash<QString, int> analyzeManaBase();
+    void updateDisplay();
+
+    QHash<QString, int> determineManaProduction(const QString &manaString);
+    void mergeManaCounts(QHash<QString, int> &manaCounts1, const QHash<QString, int> &manaCounts2);
+
+public slots:
+    void setDeckModel(DeckListModel *deckModel);
+    void retranslateUi();
+
+private:
+    DeckListModel *deckListModel;
+    BannerWidget *bannerWidget;
+    QHash<QString, int> manaBaseMap;
+    QVBoxLayout *layout;
+    QWidget *barContainer;
+    QHBoxLayout *barLayout;
+};
+
+#endif // MANA_BASE_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
new file mode 100644
index 000000000..5a4e14dc9
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
@@ -0,0 +1,99 @@
+#include "mana_curve_widget.h"
+
+#include "../../../database/card_database.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../deck/deck_loader.h"
+#include "../../../main.h"
+#include "../general/display/banner_widget.h"
+#include "../general/display/bar_widget.h"
+
+#include <deck_list.h>
+#include <unordered_map>
+
+ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel)
+    : QWidget(parent), deckListModel(_deckListModel)
+{
+    layout = new QVBoxLayout(this);
+    setLayout(layout);
+
+    bannerWidget = new BannerWidget(this, tr("Mana Curve"), Qt::Vertical, 100);
+    bannerWidget->setMaximumHeight(100);
+    layout->addWidget(bannerWidget);
+
+    barContainer = new QWidget(this);
+    barLayout = new QHBoxLayout(barContainer);
+    layout->addWidget(barContainer);
+
+    connect(deckListModel, &DeckListModel::dataChanged, this, &ManaCurveWidget::analyzeManaCurve);
+
+    retranslateUi();
+}
+
+void ManaCurveWidget::retranslateUi()
+{
+    bannerWidget->setText(tr("Mana Curve"));
+}
+
+void ManaCurveWidget::setDeckModel(DeckListModel *deckModel)
+{
+    deckListModel = deckModel;
+    connect(deckListModel, &DeckListModel::dataChanged, this, &ManaCurveWidget::analyzeManaCurve);
+    analyzeManaCurve();
+}
+
+std::unordered_map<int, int> ManaCurveWidget::analyzeManaCurve()
+{
+    manaCurveMap.clear();
+    InnerDecklistNode *listRoot = deckListModel->getDeckList()->getRoot();
+    for (int i = 0; i < listRoot->size(); i++) {
+        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+        for (int j = 0; j < currentZone->size(); j++) {
+            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+            if (!currentCard)
+                continue;
+
+            for (int k = 0; k < currentCard->getNumber(); ++k) {
+                CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
+                if (info) {
+                    int cmc = info->getCmc().toInt();
+                    manaCurveMap[cmc]++;
+                }
+            }
+        }
+    }
+
+    updateDisplay();
+
+    return manaCurveMap;
+}
+
+void ManaCurveWidget::updateDisplay()
+{
+    // Clear the layout first
+    if (barLayout != nullptr) {
+        QLayoutItem *item;
+        while ((item = barLayout->takeAt(0)) != nullptr) {
+            item->widget()->deleteLater();
+            delete item;
+        }
+    }
+
+    int highestEntry = 0;
+    for (const auto &entry : manaCurveMap) {
+        if (entry.second > highestEntry) {
+            highestEntry = entry.second;
+        }
+    }
+
+    // Convert unordered_map to ordered map to ensure sorting by CMC
+    std::map<int, int> sortedManaCurve(manaCurveMap.begin(), manaCurveMap.end());
+
+    // Add new widgets to the layout in sorted order
+    for (const auto &entry : sortedManaCurve) {
+        BarWidget *barWidget =
+            new BarWidget(QString::number(entry.first), entry.second, highestEntry, QColor(122, 122, 122), this);
+        barLayout->addWidget(barWidget);
+    }
+
+    update(); // Update the widget display
+}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h
new file mode 100644
index 000000000..186f59371
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h
@@ -0,0 +1,33 @@
+#ifndef MANA_CURVE_WIDGET_H
+#define MANA_CURVE_WIDGET_H
+
+#include "../../../deck/deck_list_model.h"
+#include "../general/display/banner_widget.h"
+
+#include <QHBoxLayout>
+#include <QWidget>
+#include <unordered_map>
+
+class ManaCurveWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ManaCurveWidget(QWidget *parent, DeckListModel *deckListModel);
+    void updateDisplay();
+
+public slots:
+    void setDeckModel(DeckListModel *deckModel);
+    std::unordered_map<int, int> analyzeManaCurve();
+    void retranslateUi();
+
+private:
+    DeckListModel *deckListModel;
+    std::unordered_map<int, int> manaCurveMap;
+    QVBoxLayout *layout;
+    BannerWidget *bannerWidget;
+    QWidget *barContainer;
+    QHBoxLayout *barLayout;
+};
+
+#endif // MANA_CURVE_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
new file mode 100644
index 000000000..4960b009a
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
@@ -0,0 +1,146 @@
+#include "mana_devotion_widget.h"
+
+#include "../../../database/card_database.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../deck/deck_loader.h"
+#include "../../../main.h"
+#include "../general/display/banner_widget.h"
+#include "../general/display/bar_widget.h"
+
+#include <deck_list.h>
+#include <iostream>
+#include <regex>
+#include <string>
+#include <unordered_map>
+
+ManaDevotionWidget::ManaDevotionWidget(QWidget *parent, DeckListModel *_deckListModel)
+    : QWidget(parent), deckListModel(_deckListModel)
+{
+    layout = new QVBoxLayout(this);
+    setLayout(layout);
+
+    bannerWidget = new BannerWidget(this, tr("Mana Devotion"), Qt::Vertical, 100);
+    bannerWidget->setMaximumHeight(100);
+    layout->addWidget(bannerWidget);
+
+    barLayout = new QHBoxLayout();
+    layout->addLayout(barLayout);
+
+    connect(deckListModel, &DeckListModel::dataChanged, this, &ManaDevotionWidget::analyzeManaDevotion);
+
+    retranslateUi();
+}
+
+void ManaDevotionWidget::retranslateUi()
+{
+    bannerWidget->setText(tr("Mana Devotion"));
+}
+
+void ManaDevotionWidget::setDeckModel(DeckListModel *deckModel)
+{
+    deckListModel = deckModel;
+    connect(deckListModel, &DeckListModel::dataChanged, this, &ManaDevotionWidget::analyzeManaDevotion);
+    analyzeManaDevotion();
+}
+
+std::unordered_map<char, int> ManaDevotionWidget::analyzeManaDevotion()
+{
+    manaDevotionMap.clear();
+    InnerDecklistNode *listRoot = deckListModel->getDeckList()->getRoot();
+    for (int i = 0; i < listRoot->size(); i++) {
+        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+        for (int j = 0; j < currentZone->size(); j++) {
+            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+            if (!currentCard)
+                continue;
+
+            for (int k = 0; k < currentCard->getNumber(); ++k) {
+                CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
+                if (info) {
+                    auto devotion = countManaSymbols(info->getManaCost());
+                    mergeManaCounts(manaDevotionMap, devotion);
+                }
+            }
+        }
+    }
+
+    updateDisplay();
+    return manaDevotionMap;
+}
+
+void ManaDevotionWidget::updateDisplay()
+{
+    // Clear the layout first
+    QLayoutItem *item;
+    while ((item = barLayout->takeAt(0)) != nullptr) {
+        item->widget()->deleteLater();
+        delete item;
+    }
+
+    int highestEntry = 0;
+    for (auto entry : manaDevotionMap) {
+        if (highestEntry < entry.second) {
+            highestEntry = entry.second;
+        }
+    }
+
+    // Define color mapping for devotion bars
+    std::unordered_map<char, QColor> manaColors = {{'W', QColor(248, 231, 185)}, {'U', QColor(14, 104, 171)},
+                                                   {'B', QColor(21, 11, 0)},     {'R', QColor(211, 32, 42)},
+                                                   {'G', QColor(0, 115, 62)},    {'C', QColor(150, 150, 150)}};
+
+    for (auto entry : manaDevotionMap) {
+        QColor barColor = manaColors.count(entry.first) ? manaColors[entry.first] : Qt::gray;
+        BarWidget *barWidget = new BarWidget(QString(entry.first), entry.second, highestEntry, barColor, this);
+        barLayout->addWidget(barWidget);
+    }
+
+    update(); // Update the widget display
+}
+
+std::unordered_map<char, int> ManaDevotionWidget::countManaSymbols(const QString &manaString)
+{
+    std::unordered_map<char, int> manaCounts = {{'W', 0}, {'U', 0}, {'B', 0}, {'R', 0}, {'G', 0}};
+
+    int len = manaString.length();
+    for (int i = 0; i < len; ++i) {
+        if (manaString[i] == '{') {
+            ++i; // Move past '{'
+            if (i < len && manaCounts.find(manaString[i].toLatin1()) != manaCounts.end()) {
+                char mana1 = manaString[i].toLatin1();
+                ++i; // Move to next character
+                if (i < len && manaString[i] == '/') {
+                    ++i; // Move past '/'
+                    if (i < len && manaCounts.find(manaString[i].toLatin1()) != manaCounts.end()) {
+                        char mana2 = manaString[i].toLatin1();
+                        manaCounts[mana1]++;
+                        manaCounts[mana2]++;
+                    } else {
+                        // Handle cases like "{W/}" where second part is invalid
+                        manaCounts[mana1]++;
+                    }
+                } else {
+                    manaCounts[mana1]++;
+                }
+            }
+            // Ensure we always skip to the closing '}'
+            while (i < len && manaString[i] != '}') {
+                ++i;
+            }
+        }
+        // Check if the character is a standalone mana symbol (not inside {})
+        else if (manaCounts.find(manaString[i].toLatin1()) != manaCounts.end()) {
+            manaCounts[manaString[i].toLatin1()]++;
+        }
+    }
+
+    return manaCounts;
+}
+
+void ManaDevotionWidget::mergeManaCounts(std::unordered_map<char, int> &manaCounts1,
+                                         const std::unordered_map<char, int> &manaCounts2)
+{
+    for (const auto &pair : manaCounts2) {
+        manaCounts1[pair.first] += pair.second; // Add values for matching keys
+    }
+}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
new file mode 100644
index 000000000..36b99813e
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
@@ -0,0 +1,36 @@
+#ifndef MANA_DEVOTION_WIDGET_H
+#define MANA_DEVOTION_WIDGET_H
+
+#include "../../../deck/deck_list_model.h"
+#include "../general/display/banner_widget.h"
+
+#include <QHBoxLayout>
+#include <QWidget>
+#include <deck_list.h>
+#include <utility>
+
+class ManaDevotionWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ManaDevotionWidget(QWidget *parent, DeckListModel *deckListModel);
+    void updateDisplay();
+
+    std::unordered_map<char, int> countManaSymbols(const QString &manaString);
+    void mergeManaCounts(std::unordered_map<char, int> &manaCounts1, const std::unordered_map<char, int> &manaCounts2);
+
+public slots:
+    void setDeckModel(DeckListModel *deckModel);
+    std::unordered_map<char, int> analyzeManaDevotion();
+    void retranslateUi();
+
+private:
+    DeckListModel *deckListModel;
+    BannerWidget *bannerWidget;
+    std::unordered_map<char, int> manaDevotionMap;
+    QVBoxLayout *layout;
+    QHBoxLayout *barLayout;
+};
+
+#endif // MANA_DEVOTION_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
deleted file mode 100644
index f7bb5ac35..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-#include "resizable_panel.h"
-
-#include "libcockatrice/utility/qt_utils.h"
-
-#include <QColor>
-#include <QHBoxLayout>
-#include <QPixmap>
-#include <QtGlobal>
-
-ResizablePanel::ResizablePanel(const QString &_typeId, AbstractAnalyticsPanelWidget *analyticsPanel, QWidget *parent)
-    : QWidget(parent), panel(analyticsPanel), typeId(_typeId)
-{
-    setAcceptDrops(true);
-
-    auto *mainLayout = new QVBoxLayout(this);
-    mainLayout->setContentsMargins(0, 0, 0, 0);
-    mainLayout->setSpacing(0);
-
-    // Frame for selection highlight
-    frame = new QFrame(this);
-    frame->setFrameShape(QFrame::Box);
-    frame->setLineWidth(2);
-
-    auto *frameLayout = new QVBoxLayout(frame);
-    frameLayout->setContentsMargins(0, 0, 0, 0);
-    frameLayout->setSpacing(0);
-
-    // Add the analytics panel
-    frameLayout->addWidget(analyticsPanel);
-
-    dropIndicator = new QFrame(frame);
-    dropIndicator->setFixedHeight(3);
-    dropIndicator->hide();  // hidden by default
-    dropIndicator->raise(); // make sure it's above children
-
-    selectionOverlay = new QFrame(frame);
-    selectionOverlay->hide();  // hidden by default
-    selectionOverlay->raise(); // make sure it is above children
-    selectionOverlay->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-    // Bottom bar with drag button and resize handle
-    auto *bottomBar = new QWidget(frame);
-    auto *bottomLayout = new QHBoxLayout(bottomBar);
-    bottomLayout->setContentsMargins(0, 0, 0, 0);
-    bottomLayout->setSpacing(0);
-
-    // Drag button on the left
-    dragButton = new QPushButton("☰", bottomBar);
-    dragButton->setFixedSize(40, 8);
-    dragButton->setCursor(Qt::OpenHandCursor);
-    bottomLayout->addWidget(dragButton);
-
-    // Resize handle fills the rest
-    resizeHandle = new QWidget(bottomBar);
-    resizeHandle->setFixedHeight(8);
-    resizeHandle->setCursor(Qt::SizeVerCursor);
-    bottomLayout->addWidget(resizeHandle, 1);
-
-    frameLayout->addWidget(bottomBar);
-
-    mainLayout->addWidget(frame);
-
-    const QPalette &pal = QApplication::palette();
-    QColor mid = pal.color(QPalette::Mid);
-    QColor dark = pal.color(QPalette::Dark);
-    QColor midLight = pal.color(QPalette::Midlight);
-    QColor shadow = pal.color(QPalette::Shadow);
-    QColor placeholderText = pal.color(QPalette::PlaceholderText);
-
-    frame->setStyleSheet("QFrame { border: none; }");
-
-    dropIndicator->setStyleSheet("QFrame { background-color: #3daee9; }");
-
-    selectionOverlay->setStyleSheet("QFrame { background-color: rgba(61,174,233,50); }");
-
-    dragButton->setStyleSheet(QString("QPushButton { "
-                                      "background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 %1, stop:1 %2); "
-                                      "border: none; color: %3; font-size: 10px; }"
-                                      "QPushButton:hover { background: %4; }")
-                                  .arg(mid.name(), dark.name(), placeholderText.name(), midLight.name()));
-
-    resizeHandle->setStyleSheet(QString("QWidget { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, "
-                                        "stop:0 %1, stop:1 %2); }")
-                                    .arg(dark.name(), shadow.name()));
-
-    // Set size policy
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-
-    // Calculate initial height - use panel's size hint if available
-    int panelHint = analyticsPanel->sizeHint().height();
-    int panelMin = analyticsPanel->minimumSizeHint().height();
-
-    // Start with the larger of panel's hint and panel's minimum hint
-    currentHeight = qMax(panelHint + 8, panelMin + 8);
-    updateSizeConstraints();
-
-    // Install event filters
-    dragButton->installEventFilter(this);
-    resizeHandle->installEventFilter(this);
-
-    // Timer for auto-scroll during drag
-    autoScrollTimer = new QTimer(this);
-    autoScrollTimer->setInterval(50);
-    connect(autoScrollTimer, &QTimer::timeout, this, &ResizablePanel::performAutoScroll);
-}
-
-void ResizablePanel::setSelected(bool selected)
-{
-    if (selected) {
-        selectionOverlay->setGeometry(0, 0, width(), height());
-        selectionOverlay->show();
-    } else {
-        selectionOverlay->hide();
-    }
-}
-
-void ResizablePanel::setHeightFromSaved(int h)
-{
-    if (h > 0) {
-        currentHeight = qMax(h, getMinimumAllowedHeight());
-        updateSizeConstraints();
-    }
-}
-
-int ResizablePanel::getCurrentHeight() const
-{
-    return currentHeight;
-}
-
-QSize ResizablePanel::sizeHint() const
-{
-    return QSize(width(), currentHeight);
-}
-
-QSize ResizablePanel::minimumSizeHint() const
-{
-    return QSize(0, getMinimumAllowedHeight());
-}
-
-// =====================================================================================================================
-//                                                      Event Handling
-// =====================================================================================================================
-
-bool ResizablePanel::eventFilter(QObject *obj, QEvent *event)
-{
-    if (obj == dragButton) {
-        if (event->type() == QEvent::MouseButtonPress) {
-            auto *mouseEvent = static_cast<QMouseEvent *>(event);
-            if (mouseEvent->button() == Qt::LeftButton) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-                dragStartPos = mouseEvent->globalPosition().toPoint();
-#else
-                dragStartPos = mouseEvent->globalPos();
-#endif
-                isDraggingPanel = false;
-                dragButton->setCursor(Qt::ClosedHandCursor);
-            }
-            return false;
-        } else if (event->type() == QEvent::MouseMove) {
-            auto *mouseEvent = static_cast<QMouseEvent *>(event);
-            if (mouseEvent->buttons() & Qt::LeftButton) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-                QPoint currentPos = mouseEvent->globalPosition().toPoint();
-#else
-                QPoint currentPos = mouseEvent->globalPos();
-#endif
-                int distance = (currentPos - dragStartPos).manhattanLength();
-                if (distance >= 5 && !isDraggingPanel) {
-                    isDraggingPanel = true;
-                    startDrag();
-                    return true;
-                }
-            }
-            return false;
-        } else if (event->type() == QEvent::MouseButtonRelease) {
-            dragButton->setCursor(Qt::OpenHandCursor);
-            isDraggingPanel = false;
-            return false;
-        }
-    }
-
-    if (obj == resizeHandle) {
-        if (event->type() == QEvent::MouseButtonPress) {
-            auto *mouseEvent = static_cast<QMouseEvent *>(event);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-            resizeStartY = mouseEvent->globalPosition().y();
-#else
-            resizeStartY = mouseEvent->globalPos().y();
-#endif
-            isResizing = true;
-            resizeStartHeight = currentHeight;
-            resizeHandle->grabMouse();
-            return true;
-        } else if (event->type() == QEvent::MouseMove && isResizing) {
-            auto *mouseEvent = static_cast<QMouseEvent *>(event);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-            int deltaY = mouseEvent->globalPosition().y() - resizeStartY;
-#else
-            int deltaY = mouseEvent->globalPos().y() - resizeStartY;
-#endif
-            int newHeight = resizeStartHeight + deltaY;
-
-            int minAllowed = getMinimumAllowedHeight();
-            newHeight = qMax(newHeight, minAllowed);
-
-            currentHeight = newHeight;
-            updateSizeConstraints();
-
-            return true;
-        } else if (event->type() == QEvent::MouseButtonRelease) {
-            isResizing = false;
-            resizeHandle->releaseMouse();
-            return true;
-        }
-    }
-
-    return QWidget::eventFilter(obj, event);
-}
-
-void ResizablePanel::dragEnterEvent(QDragEnterEvent *event)
-{
-    if (event->mimeData()->hasFormat("application/x-resizablepanel")) {
-        event->acceptProposedAction();
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        showDropIndicator(event->position().y());
-#else
-        showDropIndicator(event->pos().y());
-#endif
-    }
-}
-
-void ResizablePanel::dragMoveEvent(QDragMoveEvent *event)
-{
-    if (event->mimeData()->hasFormat("application/x-resizablepanel")) {
-        event->acceptProposedAction();
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        showDropIndicator(event->position().y());
-        lastDragPos = mapToGlobal(event->position().toPoint());
-#else
-        showDropIndicator(event->pos().y());
-        lastDragPos = mapToGlobal(event->pos());
-#endif
-
-        if (!autoScrollTimer->isActive()) {
-            autoScrollTimer->start();
-        }
-    }
-}
-
-void ResizablePanel::dragLeaveEvent(QDragLeaveEvent *event)
-{
-    Q_UNUSED(event);
-    hideDropIndicator();
-    autoScrollTimer->stop();
-}
-
-void ResizablePanel::dropEvent(QDropEvent *event)
-{
-    hideDropIndicator();
-    autoScrollTimer->stop();
-
-    if (event->mimeData()->hasFormat("application/x-resizablepanel")) {
-        QByteArray data = event->mimeData()->data("application/x-resizablepanel");
-        quintptr ptr = *reinterpret_cast<const quintptr *>(data.constData());
-        ResizablePanel *draggedPanel = reinterpret_cast<ResizablePanel *>(ptr);
-
-        if (draggedPanel && draggedPanel != this) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-            bool insertBefore = (event->position().y() < height() / 2);
-#else
-            bool insertBefore = (event->pos().y() < height() / 2);
-#endif
-            emit dropRequested(draggedPanel, this, insertBefore);
-            event->acceptProposedAction();
-        }
-    }
-}
-
-void ResizablePanel::resizeEvent(QResizeEvent *event)
-{
-    QWidget::resizeEvent(event);
-
-    if (selectionOverlay->isVisible()) {
-        selectionOverlay->setGeometry(0, 0, width(), height());
-    }
-
-    if (dropIndicator->isVisible()) {
-        dropIndicator->setGeometry(0, dropIndicator->y(), width(), dropIndicator->height());
-    }
-}
-
-// =====================================================================================================================
-//                                                      Private Helpers
-// =====================================================================================================================
-
-int ResizablePanel::getMinimumAllowedHeight() const
-{
-    QSize panelMin = panel->minimumSizeHint();
-    int panelMinHeight = (panelMin.isValid() && panelMin.height() > 0) ? panelMin.height() : 100;
-    return panelMinHeight + 8;
-}
-
-void ResizablePanel::updateSizeConstraints()
-{
-    setMinimumHeight(currentHeight);
-    setMaximumHeight(currentHeight);
-    updateGeometry();
-}
-
-void ResizablePanel::startDrag()
-{
-    QDrag *drag = new QDrag(this);
-    QMimeData *mimeData = new QMimeData;
-
-    quintptr ptr = reinterpret_cast<quintptr>(this);
-    QByteArray data(reinterpret_cast<const char *>(&ptr), sizeof(ptr));
-    mimeData->setData("application/x-resizablepanel", data);
-
-    drag->setMimeData(mimeData);
-
-    QPixmap pixmap(width(), 40);
-    pixmap.fill(QColor(58, 58, 58, 200));
-    drag->setPixmap(pixmap);
-    drag->setHotSpot(QPoint(width() / 2, 20));
-
-    emit dragStarted(this);
-
-    autoScrollTimer->start();
-
-    Qt::DropAction result = drag->exec(Qt::MoveAction);
-    Q_UNUSED(result);
-
-    autoScrollTimer->stop();
-    dragButton->setCursor(Qt::OpenHandCursor);
-    isDraggingPanel = false;
-}
-
-void ResizablePanel::performAutoScroll()
-{
-    QScrollArea *scrollArea = QtUtils::findParentOfType<QScrollArea>(this);
-
-    if (!scrollArea) {
-        return;
-    }
-
-    QScrollBar *scrollBar = scrollArea->verticalScrollBar();
-    if (!scrollBar) {
-        return;
-    }
-
-    QRect scrollRect = scrollArea->viewport()->rect();
-    QPoint scrollTopLeft = scrollArea->viewport()->mapToGlobal(scrollRect.topLeft());
-    QRect globalScrollRect(scrollTopLeft, scrollRect.size());
-
-    const int scrollMargin = 50;
-    int scrollSpeed = 0;
-
-    if (lastDragPos.y() < globalScrollRect.top() + scrollMargin) {
-        scrollSpeed = -15;
-    } else if (lastDragPos.y() > globalScrollRect.bottom() - scrollMargin) {
-        scrollSpeed = 15;
-    }
-
-    if (scrollSpeed != 0) {
-        int newValue = scrollBar->value() + scrollSpeed;
-        newValue = qBound(scrollBar->minimum(), newValue, scrollBar->maximum());
-        scrollBar->setValue(newValue);
-    }
-}
-
-void ResizablePanel::showDropIndicator(double y)
-{
-    bool before = (y < height() / 2);
-    dropIndicator->setGeometry(0, before ? 0 : height() - 3, width(), 3);
-    dropIndicator->show();
-}
-
-void ResizablePanel::hideDropIndicator()
-{
-    dropIndicator->hide();
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h
deleted file mode 100644
index d958ec64d..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef COCKATRICE_RESIZABLE_PANEL_H
-#define COCKATRICE_RESIZABLE_PANEL_H
-
-#include "abstract_analytics_panel_widget.h"
-
-#include <QApplication>
-#include <QDrag>
-#include <QFrame>
-#include <QMimeData>
-#include <QMouseEvent>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QScrollBar>
-#include <QTimer>
-#include <QVBoxLayout>
-#include <QWidget>
-
-class ResizablePanel : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit ResizablePanel(const QString &typeId,
-                            AbstractAnalyticsPanelWidget *analyticsPanel,
-                            QWidget *parent = nullptr);
-
-    void setSelected(bool selected);
-    void setHeightFromSaved(int h);
-    int getCurrentHeight() const;
-
-    QSize sizeHint() const override;
-    QSize minimumSizeHint() const override;
-
-    QString getTypeId() const
-    {
-        return typeId;
-    }
-
-    AbstractAnalyticsPanelWidget *panel;
-
-signals:
-    void dragStarted(ResizablePanel *panel);
-    void dropRequested(ResizablePanel *dragged, ResizablePanel *target, bool insertBefore);
-
-protected:
-    bool eventFilter(QObject *obj, QEvent *event) override;
-    void dragEnterEvent(QDragEnterEvent *event) override;
-    void dragMoveEvent(QDragMoveEvent *event) override;
-    void dragLeaveEvent(QDragLeaveEvent *event) override;
-    void dropEvent(QDropEvent *event) override;
-    void resizeEvent(QResizeEvent *event) override;
-
-private:
-    int getMinimumAllowedHeight() const;
-    void updateSizeConstraints();
-    void startDrag();
-    void performAutoScroll();
-    void showDropIndicator(double y);
-    void hideDropIndicator();
-
-    QString typeId;
-
-    QFrame *frame;
-    QFrame *selectionOverlay;
-    QFrame *dropIndicator;
-    QPushButton *dragButton;
-    QWidget *resizeHandle;
-
-    int currentHeight;
-    bool isResizing = false;
-    bool isDraggingPanel = false;
-    double resizeStartY = 0;
-    int resizeStartHeight = 0;
-
-    QPoint dragStartPos;
-    QPoint lastDragPos;
-    QTimer *autoScrollTimer;
-};
-
-#endif // COCKATRICE_RESIZABLE_PANEL_H
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
deleted file mode 100644
index bacebe385..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "deck_editor_card_database_dock_widget.h"
-
-DeckEditorCardDatabaseDockWidget::DeckEditorCardDatabaseDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent)
-{
-    setObjectName("databaseDisplayDock");
-    setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-    setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
-
-    createDatabaseDisplayDock(parent);
-
-    retranslateUi();
-}
-
-void DeckEditorCardDatabaseDockWidget::createDatabaseDisplayDock(AbstractTabDeckEditor *deckEditor)
-{
-    databaseDisplayWidget = new DeckEditorDatabaseDisplayWidget(this, deckEditor);
-
-    auto *frame = new QVBoxLayout;
-    frame->setObjectName("databaseDisplayFrame");
-    frame->addWidget(databaseDisplayWidget);
-
-    auto *dockContents = new QWidget();
-    dockContents->setObjectName("databaseDisplayDockContents");
-    dockContents->setLayout(frame);
-    setWidget(dockContents);
-
-    installEventFilter(deckEditor);
-
-    // connect signals
-    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardChanged, deckEditor,
-            &AbstractTabDeckEditor::updateCard);
-    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::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()
-{
-    setWindowTitle(tr("Card Database"));
-}
-
-void DeckEditorCardDatabaseDockWidget::setFilterTree(FilterTree *filterTree)
-{
-    databaseDisplayWidget->setFilterTree(filterTree);
-}
-
-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
deleted file mode 100644
index 6ad442075..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
-#define COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
-
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-
-#include <QDockWidget>
-
-class AbstractTabDeckEditor;
-class CardDatabase;
-class DeckEditorDatabaseDisplayWidget;
-class FilterTree;
-
-class DeckEditorCardDatabaseDockWidget : public QDockWidget
-{
-public:
-    explicit DeckEditorCardDatabaseDockWidget(AbstractTabDeckEditor *parent);
-
-    DeckEditorDatabaseDisplayWidget *databaseDisplayWidget;
-
-    CardDatabase *getDatabase() const;
-    void setFilterTree(FilterTree *filterTree);
-
-public slots:
-    void retranslateUi();
-    void clearAllDatabaseFilters();
-    void highlightAllSearchEdit();
-
-private:
-    void createDatabaseDisplayDock(AbstractTabDeckEditor *deckEditor);
-};
-
-#endif // COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
index a78a9c9c5..3f12636a8 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
@@ -31,6 +31,7 @@ void DeckEditorCardInfoDockWidget::createCardInfoDock()
     setWidget(cardInfoDockContents);
 
     installEventFilter(deckEditor);
+    connect(this, &QDockWidget::topLevelChanged, deckEditor, &AbstractTabDeckEditor::dockTopLevelChanged);
 }
 
 void DeckEditorCardInfoDockWidget::updateCard(const ExactCard &_card)
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h
index 086ca2ca4..799e7512d 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h
@@ -1,14 +1,7 @@
-/**
- * @file deck_editor_card_info_dock_widget.h
- * @ingroup DeckEditorWidgets
- * @brief A Deck Editor DockWidget that displays a CardInfoFrameWidget, which shows detailed information about a card,
- * such as the picture or various attributes.
- */
-
 #ifndef DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
 #define DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
 #include "../cards/card_info_frame_widget.h"
 
 #include <QDockWidget>
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 c625ff1d9..bee131f00 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
@@ -1,18 +1,19 @@
 #include "deck_editor_database_display_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../database/card_database_manager.h"
 #include "../../../filters/syntax_help.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../../settings/cache_settings.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../../../tabs/tab_supervisor.h"
 #include "../../pixel_map_generator.h"
 
 #include <QClipboard>
+#include <QFile>
 #include <QHeaderView>
 #include <QMenu>
+#include <QTextBrowser>
 #include <QToolButton>
 #include <QTreeView>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/relation/card_relation.h>
 
 static bool canBeCommander(const CardInfo &cardInfo)
 {
@@ -21,10 +22,10 @@ static bool canBeCommander(const CardInfo &cardInfo)
            cardInfo.getText().contains("can be your commander", Qt::CaseInsensitive);
 }
 
-DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *deckEditor)
-    : QWidget(parent), deckEditor(deckEditor)
+DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(AbstractTabDeckEditor *parent)
+    : QWidget(parent), deckEditor(parent)
 {
-    setObjectName("databaseDisplayWidget");
+    setObjectName("centralWidget");
 
     centralFrame = new QVBoxLayout(this);
     centralFrame->setObjectName("centralFrame");
@@ -134,14 +135,14 @@ void DeckEditorDatabaseDisplayWidget::clearAllDatabaseFilters()
 
 void DeckEditorDatabaseDisplayWidget::updateCard(const QModelIndex &current, const QModelIndex & /*previous*/)
 {
+    const QString cardName = current.sibling(current.row(), 0).data().toString();
+
     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));
+    if (!current.model()->hasChildren(current.sibling(current.row(), 0))) {
+        emit cardChanged(getCardOrPinnedPrinting(cardName));
     }
 }
 
@@ -172,9 +173,23 @@ ExactCard DeckEditorDatabaseDisplayWidget::currentCard() const
         return {};
     }
 
-    const QString cardName = currentIndex.siblingAtColumn(CardDatabaseModel::NameColumn).data().toString();
+    const QString cardName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
 
-    return CardDatabaseManager::query()->getPreferredCard(cardName);
+    return getCardOrPinnedPrinting(cardName);
+}
+
+ExactCard DeckEditorDatabaseDisplayWidget::getCardOrPinnedPrinting(QString cardName) const
+{
+    const auto &cardProviderId = SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
+
+    ExactCard card = CardDatabaseManager::query()->getCard({cardName});
+
+    if (cardProviderId != "") {
+        return ExactCard(card.getCardPtr(),
+                         CardDatabaseManager::query()->getSpecificPrinting({cardName, cardProviderId}));
+    }
+
+    return card;
 }
 
 void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point)
@@ -188,7 +203,6 @@ void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point)
         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,
@@ -198,6 +212,7 @@ void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point)
 
         connect(addToDeck, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
         connect(addToSideboard, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
+        connect(selectPrinting, &QAction::triggered, this, [this, card] { deckEditor->showPrintingSelector(); });
         connect(edhRecCard, &QAction::triggered, this,
                 [this, card] { deckEditor->getTabSupervisor()->addEdhrecTab(card.getCardPtr()); });
 
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 16ae6e255..3944b03f6 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
@@ -1,21 +1,14 @@
-/**
- * @file deck_editor_database_display_widget.h
- * @ingroup DeckEditorWidgets
- * @ingroup CardDatabaseWidgets
- * @brief A Deck Editor Widget that displays a QTreeView of a CardDatabaseModel.
- */
-
 #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../../key_signals.h"
-#include "../utility/custom_line_edit.h"
+#include "../../../database/model/card_database_display_model.h"
+#include "../../../database/model/card_database_model.h"
+#include "../../../deck/custom_line_edit.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../../../utility/key_signals.h"
 
 #include <QHBoxLayout>
 #include <QWidget>
-#include <libcockatrice/models/database/card_database_display_model.h>
-#include <libcockatrice/models/database/card_database_model.h>
 
 class AbstractTabDeckEditor;
 class DeckEditorDatabaseDisplayWidget : public QWidget
@@ -23,29 +16,17 @@ class DeckEditorDatabaseDisplayWidget : public QWidget
 
     Q_OBJECT
 public:
-    explicit DeckEditorDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *deckEditor);
+    explicit DeckEditorDatabaseDisplayWidget(AbstractTabDeckEditor *parent);
     AbstractTabDeckEditor *deckEditor;
     SearchLineEdit *searchEdit;
     CardDatabaseModel *databaseModel;
     CardDatabaseDisplayModel *databaseDisplayModel;
 
-    QTreeView *getDatabaseView()
-    {
-        return databaseView;
-    }
-
 public slots:
     ExactCard currentCard() const;
+    ExactCard getCardOrPinnedPrinting(QString cardName) const;
     void setFilterTree(FilterTree *filterTree);
     void clearAllDatabaseFilters();
-    void updateSearch(const QString &search);
-    void updateCard(const QModelIndex &current, const QModelIndex &);
-    void actAddCardToMainDeck();
-    void actAddCardToSideboard();
-    void actDecrementCardFromMainDeck();
-    void actDecrementCardFromSideboard();
-    void databaseCustomMenu(QPoint point);
-    void copyDatabaseCellContents();
 
 signals:
     void addCardToMainDeck(const ExactCard &card);
@@ -64,6 +45,14 @@ private:
 
 private slots:
     void retranslateUi();
+    void updateSearch(const QString &search);
+    void updateCard(const QModelIndex &current, const QModelIndex &);
+    void actAddCardToMainDeck();
+    void actAddCardToSideboard();
+    void actDecrementCardFromMainDeck();
+    void actDecrementCardFromSideboard();
+    void databaseCustomMenu(QPoint point);
+    void copyDatabaseCellContents();
     void saveDbHeaderState();
 };
 
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 f939ae99d..dc995ff17 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
@@ -1,8 +1,7 @@
 #include "deck_editor_deck_dock_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "deck_list_style_proxy.h"
-#include "deck_state_manager.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../settings/cache_settings.h"
 
 #include <QComboBox>
 #include <QDockWidget>
@@ -10,35 +9,10 @@
 #include <QLabel>
 #include <QSplitter>
 #include <QTextEdit>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/utility/trice_limits.h>
-
-static int findRestoreIndex(const CardRef &wanted, const QComboBox *combo)
-{
-    // Try providerId + name (strongest match)
-    if (!wanted.providerId.isEmpty()) {
-        for (int i = 0; i < combo->count(); ++i) {
-            auto pair = combo->itemData(i).value<QPair<QString, QString>>();
-            if (pair.second == wanted.providerId && pair.first == wanted.name) {
-                return i;
-            }
-        }
-    }
-
-    // Try name only
-    for (int i = 0; i < combo->count(); ++i) {
-        auto pair = combo->itemData(i).value<QPair<QString, QString>>();
-        if (pair.first == wanted.name) {
-            return i;
-        }
-    }
-
-    // Not found
-    return -1;
-}
+#include <trice_limits.h>
 
 DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent)
-    : QDockWidget(parent), deckEditor(parent), deckStateManager(parent->deckStateManager)
+    : QDockWidget(parent), deckEditor(parent)
 {
     setObjectName("deckDock");
 
@@ -46,45 +20,34 @@ DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent
     setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
 
     installEventFilter(deckEditor);
+    connect(this, &DeckEditorDeckDockWidget::topLevelChanged, deckEditor, &AbstractTabDeckEditor::dockTopLevelChanged);
     createDeckDock();
 }
 
 void DeckEditorDeckDockWidget::createDeckDock()
 {
-    connect(getModel(), &DeckListModel::deckHashChanged, this, &DeckEditorDeckDockWidget::updateHash);
-
-    proxy = new DeckListStyleProxy(this);
-    proxy->setSourceModel(getModel());
-
-    historyManagerWidget = new DeckListHistoryManagerWidget(deckStateManager, proxy, this);
-    connect(historyManagerWidget, &DeckListHistoryManagerWidget::requestDisplayWidgetSync, this,
-            &DeckEditorDeckDockWidget::syncDisplayWidgetsToModel);
-
-    connect(deckStateManager, &DeckStateManager::focusIndexChanged, this, &DeckEditorDeckDockWidget::setSelectedIndex);
-    connect(deckStateManager, &DeckStateManager::deckReplaced, this,
-            &DeckEditorDeckDockWidget::syncDisplayWidgetsToModel);
-    connect(deckStateManager, &DeckStateManager::deckReplaced, this,
-            &DeckEditorDeckDockWidget::applyActiveGroupCriteria);
-
+    deckModel = new DeckListModel(this);
+    deckModel->setObjectName("deckModel");
+    connect(deckModel, &DeckListModel::deckHashChanged, this, &DeckEditorDeckDockWidget::updateHash);
     deckView = new QTreeView();
     deckView->setObjectName("deckView");
-    deckView->setModel(proxy);
+    deckView->setModel(deckModel);
     deckView->setUniformRowHeights(true);
     deckView->setSortingEnabled(true);
     deckView->sortByColumn(1, Qt::AscendingOrder);
     deckView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
     deckView->installEventFilter(&deckViewKeySignals);
+    deckView->setContextMenuPolicy(Qt::CustomContextMenu);
     deckView->setSelectionMode(QAbstractItemView::ExtendedSelection);
     connect(deckView->selectionModel(), &QItemSelectionModel::currentRowChanged, this,
             &DeckEditorDeckDockWidget::updateCard);
-    connect(deckView, &QTreeView::doubleClicked, this, &DeckEditorDeckDockWidget::actSwapSelection);
-    deckView->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(deckView, &QTreeView::doubleClicked, this, &DeckEditorDeckDockWidget::actSwapCard);
     connect(deckView, &QTreeView::customContextMenuRequested, this, &DeckEditorDeckDockWidget::decklistCustomMenu);
-    connect(&deckViewKeySignals, &KeySignals::onShiftS, this, &DeckEditorDeckDockWidget::actSwapSelection);
-    connect(&deckViewKeySignals, &KeySignals::onEnter, this, &DeckEditorDeckDockWidget::actIncrementSelection);
-    connect(&deckViewKeySignals, &KeySignals::onCtrlAltEqual, this, &DeckEditorDeckDockWidget::actIncrementSelection);
+    connect(&deckViewKeySignals, &KeySignals::onShiftS, this, &DeckEditorDeckDockWidget::actSwapCard);
+    connect(&deckViewKeySignals, &KeySignals::onEnter, this, &DeckEditorDeckDockWidget::actIncrement);
+    connect(&deckViewKeySignals, &KeySignals::onCtrlAltEqual, this, &DeckEditorDeckDockWidget::actIncrement);
     connect(&deckViewKeySignals, &KeySignals::onCtrlAltMinus, this, &DeckEditorDeckDockWidget::actDecrementSelection);
-    connect(&deckViewKeySignals, &KeySignals::onShiftRight, this, &DeckEditorDeckDockWidget::actIncrementSelection);
+    connect(&deckViewKeySignals, &KeySignals::onShiftRight, this, &DeckEditorDeckDockWidget::actIncrement);
     connect(&deckViewKeySignals, &KeySignals::onShiftLeft, this, &DeckEditorDeckDockWidget::actDecrementSelection);
     connect(&deckViewKeySignals, &KeySignals::onDelete, this, &DeckEditorDeckDockWidget::actRemoveCard);
 
@@ -94,15 +57,7 @@ void DeckEditorDeckDockWidget::createDeckDock()
     nameEdit->setMaxLength(MAX_NAME_LENGTH);
     nameEdit->setObjectName("nameEdit");
     nameLabel->setBuddy(nameEdit);
-
-    nameDebounceTimer = new QTimer(this);
-    nameDebounceTimer->setSingleShot(true);
-    nameDebounceTimer->setInterval(300); // debounce duration in ms
-    connect(nameDebounceTimer, &QTimer::timeout, this, &DeckEditorDeckDockWidget::writeName);
-
-    connect(nameEdit, &LineEditUnfocusable::textChanged, this, [this]() {
-        nameDebounceTimer->start(); // restart debounce timer
-    });
+    connect(nameEdit, &LineEditUnfocusable::textChanged, this, &DeckEditorDeckDockWidget::updateName);
 
     quickSettingsWidget = new SettingsButtonWidget(this);
 
@@ -125,12 +80,6 @@ void DeckEditorDeckDockWidget::createDeckDock()
     quickSettingsWidget->addSettingsWidget(showBannerCardCheckBox);
     quickSettingsWidget->addSettingsWidget(showTagsWidgetCheckBox);
 
-    formatLabel = new QLabel(this);
-
-    formatComboBox = new QComboBox(this);
-    formatComboBox->addItem(tr("Loading Database..."));
-    formatComboBox->setEnabled(false); // Disable until loaded
-
     commentsLabel = new QLabel();
     commentsLabel->setObjectName("commentsLabel");
     commentsEdit = new QTextEdit;
@@ -138,36 +87,22 @@ void DeckEditorDeckDockWidget::createDeckDock()
     commentsEdit->setMinimumHeight(nameEdit->minimumSizeHint().height());
     commentsEdit->setObjectName("commentsEdit");
     commentsLabel->setBuddy(commentsEdit);
-
-    commentsDebounceTimer = new QTimer(this);
-    commentsDebounceTimer->setSingleShot(true);
-    commentsDebounceTimer->setInterval(400); // longer debounce for multi-line
-    connect(commentsDebounceTimer, &QTimer::timeout, this, &DeckEditorDeckDockWidget::writeComments);
-
-    connect(commentsEdit, &QTextEdit::textChanged, this, [this]() {
-        commentsDebounceTimer->start(); // restart debounce timer
-    });
-
+    connect(commentsEdit, &QTextEdit::textChanged, this, &DeckEditorDeckDockWidget::updateComments);
     bannerCardLabel = new QLabel();
     bannerCardLabel->setObjectName("bannerCardLabel");
     bannerCardLabel->setText(tr("Banner Card"));
     bannerCardLabel->setHidden(!SettingsCache::instance().getDeckEditorBannerCardComboBoxVisible());
     bannerCardComboBox = new QComboBox(this);
-    connect(getModel(), &DeckListModel::cardNodesChanged, this, [this]() {
+    connect(deckModel, &DeckListModel::dataChanged, this, [this]() {
         // Delay the update to avoid race conditions
         QTimer::singleShot(100, this, &DeckEditorDeckDockWidget::updateBannerCardComboBox);
     });
-    connect(getModel(), &DeckListModel::cardAddedAt, this, &DeckEditorDeckDockWidget::recursiveExpand);
-    connect(getModel(), &DeckListModel::modelReset, this, &DeckEditorDeckDockWidget::expandAll);
-
     connect(bannerCardComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-            &DeckEditorDeckDockWidget::writeBannerCard);
+            &DeckEditorDeckDockWidget::setBannerCard);
     bannerCardComboBox->setHidden(!SettingsCache::instance().getDeckEditorBannerCardComboBoxVisible());
 
-    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, {});
+    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckModel->getDeckList());
     deckTagsDisplayWidget->setHidden(!SettingsCache::instance().getDeckEditorTagsWidgetVisible());
-    connect(deckTagsDisplayWidget, &DeckPreviewDeckTagsDisplayWidget::tagsChanged, deckStateManager,
-            &DeckStateManager::setTags);
 
     activeGroupCriteriaLabel = new QLabel(this);
 
@@ -175,12 +110,17 @@ void DeckEditorDeckDockWidget::createDeckDock()
     activeGroupCriteriaComboBox->addItem(tr("Main Type"), DeckListModelGroupCriteria::MAIN_TYPE);
     activeGroupCriteriaComboBox->addItem(tr("Mana Cost"), DeckListModelGroupCriteria::MANA_COST);
     activeGroupCriteriaComboBox->addItem(tr("Colors"), DeckListModelGroupCriteria::COLOR);
-    connect(activeGroupCriteriaComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this,
-            &DeckEditorDeckDockWidget::applyActiveGroupCriteria);
+    connect(activeGroupCriteriaComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [this]() {
+        deckModel->setActiveGroupCriteria(
+            static_cast<DeckListModelGroupCriteria>(activeGroupCriteriaComboBox->currentData(Qt::UserRole).toInt()));
+        deckModel->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder());
+        deckView->expandAll();
+        deckView->expandAll();
+    });
 
     aIncrement = new QAction(QString(), this);
     aIncrement->setIcon(QPixmap("theme:icons/increment"));
-    connect(aIncrement, &QAction::triggered, this, &DeckEditorDeckDockWidget::actIncrementSelection);
+    connect(aIncrement, &QAction::triggered, this, &DeckEditorDeckDockWidget::actIncrement);
     auto *tbIncrement = new QToolButton(this);
     tbIncrement->setDefaultAction(aIncrement);
 
@@ -198,7 +138,7 @@ void DeckEditorDeckDockWidget::createDeckDock()
 
     aSwapCard = new QAction(QString(), this);
     aSwapCard->setIcon(QPixmap("theme:icons/swap"));
-    connect(aSwapCard, &QAction::triggered, this, &DeckEditorDeckDockWidget::actSwapSelection);
+    connect(aSwapCard, &QAction::triggered, this, &DeckEditorDeckDockWidget::actSwapCard);
     auto *tbSwapCard = new QToolButton(this);
     tbSwapCard->setDefaultAction(aSwapCard);
 
@@ -213,16 +153,13 @@ void DeckEditorDeckDockWidget::createDeckDock()
     upperLayout->addWidget(commentsLabel, 1, 0);
     upperLayout->addWidget(commentsEdit, 1, 1);
 
-    upperLayout->addWidget(formatLabel, 2, 0);
-    upperLayout->addWidget(formatComboBox, 2, 1);
+    upperLayout->addWidget(bannerCardLabel, 2, 0);
+    upperLayout->addWidget(bannerCardComboBox, 2, 1);
 
-    upperLayout->addWidget(bannerCardLabel, 3, 0);
-    upperLayout->addWidget(bannerCardComboBox, 3, 1);
+    upperLayout->addWidget(deckTagsDisplayWidget, 3, 1);
 
-    upperLayout->addWidget(deckTagsDisplayWidget, 4, 1);
-
-    upperLayout->addWidget(activeGroupCriteriaLabel, 5, 0);
-    upperLayout->addWidget(activeGroupCriteriaComboBox, 5, 1);
+    upperLayout->addWidget(activeGroupCriteriaLabel, 4, 0);
+    upperLayout->addWidget(activeGroupCriteriaComboBox, 4, 1);
 
     hashLabel1 = new QLabel();
     hashLabel1->setObjectName("hashLabel1");
@@ -242,8 +179,7 @@ void DeckEditorDeckDockWidget::createDeckDock()
     lowerLayout->addWidget(tbDecrement, 0, 3);
     lowerLayout->addWidget(tbRemoveCard, 0, 4);
     lowerLayout->addWidget(tbSwapCard, 0, 5);
-    lowerLayout->addWidget(historyManagerWidget, 0, 6);
-    lowerLayout->addWidget(deckView, 1, 0, 1, 7);
+    lowerLayout->addWidget(deckView, 1, 0, 1, 6);
 
     // Create widgets for both layouts to make splitter work correctly
     auto *topWidget = new QWidget;
@@ -271,44 +207,6 @@ void DeckEditorDeckDockWidget::createDeckDock()
 
     refreshShortcuts();
     retranslateUi();
-
-    connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
-            &DeckEditorDeckDockWidget::initializeFormats);
-
-    if (CardDatabaseManager::getInstance()->getLoadStatus() == LoadStatus::Ok) {
-        initializeFormats();
-    }
-}
-
-void DeckEditorDeckDockWidget::initializeFormats()
-{
-    QStringList allFormats = CardDatabaseManager::query()->getAllFormatsWithCount().keys();
-
-    formatComboBox->clear(); // Remove "Loading Database..."
-    formatComboBox->setEnabled(true);
-
-    // Populate with formats
-    formatComboBox->addItem("", "");
-    for (auto formatName : allFormats) {
-        formatComboBox->addItem(formatName, formatName); // store the raw key in itemData
-    }
-
-    QString format = deckStateManager->getMetadata().gameFormat;
-    if (!format.isEmpty()) {
-        formatComboBox->setCurrentIndex(formatComboBox->findData(format));
-    } else {
-        // Ensure no selection is visible initially
-        formatComboBox->setCurrentIndex(-1);
-    }
-
-    connect(formatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index) {
-        if (index >= 0) {
-            QString formatKey = formatComboBox->itemData(index).toString();
-            deckStateManager->setFormat(formatKey);
-        } else {
-            deckStateManager->setFormat(""); // clear format if deselected
-        }
-    });
 }
 
 ExactCard DeckEditorDeckDockWidget::getCurrentCard()
@@ -316,18 +214,20 @@ ExactCard DeckEditorDeckDockWidget::getCurrentCard()
     QModelIndex current = deckView->selectionModel()->currentIndex();
     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 QString cardName = current.sibling(current.row(), 1).data().toString();
+    const QString cardProviderID = current.sibling(current.row(), 4).data().toString();
     const QModelIndex gparent = current.parent().parent();
 
     if (!gparent.isValid()) {
         return {};
     }
 
-    const QString zoneName = gparent.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+    const QString zoneName = gparent.sibling(gparent.row(), 1).data(Qt::EditRole).toString();
 
-    if (!current.model()->hasChildren(current.siblingAtColumn(DeckListModelColumns::CARD_AMOUNT))) {
-        if (ExactCard selectedCard = CardDatabaseManager::query()->getCard({cardName, cardProviderID})) {
+    if (!current.model()->hasChildren(current.sibling(current.row(), 0))) {
+        QString cardName = current.sibling(current.row(), 1).data().toString();
+        QString providerId = current.sibling(current.row(), 4).data().toString();
+        if (ExactCard selectedCard = CardDatabaseManager::query()->getCard({cardName, providerId})) {
             return selectedCard;
         }
     }
@@ -337,37 +237,37 @@ ExactCard DeckEditorDeckDockWidget::getCurrentCard()
 void DeckEditorDeckDockWidget::updateCard(const QModelIndex /*&current*/, const QModelIndex & /*previous*/)
 {
     if (ExactCard card = getCurrentCard()) {
-        emit selectedCardChanged(card);
+        emit cardChanged(card);
     }
 }
 
-/**
- * @brief Writes the contents of the name textBox to the DeckStateManager
- */
-void DeckEditorDeckDockWidget::writeName()
+void DeckEditorDeckDockWidget::updateName(const QString &name)
 {
-    QString name = nameEdit->text();
-    deckStateManager->setName(name);
+    deckModel->getDeckList()->setName(name);
+    deckEditor->setModified(name.isEmpty());
+    emit nameChanged();
+    emit deckModified();
 }
 
-/**
- * @brief Writes the contents of the comments textBox to the DeckStateManager
- */
-void DeckEditorDeckDockWidget::writeComments()
+void DeckEditorDeckDockWidget::updateComments()
 {
-    QString comments = commentsEdit->toPlainText();
-    deckStateManager->setComments(comments);
+    deckModel->getDeckList()->setComments(commentsEdit->toPlainText());
+    deckEditor->setModified(commentsEdit->toPlainText().isEmpty());
+    emit commentsChanged();
+    emit deckModified();
 }
 
 void DeckEditorDeckDockWidget::updateHash()
 {
-    hashLabel->setText(deckStateManager->getDeckHash());
+    hashLabel->setText(deckModel->getDeckList()->getDeckHash());
+    emit hashChanged();
+    emit deckModified();
 }
 
 void DeckEditorDeckDockWidget::updateBannerCardComboBox()
 {
-    // Store current banner card identity
-    CardRef wanted = deckStateManager->getMetadata().bannerCard;
+    // Store the current text of the combo box
+    QString currentText = bannerCardComboBox->currentText();
 
     // Block signals temporarily
     bool wasBlocked = bannerCardComboBox->blockSignals(true);
@@ -375,62 +275,64 @@ void DeckEditorDeckDockWidget::updateBannerCardComboBox()
     // Clear the existing items in the combo box
     bannerCardComboBox->clear();
 
-    // Collect unique (name, providerId) pairs
+    // Prepare the new items with deduplication
     QSet<QPair<QString, QString>> bannerCardSet;
-    QList<CardRef> cardsInDeck = getModel()->getCardRefs();
+    InnerDecklistNode *listRoot = deckModel->getDeckList()->getRoot();
+    for (int i = 0; i < listRoot->size(); i++) {
+        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+        for (int j = 0; j < currentZone->size(); j++) {
+            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+            if (!currentCard)
+                continue;
 
-    for (auto cardRef : cardsInDeck) {
-        if (!CardDatabaseManager::query()->getCard(cardRef)) {
-            continue;
+            for (int k = 0; k < currentCard->getNumber(); ++k) {
+                if (CardDatabaseManager::query()->getCard(currentCard->toCardRef())) {
+                    bannerCardSet.insert({currentCard->getName(), currentCard->getCardProviderId()});
+                }
+            }
         }
-
-        // Insert one entry per distinct card, ignore copies
-        bannerCardSet.insert({cardRef.name, cardRef.providerId});
     }
 
-    // Convert to sorted list
     QList<QPair<QString, QString>> pairList = bannerCardSet.values();
 
     // Sort QList by the first() element of the QPair
-    std::sort(pairList.begin(), pairList.end(),
-              [](const auto &a, const auto &b) { return a.first.toLower() < b.first.toLower(); });
+    std::sort(pairList.begin(), pairList.end(), [](const QPair<QString, QString> &a, const QPair<QString, QString> &b) {
+        return a.first.toLower() < b.first.toLower();
+    });
 
-    // Add to combo box
     for (const auto &pair : pairList) {
         bannerCardComboBox->addItem(pair.first, QVariant::fromValue(pair));
     }
 
-    // Try to find an index with a matching card
-    int restoreIndex = findRestoreIndex(wanted, bannerCardComboBox);
-
-    // Handle results
-    if (restoreIndex != -1) {
-        bannerCardComboBox->setCurrentIndex(restoreIndex);
+    // Try to restore the previous selection by finding the currentText
+    int restoredIndex = bannerCardComboBox->findText(currentText);
+    if (restoredIndex != -1) {
+        bannerCardComboBox->setCurrentIndex(restoredIndex);
+        if (deckModel->getDeckList()->getBannerCard().providerId !=
+            bannerCardComboBox->currentData().value<QPair<QString, QString>>().second) {
+            setBannerCard(restoredIndex);
+        }
     } else {
         // Add a placeholder "-" and set it as the current selection
-        bannerCardComboBox->insertItem(0, "-");
-        bannerCardComboBox->setCurrentIndex(0);
+        int bannerIndex = bannerCardComboBox->findText(deckModel->getDeckList()->getBannerCard().name);
+        if (bannerIndex != -1) {
+            bannerCardComboBox->setCurrentIndex(bannerIndex);
+        } else {
+            bannerCardComboBox->insertItem(0, "-");
+            bannerCardComboBox->setCurrentIndex(0);
+        }
     }
 
-    // Restore signal state
+    // Restore the previous signal blocking state
     bannerCardComboBox->blockSignals(wasBlocked);
 }
 
-/**
- * @brief Writes the selected bannerCard to the DeckStateManager
- */
-void DeckEditorDeckDockWidget::writeBannerCard(int index)
+void DeckEditorDeckDockWidget::setBannerCard(int /* changedIndex */)
 {
-    auto [name, id] = bannerCardComboBox->itemData(index).value<QPair<QString, QString>>();
-    CardRef bannerCard = {name, id};
-    deckStateManager->setBannerCard(bannerCard);
-}
-
-void DeckEditorDeckDockWidget::applyActiveGroupCriteria()
-{
-    getModel()->setActiveGroupCriteria(
-        static_cast<DeckListModelGroupCriteria::Type>(activeGroupCriteriaComboBox->currentData(Qt::UserRole).toInt()));
-    getModel()->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder());
+    auto [name, id] = bannerCardComboBox->currentData().value<QPair<QString, QString>>();
+    deckModel->getDeckList()->setBannerCard({name, id});
+    deckEditor->setModified(true);
+    emit deckModified();
 }
 
 void DeckEditorDeckDockWidget::updateShowBannerCardComboBox(const bool visible)
@@ -446,7 +348,7 @@ void DeckEditorDeckDockWidget::updateShowTagsWidget(const bool visible)
 
 void DeckEditorDeckDockWidget::syncBannerCardComboBoxSelectionWithDeck()
 {
-    if (deckStateManager->getMetadata().bannerCard.name == "") {
+    if (deckModel->getDeckList()->getBannerCard().name == "") {
         if (bannerCardComboBox->findText("-") != -1) {
             bannerCardComboBox->setCurrentIndex(bannerCardComboBox->findText("-"));
         } else {
@@ -454,185 +356,92 @@ void DeckEditorDeckDockWidget::syncBannerCardComboBoxSelectionWithDeck()
             bannerCardComboBox->setCurrentIndex(0);
         }
     } else {
-        bannerCardComboBox->setCurrentText(deckStateManager->getMetadata().bannerCard.name);
+        bannerCardComboBox->setCurrentText(deckModel->getDeckList()->getBannerCard().name);
     }
 }
 
-void DeckEditorDeckDockWidget::setSelectedIndex(const QModelIndex &newCardIndex, bool preserveWidgetFocus)
+/**
+ * Sets the currently active deck for this tab
+ * @param _deck The deck. Takes ownership of the object
+ */
+void DeckEditorDeckDockWidget::setDeck(DeckLoader *_deck)
 {
-    deckView->clearSelection();
-    deckView->setCurrentIndex(newCardIndex);
-    recursiveExpand(newCardIndex);
+    deckModel->setDeckList(_deck);
 
-    if (!preserveWidgetFocus) {
-        deckView->setFocus(Qt::FocusReason::MouseFocusReason);
-    }
-}
+    nameEdit->setText(deckModel->getDeckList()->getName());
+    commentsEdit->setText(deckModel->getDeckList()->getComments());
 
-void DeckEditorDeckDockWidget::syncDisplayWidgetsToModel()
-{
-    nameEdit->blockSignals(true);
-    nameEdit->setText(deckStateManager->getMetadata().name);
-    nameEdit->blockSignals(false);
-
-    commentsEdit->blockSignals(true);
-    commentsEdit->setText(deckStateManager->getMetadata().comments);
-    commentsEdit->blockSignals(false);
-
-    bannerCardComboBox->blockSignals(true);
     syncBannerCardComboBoxSelectionWithDeck();
     updateBannerCardComboBox();
-    bannerCardComboBox->blockSignals(false);
     updateHash();
+    deckModel->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder());
+    deckView->expandAll();
+    deckView->expandAll();
 
-    formatComboBox->blockSignals(true);
-    formatComboBox->setCurrentIndex(formatComboBox->findData(deckStateManager->getMetadata().gameFormat));
-    formatComboBox->blockSignals(false);
+    deckTagsDisplayWidget->connectDeckList(deckModel->getDeckList());
 
-    deckTagsDisplayWidget->blockSignals(true);
-    deckTagsDisplayWidget->setTags(deckStateManager->getMetadata().tags);
-    deckTagsDisplayWidget->blockSignals(false);
+    emit deckChanged();
+}
+
+DeckLoader *DeckEditorDeckDockWidget::getDeckList()
+{
+    return deckModel->getDeckList();
 }
 
 /**
- * @brief Convenience method to get the underlying model instance from the DeckStateManager
+ * Resets the tab to the state for a blank new tab.
  */
-DeckListModel *DeckEditorDeckDockWidget::getModel() const
+void DeckEditorDeckDockWidget::cleanDeck()
 {
-    return deckStateManager->getModel();
+    deckModel->cleanList();
+    nameEdit->setText(QString());
+    emit nameChanged();
+    commentsEdit->setText(QString());
+    emit commentsChanged();
+    hashLabel->setText(QString());
+    emit hashChanged();
+    emit deckModified();
+    emit deckChanged();
+    updateBannerCardComboBox();
+    deckTagsDisplayWidget->connectDeckList(deckModel->getDeckList());
 }
 
-void DeckEditorDeckDockWidget::selectPrevCard()
+void DeckEditorDeckDockWidget::recursiveExpand(const QModelIndex &index)
 {
-    changeSelectedCard(-1);
-}
-
-void DeckEditorDeckDockWidget::selectNextCard()
-{
-    changeSelectedCard(1);
+    if (index.parent().isValid())
+        recursiveExpand(index.parent());
+    deckView->expand(index);
 }
 
 /**
- * @brief Selects a card based on the change direction.
- *
- * @param changeBy The direction to change, -1 for previous, 1 for next.
- */
-void DeckEditorDeckDockWidget::changeSelectedCard(int changeBy)
-{
-    if (changeBy == 0) {
-        return;
-    }
-
-    // Get the current index of the selected item
-    auto deckViewCurrentIndex = deckView->currentIndex();
-
-    // For some reason, if the deckModel is modified but the view is not manually reselected,
-    // currentIndex will return an index for the underlying deckModel instead of the proxy.
-    // That index will return an invalid index when indexBelow/indexAbove crosses a header node,
-    // causing the selection to fail to move down.
-    /// \todo Figure out why it's happening so we can do a proper fix instead of a hacky workaround
-    if (deckViewCurrentIndex.model() == proxy->sourceModel()) {
-        deckViewCurrentIndex = proxy->mapFromSource(deckViewCurrentIndex);
-    }
-
-    auto nextIndex = deckViewCurrentIndex.siblingAtRow(deckViewCurrentIndex.row() + changeBy);
-    if (!nextIndex.isValid()) {
-        nextIndex = deckViewCurrentIndex;
-
-        // Increment to the next valid index, skipping header rows
-        AbstractDecklistNode *node;
-        do {
-            if (changeBy > 0) {
-                nextIndex = deckView->indexBelow(nextIndex);
-            } else {
-                nextIndex = deckView->indexAbove(nextIndex);
-            }
-            node = static_cast<AbstractDecklistNode *>(nextIndex.internalPointer());
-        } while (node && node->isDeckHeader());
-    }
-
-    if (nextIndex.isValid()) {
-        deckView->setCurrentIndex(nextIndex);
-        deckView->setFocus(Qt::FocusReason::MouseFocusReason);
-    }
-}
-
-/**
- * @brief Expands all parents of the given index.
- * @param sourceIndex The index to expand (model source index)
- */
-void DeckEditorDeckDockWidget::recursiveExpand(const QModelIndex &sourceIndex)
-{
-    auto index = proxy->mapFromSource(sourceIndex);
-
-    while (index.parent().isValid()) {
-        index = index.parent();
-        deckView->expand(index);
-    }
-}
-
-/**
- * @brief Fully expands all levels of the deck view
- */
-void DeckEditorDeckDockWidget::expandAll()
-{
-    deckView->expandRecursively(deckView->rootIndex());
-}
-
-/**
- * Gets the source index of all the currently selected card nodes in the decklist table.
+ * Gets the index of all the currently selected card nodes in the decklist table.
  * The list is in reverse order of the visual selection, so that rows can be deleted while iterating over them.
  *
- * @return A list containing the source indices of all selected card nodes
+ * @return A model index list containing all selected card nodes
  */
-QModelIndexList DeckEditorDeckDockWidget::getSelectedCardNodeSourceIndices() const
+QModelIndexList DeckEditorDeckDockWidget::getSelectedCardNodes() const
 {
     auto selectedRows = deckView->selectionModel()->selectedRows();
 
-    const auto mapToSource = [this](const QModelIndex &index) { return proxy->mapToSource(index); };
-    std::transform(selectedRows.begin(), selectedRows.end(), selectedRows.begin(), mapToSource);
-
-    const auto notLeafNode = [this](const QModelIndex &sourceIndex) { return getModel()->hasChildren(sourceIndex); };
+    const auto notLeafNode = [this](const auto &index) { return deckModel->hasChildren(index); };
     selectedRows.erase(std::remove_if(selectedRows.begin(), selectedRows.end(), notLeafNode), selectedRows.end());
 
     std::reverse(selectedRows.begin(), selectedRows.end());
     return selectedRows;
 }
 
-void DeckEditorDeckDockWidget::actAddCard(const ExactCard &card, const QString &zoneName)
+void DeckEditorDeckDockWidget::actIncrement()
 {
-    if (!card) {
-        return;
-    }
+    auto selectedRows = getSelectedCardNodes();
 
-    deckStateManager->addCard(card, zoneName);
-}
-
-void DeckEditorDeckDockWidget::actIncrementSelection()
-{
-    auto selectedRows = getSelectedCardNodeSourceIndices();
-
-    for (const auto &sourceIndex : selectedRows) {
-        offsetCountAtIndex(sourceIndex, true);
+    for (const auto &index : selectedRows) {
+        offsetCountAtIndex(index, 1);
     }
 }
 
-void DeckEditorDeckDockWidget::actSwapCard(const ExactCard &card, const QString &zoneName)
+void DeckEditorDeckDockWidget::actSwapCard()
 {
-    QString providerId = card.getPrinting().getUuid();
-    QString collectorNumber = card.getPrinting().getProperty("num");
-
-    QModelIndex foundCard = getModel()->findCard(card.getName(), zoneName, providerId, collectorNumber);
-    if (!foundCard.isValid()) {
-        foundCard = getModel()->findCard(card.getName(), zoneName);
-    }
-
-    deckStateManager->swapCardAtIndex(foundCard);
-}
-
-void DeckEditorDeckDockWidget::actSwapSelection()
-{
-    auto selectedRows = getSelectedCardNodeSourceIndices();
+    auto selectedRows = getSelectedCardNodes();
 
     // 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
@@ -640,15 +449,52 @@ void DeckEditorDeckDockWidget::actSwapSelection()
         deckView->setSelectionMode(QAbstractItemView::SingleSelection);
     }
 
-    for (const auto &sourceIndex : selectedRows) {
-        deckStateManager->swapCardAtIndex(sourceIndex);
+    bool isModified = false;
+    for (const auto &currentIndex : selectedRows) {
+        if (swapCard(currentIndex)) {
+            isModified = true;
+        }
     }
 
     deckView->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
+    if (isModified) {
+        emit deckModified();
+    }
+
     update();
 }
 
+/**
+ * Swaps the card at the index between the maindeck and sideboard
+ *
+ * @param currentIndex The index to swap.
+ * @return True if the swap was successful
+ */
+bool DeckEditorDeckDockWidget::swapCard(const QModelIndex &currentIndex)
+{
+    if (!currentIndex.isValid())
+        return false;
+    const QString cardName = currentIndex.sibling(currentIndex.row(), 1).data().toString();
+    const QString cardProviderID = currentIndex.sibling(currentIndex.row(), 4).data().toString();
+    const QModelIndex gparent = currentIndex.parent().parent();
+
+    if (!gparent.isValid())
+        return false;
+
+    const QString zoneName = gparent.sibling(gparent.row(), 1).data(Qt::EditRole).toString();
+    offsetCountAtIndex(currentIndex, -1);
+    const QString otherZoneName = zoneName == DECK_ZONE_MAIN ? DECK_ZONE_SIDE : DECK_ZONE_MAIN;
+
+    ExactCard card = CardDatabaseManager::query()->getCard({cardName, cardProviderID});
+    QModelIndex newCardIndex = card ? deckModel->addCard(card, otherZoneName)
+                                    // Third argument (true) says create the card no matter what, even if not in DB
+                                    : deckModel->addPreferredPrintingCard(cardName, otherZoneName, true);
+    recursiveExpand(newCardIndex);
+
+    return true;
+}
+
 void DeckEditorDeckDockWidget::actDecrementCard(const ExactCard &card, QString zoneName)
 {
     if (!card)
@@ -656,12 +502,22 @@ void DeckEditorDeckDockWidget::actDecrementCard(const ExactCard &card, QString z
     if (card.getInfo().getIsToken())
         zoneName = DECK_ZONE_TOKENS;
 
-    deckStateManager->decrementCard(card, zoneName);
+    QString providerId = card.getPrinting().getUuid();
+    QString collectorNumber = card.getPrinting().getProperty("num");
+
+    QModelIndex idx = deckModel->findCard(card.getName(), zoneName, providerId, collectorNumber);
+    if (!idx.isValid()) {
+        return;
+    }
+
+    deckView->clearSelection();
+    deckView->setCurrentIndex(idx);
+    offsetCountAtIndex(idx, -1);
 }
 
 void DeckEditorDeckDockWidget::actDecrementSelection()
 {
-    auto selectedRows = getSelectedCardNodeSourceIndices();
+    auto selectedRows = getSelectedCardNodes();
 
     // 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
@@ -669,8 +525,8 @@ void DeckEditorDeckDockWidget::actDecrementSelection()
         deckView->setSelectionMode(QAbstractItemView::SingleSelection);
     }
 
-    for (const auto &sourceIndex : selectedRows) {
-        offsetCountAtIndex(sourceIndex, false);
+    for (const auto &index : selectedRows) {
+        offsetCountAtIndex(index, -1);
     }
 
     deckView->setSelectionMode(QAbstractItemView::ExtendedSelection);
@@ -678,7 +534,7 @@ void DeckEditorDeckDockWidget::actDecrementSelection()
 
 void DeckEditorDeckDockWidget::actRemoveCard()
 {
-    auto selectedRows = getSelectedCardNodeSourceIndices();
+    auto selectedRows = getSelectedCardNodes();
 
     // 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
@@ -686,29 +542,37 @@ void DeckEditorDeckDockWidget::actRemoveCard()
         deckView->setSelectionMode(QAbstractItemView::SingleSelection);
     }
 
-    for (const auto &sourceIndex : selectedRows) {
-        deckStateManager->removeCardAtIndex(sourceIndex);
+    bool isModified = false;
+    for (const auto &index : selectedRows) {
+        if (!index.isValid() || deckModel->hasChildren(index)) {
+            continue;
+        }
+        deckModel->removeRow(index.row(), index.parent());
+        isModified = true;
     }
 
     deckView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+
+    if (isModified) {
+        emit deckModified();
+    }
 }
 
-/**
- * @brief Increments or decrements the amount of the card node at the index by 1.
- * @param idx The source index
- * @param isIncrement If true, increments the count. If false, decrements the count
- */
-void DeckEditorDeckDockWidget::offsetCountAtIndex(const QModelIndex &idx, bool isIncrement)
+void DeckEditorDeckDockWidget::offsetCountAtIndex(const QModelIndex &idx, int offset)
 {
-    if (!idx.isValid() || getModel()->hasChildren(idx)) {
+    if (!idx.isValid() || deckModel->hasChildren(idx)) {
         return;
     }
 
-    if (isIncrement) {
-        deckStateManager->incrementCountAtIndex(idx);
-    } else {
-        deckStateManager->decrementCountAtIndex(idx);
-    }
+    const QModelIndex numberIndex = idx.sibling(idx.row(), 0);
+    const int count = deckModel->data(numberIndex, Qt::EditRole).toInt();
+    const int new_count = count + offset;
+    if (new_count <= 0)
+        deckModel->removeRow(idx.row(), idx.parent());
+    else
+        deckModel->setData(numberIndex, new_count, Qt::EditRole);
+
+    emit deckModified();
 }
 
 void DeckEditorDeckDockWidget::decklistCustomMenu(QPoint point)
@@ -716,6 +580,7 @@ void DeckEditorDeckDockWidget::decklistCustomMenu(QPoint point)
     QMenu menu;
 
     QAction *selectPrinting = menu.addAction(tr("Select Printing"));
+
     connect(selectPrinting, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::showPrintingSelector);
 
     menu.exec(deckView->mapToGlobal(point));
@@ -739,8 +604,6 @@ void DeckEditorDeckDockWidget::retranslateUi()
     showTagsWidgetCheckBox->setText(tr("Show tags selection menu"));
     commentsLabel->setText(tr("&Comments:"));
     activeGroupCriteriaLabel->setText(tr("Group by:"));
-    formatLabel->setText(tr("Format:"));
-
     hashLabel1->setText(tr("Hash:"));
 
     aIncrement->setText(tr("&Increment number"));
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
index 8dddf5882..2fbea169a 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
@@ -1,25 +1,17 @@
-/**
- * @file deck_editor_deck_dock_widget.h
- * @ingroup DeckEditorWidgets
- * @brief A Deck Editor DockWidget that displays several Qt Editors to modify various deck attributes as well as a
- * QTreeView of the DeckListModel.
- */
-
 #ifndef DECK_EDITOR_DECK_DOCK_WIDGET_H
 #define DECK_EDITOR_DECK_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../../key_signals.h"
-#include "../utility/custom_line_edit.h"
+#include "../../../card/card_info.h"
+#include "../../../deck/custom_line_edit.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../../../utility/key_signals.h"
 #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
-#include "deck_list_history_manager_widget.h"
-#include "deck_list_style_proxy.h"
 
+#include <QComboBox>
 #include <QDockWidget>
 #include <QLabel>
 #include <QTextEdit>
 #include <QTreeView>
-#include <libcockatrice/card/card_info.h>
 
 class DeckListModel;
 class AbstractTabDeckEditor;
@@ -28,87 +20,75 @@ class DeckEditorDeckDockWidget : public QDockWidget
     Q_OBJECT
 public:
     explicit DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent);
-
-    DeckListStyleProxy *proxy;
+    DeckListModel *deckModel;
     QTreeView *deckView;
     QComboBox *bannerCardComboBox;
     void createDeckDock();
     ExactCard getCurrentCard();
     void retranslateUi();
-
-    QComboBox *getGroupByComboBox()
+    QString getDeckName()
     {
-        return activeGroupCriteriaComboBox;
+        return nameEdit->text();
     }
-
-    [[nodiscard]] QItemSelectionModel *getSelectionModel() const
+    QString getSimpleDeckName()
     {
-        return deckView->selectionModel();
+        return nameEdit->text().simplified();
     }
 
 public slots:
-    void selectPrevCard();
-    void selectNextCard();
+    void cleanDeck();
     void updateBannerCardComboBox();
-    void syncDisplayWidgetsToModel();
-    void actAddCard(const ExactCard &card, const QString &zoneName);
-    void actIncrementSelection();
+    void setDeck(DeckLoader *_deck);
+    DeckLoader *getDeckList();
+    void actIncrement();
+    bool swapCard(const QModelIndex &idx);
     void actDecrementCard(const ExactCard &card, QString zoneName);
     void actDecrementSelection();
-    void actSwapCard(const ExactCard &card, const QString &zoneName);
-    void actSwapSelection();
+    void actSwapCard();
     void actRemoveCard();
-    void initializeFormats();
+    void offsetCountAtIndex(const QModelIndex &idx, int offset);
 
 signals:
-    void selectedCardChanged(const ExactCard &card);
+    void nameChanged();
+    void commentsChanged();
+    void hashChanged();
+    void deckChanged();
+    void deckModified();
+    void cardChanged(const ExactCard &_card);
 
 private:
     AbstractTabDeckEditor *deckEditor;
-    DeckStateManager *deckStateManager;
-
-    DeckListHistoryManagerWidget *historyManagerWidget;
     KeySignals deckViewKeySignals;
     QLabel *nameLabel;
     LineEditUnfocusable *nameEdit;
-    QTimer *nameDebounceTimer;
     SettingsButtonWidget *quickSettingsWidget;
     QCheckBox *showBannerCardCheckBox;
     QCheckBox *showTagsWidgetCheckBox;
     QLabel *commentsLabel;
     QTextEdit *commentsEdit;
-    QTimer *commentsDebounceTimer;
     QLabel *bannerCardLabel;
     DeckPreviewDeckTagsDisplayWidget *deckTagsDisplayWidget;
     QLabel *hashLabel1;
     LineEditUnfocusable *hashLabel;
     QLabel *activeGroupCriteriaLabel;
     QComboBox *activeGroupCriteriaComboBox;
-    QLabel *formatLabel;
-    QComboBox *formatComboBox;
 
     QAction *aRemoveCard, *aIncrement, *aDecrement, *aSwapCard;
 
-    DeckListModel *getModel() const;
-    [[nodiscard]] QModelIndexList getSelectedCardNodeSourceIndices() const;
-    void offsetCountAtIndex(const QModelIndex &idx, bool isIncrement);
+    void recursiveExpand(const QModelIndex &index);
+    QModelIndexList getSelectedCardNodes() const;
 
 private slots:
     void decklistCustomMenu(QPoint point);
     void updateCard(QModelIndex, const QModelIndex &current);
-    void writeName();
-    void writeComments();
-    void writeBannerCard(int);
-    void applyActiveGroupCriteria();
-    void setSelectedIndex(const QModelIndex &newCardIndex, bool preserveWidgetFocus);
+    void updateName(const QString &name);
+    void updateComments();
+    void setBannerCard(int);
     void updateHash();
     void refreshShortcuts();
     void updateShowBannerCardComboBox(bool visible);
     void updateShowTagsWidget(bool visible);
     void syncBannerCardComboBoxSelectionWithDeck();
-    void changeSelectedCard(int changeBy);
-    void recursiveExpand(const QModelIndex &parent);
-    void expandAll();
 };
 
 #endif // DECK_EDITOR_DECK_DOCK_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
index 8a9a6cdaa..51d0cdbbe 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
@@ -1,8 +1,9 @@
 #include "deck_editor_filter_dock_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../database/model/card_database_model.h"
 #include "../../../filters/filter_builder.h"
 #include "../../../filters/filter_tree_model.h"
+#include "../../../settings/cache_settings.h"
 
 #include <QGridLayout>
 #include <QMenu>
@@ -80,6 +81,7 @@ void DeckEditorFilterDockWidget::createFiltersDock()
     setWidget(filterDockContents);
 
     installEventFilter(deckEditor);
+    connect(this, &QDockWidget::topLevelChanged, deckEditor, &AbstractTabDeckEditor::dockTopLevelChanged);
 }
 
 void DeckEditorFilterDockWidget::filterViewCustomContextMenu(const QPoint &point)
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
index b61fc72b5..25c2d79e2 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
@@ -1,17 +1,11 @@
-/**
- * @file deck_editor_filter_dock_widget.h
- * @ingroup DeckEditorWidgets
- * @ingroup CardDatabaseWidgets
- * @brief A Deck Editor DockWidget that displays and allows modifying filters applied to the CardDatabaseDisplayModel.
- */
-
 #ifndef DECK_EDITOR_FILTER_DOCK_WIDGET_H
 #define DECK_EDITOR_FILTER_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../../key_signals.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../../../utility/key_signals.h"
 
 #include <QDockWidget>
+#include <QTreeView>
 
 class FilterTreeModel;
 class AbstractTabDeckEditor;
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
index a91601f2e..732c74cf2 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
@@ -1,8 +1,6 @@
 #include "deck_editor_printing_selector_dock_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "printing_disabled_info_widget.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
 
 #include <QVBoxLayout>
 
@@ -16,11 +14,6 @@ DeckEditorPrintingSelectorDockWidget::DeckEditorPrintingSelectorDockWidget(Abstr
     setFloating(false);
 
     createPrintingSelectorDock();
-    printingDisabledInfoWidget = new PrintingDisabledInfoWidget(this);
-
-    setVisibleWidget(SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference());
-    connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this,
-            &DeckEditorPrintingSelectorDockWidget::setVisibleWidget);
 
     retranslateUi();
 }
@@ -33,31 +26,16 @@ void DeckEditorPrintingSelectorDockWidget::createPrintingSelectorDock()
     printingSelectorFrame->setObjectName("printingSelectorFrame");
     printingSelectorFrame->addWidget(printingSelector);
 
-    printingSelectorDockContents = new QWidget();
+    auto *printingSelectorDockContents = new QWidget();
     printingSelectorDockContents->setObjectName("printingSelectorDockContents");
     printingSelectorDockContents->setLayout(printingSelectorFrame);
+    setWidget(printingSelectorDockContents);
 
     installEventFilter(deckEditor);
-    connect(printingSelector, &PrintingSelector::prevCardRequested, deckEditor->getDeckDockWidget(),
-            &DeckEditorDeckDockWidget::selectPrevCard);
-    connect(printingSelector, &PrintingSelector::nextCardRequested, deckEditor->getDeckDockWidget(),
-            &DeckEditorDeckDockWidget::selectNextCard);
+    connect(this, &QDockWidget::topLevelChanged, deckEditor, &AbstractTabDeckEditor::dockTopLevelChanged);
 }
 
 void DeckEditorPrintingSelectorDockWidget::retranslateUi()
 {
     setWindowTitle(tr("Printing Selector"));
 }
-
-void DeckEditorPrintingSelectorDockWidget::setVisibleWidget(bool overridePrintings)
-{
-    if (overridePrintings) {
-        setWidget(printingDisabledInfoWidget);
-    } else {
-        setWidget(printingSelectorDockContents);
-        printingSelector->updateDisplay();
-    }
-
-    printingDisabledInfoWidget->setVisible(overridePrintings);
-    printingSelectorDockContents->setVisible(!overridePrintings);
-}
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h
index 1037b55fb..ffc4297cb 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h
@@ -1,20 +1,12 @@
-/**
- * @file deck_editor_printing_selector_dock_widget.h
- * @ingroup DeckEditorWidgets
- * @brief A Deck Editor DockWidget that displays a PrintingSelector, which allows choosing different printings.
- */
-
 #ifndef DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H
 #define DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
 #include "../printing_selector/printing_selector.h"
 
 #include <QDockWidget>
 
-class PrintingDisabledInfoWidget;
 class TabDeckEditor;
-
 class DeckEditorPrintingSelectorDockWidget : public QDockWidget
 {
     Q_OBJECT
@@ -22,16 +14,10 @@ public:
     explicit DeckEditorPrintingSelectorDockWidget(AbstractTabDeckEditor *parent);
     void createPrintingSelectorDock();
     void retranslateUi();
-
     PrintingSelector *printingSelector;
 
 private:
     AbstractTabDeckEditor *deckEditor;
-    QWidget *printingSelectorDockContents;
-    PrintingDisabledInfoWidget *printingDisabledInfoWidget;
-
-private slots:
-    void setVisibleWidget(bool overridePrintings);
 };
 
 #endif // DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
deleted file mode 100644
index cef459752..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-#include "deck_list_history_manager_widget.h"
-
-#include "deck_state_manager.h"
-
-DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_deckStateManager,
-                                                           DeckListStyleProxy *_styleProxy,
-                                                           QWidget *parent)
-    : QWidget(parent), deckStateManager(_deckStateManager), styleProxy(_styleProxy)
-{
-    layout = new QHBoxLayout(this);
-
-    aUndo = new QAction(QString(), this);
-    aUndo->setIcon(QPixmap("theme:icons/arrow_undo"));
-    aUndo->setShortcut(QKeySequence::Undo);
-    aUndo->setShortcutContext(Qt::ApplicationShortcut);
-    connect(aUndo, &QAction::triggered, this, &DeckListHistoryManagerWidget::doUndo);
-
-    undoButton = new QToolButton(this);
-    undoButton->setDefaultAction(aUndo);
-
-    aRedo = new QAction(QString(), this);
-    aRedo->setIcon(QPixmap("theme:icons/arrow_redo"));
-    aRedo->setShortcut(QKeySequence::Redo);
-    aRedo->setShortcutContext(Qt::ApplicationShortcut);
-    connect(aRedo, &QAction::triggered, this, &DeckListHistoryManagerWidget::doRedo);
-
-    redoButton = new QToolButton(this);
-    redoButton->setDefaultAction(aRedo);
-
-    layout->addWidget(undoButton);
-    layout->addWidget(redoButton);
-
-    historyButton = new SettingsButtonWidget(this);
-    historyButton->setButtonIcon(QPixmap("theme:icons/arrow_history"));
-
-    historyLabel = new QLabel(this);
-
-    historyList = new QListWidget(this);
-    historyList->setAlternatingRowColors(true);
-
-    historyButton->addSettingsWidget(historyLabel);
-    historyButton->addSettingsWidget(historyList);
-
-    layout->addWidget(historyButton);
-
-    connect(historyList, &QListWidget::itemClicked, this, &DeckListHistoryManagerWidget::onListClicked);
-
-    connect(deckStateManager, &DeckStateManager::historyChanged, this, &DeckListHistoryManagerWidget::refreshList);
-
-    refreshList();
-    retranslateUi();
-}
-
-void DeckListHistoryManagerWidget::retranslateUi()
-{
-    undoButton->setToolTip(tr("Undo"));
-    redoButton->setToolTip(tr("Redo"));
-    historyButton->setToolTip(tr("Undo/Redo history"));
-    historyLabel->setText(tr("Click on an entry to revert to that point in the history."));
-}
-
-void DeckListHistoryManagerWidget::refreshList()
-{
-    historyList->clear();
-
-    DeckListHistoryManager *historyManager = deckStateManager->getHistoryManager();
-
-    // Fill redo section first (oldest redo at top, newest redo closest to divider)
-    const auto redoStack = historyManager->getRedoStack();
-    for (int i = 0; i < redoStack.size(); ++i) { // iterate forward
-        auto item = new QListWidgetItem(tr("[redo] ") + redoStack[i].getReason(), historyList);
-        item->setData(Qt::UserRole, QVariant("redo"));
-        item->setData(Qt::UserRole + 1, i); // index in redo stack
-        item->setForeground(Qt::gray);
-        historyList->addItem(item);
-    }
-
-    // Divider
-    if (!historyManager->getUndoStack().isEmpty() && !historyManager->getRedoStack().isEmpty()) {
-        auto divider = new QListWidgetItem("──────────", historyList);
-        divider->setFlags(Qt::NoItemFlags); // not selectable
-        historyList->addItem(divider);
-    }
-
-    // Fill undo section
-    const auto undoStack = historyManager->getUndoStack();
-    for (int i = undoStack.size() - 1; i >= 0; --i) {
-        auto item = new QListWidgetItem(tr("[undo] ") + undoStack[i].getReason(), historyList);
-        item->setData(Qt::UserRole, QVariant("undo"));
-        item->setData(Qt::UserRole + 1, i); // index in undo stack
-        historyList->addItem(item);
-    }
-
-    // Button enabled states
-    undoButton->setEnabled(historyManager->canUndo());
-    redoButton->setEnabled(historyManager->canRedo());
-}
-
-void DeckListHistoryManagerWidget::onListClicked(const QListWidgetItem *item)
-{
-    // Ignore non-selectable items (like divider)
-    if (!(item->flags() & Qt::ItemIsSelectable)) {
-        return;
-    }
-
-    const QString mode = item->data(Qt::UserRole).toString();
-    int index = item->data(Qt::UserRole + 1).toInt();
-
-    if (mode == "redo") {
-        const auto redoStack = deckStateManager->getHistoryManager()->getRedoStack();
-        int steps = redoStack.size() - index;
-        deckStateManager->redo(steps);
-    } else if (mode == "undo") {
-        const auto undoStack = deckStateManager->getHistoryManager()->getUndoStack();
-        int steps = undoStack.size() - index;
-        deckStateManager->undo(steps);
-    }
-
-    refreshList();
-}
-
-void DeckListHistoryManagerWidget::doUndo()
-{
-    deckStateManager->undo();
-}
-
-void DeckListHistoryManagerWidget::doRedo()
-{
-    deckStateManager->redo();
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h
deleted file mode 100644
index ab53912e2..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef COCKATRICE_DECK_EDITOR_DECK_LIST_HISTORY_MANAGER_WIDGET_H
-#define COCKATRICE_DECK_EDITOR_DECK_LIST_HISTORY_MANAGER_WIDGET_H
-
-#ifndef COCKATRICE_DECK_UNDO_WIDGET_H
-#define COCKATRICE_DECK_UNDO_WIDGET_H
-
-#include "../quick_settings/settings_button_widget.h"
-#include "deck_list_style_proxy.h"
-
-#include <QAction>
-#include <QHBoxLayout>
-#include <QListWidget>
-#include <QWidget>
-#include <libcockatrice/deck_list/deck_list_history_manager.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-
-class DeckStateManager;
-
-class DeckListHistoryManagerWidget : public QWidget
-{
-    Q_OBJECT
-
-signals:
-    void requestDisplayWidgetSync();
-
-public slots:
-    void retranslateUi();
-
-public:
-    explicit DeckListHistoryManagerWidget(DeckStateManager *deckStateManager,
-                                          DeckListStyleProxy *styleProxy,
-                                          QWidget *parent = nullptr);
-
-private slots:
-    void refreshList();
-    void onListClicked(const QListWidgetItem *item);
-    void doUndo();
-    void doRedo();
-
-private:
-    DeckStateManager *deckStateManager;
-    DeckListStyleProxy *styleProxy;
-
-    QHBoxLayout *layout;
-    QAction *aUndo;
-    QToolButton *undoButton;
-    QAction *aRedo;
-    QToolButton *redoButton;
-    SettingsButtonWidget *historyButton;
-    QLabel *historyLabel;
-    QListWidget *historyList;
-};
-
-#endif // COCKATRICE_DECK_UNDO_WIDGET_H
-
-#endif // COCKATRICE_DECK_EDITOR_DECK_LIST_HISTORY_MANAGER_WIDGET_H
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
deleted file mode 100644
index 14c5faae7..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "deck_list_style_proxy.h"
-
-#include <QBrush>
-#include <QColor>
-#include <QFont>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-
-QVariant DeckListStyleProxy::data(const QModelIndex &index, int role) const
-{
-    QModelIndex src = mapToSource(index);
-    if (!src.isValid())
-        return {};
-
-    QVariant value = QIdentityProxyModel::data(index, role);
-
-    bool isCard = src.data(DeckRoles::IsCardRole).toBool();
-
-    if (role == Qt::FontRole && !isCard) {
-        QFont f;
-        f.setBold(true);
-        return f;
-    }
-
-    if (role == Qt::BackgroundRole) {
-        if (isCard) {
-            const bool legal = QIdentityProxyModel::data(index, DeckRoles::IsLegalRole).toBool();
-            int base = 255 - (index.row() % 2) * 30;
-            return legal ? QBrush(QColor(base, base, base)) : QBrush(QColor(255, base / 3, base / 3));
-        } else {
-            int depth = src.data(DeckRoles::DepthRole).toInt();
-            int color = 90 + 60 * depth;
-            return QBrush(QColor(color, 255, color));
-        }
-    }
-
-    if (role == Qt::ForegroundRole) {
-        return QBrush(QColor(0, 0, 0));
-    }
-
-    return value;
-}
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
deleted file mode 100644
index 52b7eea10..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef COCKATRICE_DECK_LIST_STYLE_PROXY_H
-#define COCKATRICE_DECK_LIST_STYLE_PROXY_H
-
-#include <QIdentityProxyModel>
-
-class DeckListStyleProxy : public QIdentityProxyModel
-{
-    Q_OBJECT
-public:
-    using QIdentityProxyModel::QIdentityProxyModel;
-
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-};
-
-#endif // COCKATRICE_DECK_LIST_STYLE_PROXY_H
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
deleted file mode 100644
index 8da27b63c..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-#include "deck_state_manager.h"
-
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list_history_manager.h>
-
-DeckStateManager::DeckStateManager(QObject *parent)
-    : QObject(parent), deckList(QSharedPointer<DeckList>(new DeckList)),
-      deckListModel(new DeckListModel(this, deckList)), historyManager(new DeckListHistoryManager(this))
-{
-    connect(historyManager, &DeckListHistoryManager::undoRedoStateChanged, this, [this] {
-        setModified(true);
-        emit historyChanged();
-    });
-    connect(deckListModel, &DeckListModel::cardNodesChanged, this, &DeckStateManager::uniqueCardsChanged);
-}
-
-const DeckList &DeckStateManager::getDeckList() const
-{
-    return *deckList.get();
-}
-
-LoadedDeck DeckStateManager::toLoadedDeck() const
-{
-    return {getDeckList(), lastLoadInfo};
-}
-
-DeckList::Metadata const &DeckStateManager::getMetadata() const
-{
-    return deckList->getMetadata();
-}
-
-QString DeckStateManager::getSimpleDeckName() const
-{
-    return deckList->getMetadata().name.simplified();
-}
-
-QString DeckStateManager::getDeckHash() const
-{
-    return deckList->getDeckHash();
-}
-
-bool DeckStateManager::isModified() const
-{
-    return modified;
-}
-
-void DeckStateManager::setModified(bool state)
-{
-    if (state == modified) {
-        return;
-    }
-
-    modified = state;
-    emit isModifiedChanged(modified);
-}
-
-bool DeckStateManager::isBlankNewDeck() const
-{
-    return !isModified() && deckList->isBlankDeck();
-}
-
-void DeckStateManager::replaceDeck(const LoadedDeck &deck)
-{
-    lastLoadInfo = deck.lastLoadInfo;
-    deckList = QSharedPointer<DeckList>(new DeckList(deck.deckList));
-    deckListModel->setDeckList(deckList);
-
-    historyManager->clear();
-
-    setModified(false);
-    emit deckReplaced();
-}
-
-void DeckStateManager::clearDeck()
-{
-    replaceDeck(LoadedDeck());
-}
-
-bool DeckStateManager::modifyDeck(const QString &reason, const std::function<bool(DeckListModel *)> &operation)
-{
-    DeckListMemento memento = deckList->createMemento(reason);
-    bool success = operation(deckListModel);
-
-    if (success) {
-        historyManager->save(memento);
-        doCardModified();
-    }
-
-    return success;
-}
-
-QModelIndex DeckStateManager::modifyDeck(const QString &reason,
-                                         const std::function<QModelIndex(DeckListModel *)> &operation)
-{
-    DeckListMemento memento = deckList->createMemento(reason);
-    QModelIndex idx = operation(deckListModel);
-
-    if (idx.isValid()) {
-        historyManager->save(memento);
-        doCardModified();
-    }
-
-    return idx;
-}
-
-void DeckStateManager::setName(const QString &name)
-{
-    QString previous = deckList->getName();
-    if (previous == name) {
-        return;
-    }
-
-    requestHistorySave(tr("Rename deck to \"%1\" from \"%2\"").arg(name).arg(previous));
-    deckList->setName(name);
-
-    doMetadataModified();
-}
-
-void DeckStateManager::setComments(const QString &comments)
-{
-    QString previous = deckList->getComments();
-    if (previous == comments) {
-        return;
-    }
-
-    requestHistorySave(tr("Updated comments (was %1 chars, now %2 chars)").arg(previous.size()).arg(comments.size()));
-    deckList->setComments(comments);
-
-    doMetadataModified();
-}
-
-void DeckStateManager::setBannerCard(const CardRef &bannerCard)
-{
-    CardRef previous = deckList->getBannerCard();
-    if (previous == bannerCard) {
-        return;
-    }
-
-    requestHistorySave(tr("Set banner card to %1 (%2)").arg(bannerCard.name).arg(bannerCard.providerId));
-    deckList->setBannerCard(bannerCard);
-
-    doMetadataModified();
-}
-
-void DeckStateManager::setTags(const QStringList &tags)
-{
-    QStringList previous = deckList->getTags();
-    if (previous == tags) {
-        return;
-    }
-
-    requestHistorySave(tr("Tags changed"));
-    deckList->setTags(tags);
-
-    doMetadataModified();
-}
-
-void DeckStateManager::setFormat(const QString &format)
-{
-    if (deckList->getMetadata().gameFormat == format) {
-        return;
-    }
-
-    requestHistorySave(tr("Set format to %1").arg(format));
-    deckListModel->setActiveFormat(format);
-
-    doMetadataModified();
-}
-
-QModelIndex DeckStateManager::addCard(const ExactCard &card, const QString &zoneName)
-{
-    if (!card) {
-        return {};
-    }
-
-    QString zone = card.getInfo().getIsToken() ? DECK_ZONE_TOKENS : zoneName;
-
-    CardSetPtr set = card.getPrinting().getSet();
-    QString setName = set ? set->getCorrectedShortName() : "";
-
-    QString reason =
-        tr("Added (%1): %2 (%3) %4").arg(zone, card.getName(), setName, card.getPrinting().getProperty("num"));
-
-    QModelIndex idx = modifyDeck(reason, [&card, &zone](auto model) { return model->addCard(card, zone); });
-
-    if (idx.isValid()) {
-        emit focusIndexChanged(idx, true);
-    }
-
-    return idx;
-}
-
-QModelIndex DeckStateManager::decrementCard(const ExactCard &card, const QString &zoneName)
-{
-    if (!card)
-        return {};
-
-    QString providerId = card.getPrinting().getUuid();
-    QString collectorNumber = card.getPrinting().getProperty("num");
-
-    QModelIndex idx = deckListModel->findCard(card.getName(), zoneName, providerId, collectorNumber);
-    if (!idx.isValid()) {
-        return {};
-    }
-
-    bool success = offsetCountAtIndex(idx, -1);
-
-    if (!success) {
-        return {};
-    }
-
-    // old index is no longer safe since rows could have been removed
-    QModelIndex newIdx = deckListModel->findCard(card.getName(), zoneName, providerId, collectorNumber);
-    if (newIdx.isValid()) {
-        emit focusIndexChanged(newIdx, true);
-    }
-
-    return newIdx;
-}
-
-static bool doSwapCard(DeckListModel *model,
-                       const QModelIndex &idx,
-                       const QString &cardName,
-                       const QString &providerId,
-                       const QString &otherZone)
-{
-    bool success = model->offsetCountAtIndex(idx, -1);
-    if (!success) {
-        return false;
-    }
-
-    if (ExactCard card = CardDatabaseManager::query()->getCard({cardName, providerId})) {
-        model->addCard(card, otherZone);
-    } else {
-        // Third argument (true) says create the card no matter what, even if not in DB
-        model->addPreferredPrintingCard(cardName, otherZone, true);
-    }
-
-    return true;
-}
-
-bool DeckStateManager::swapCardAtIndex(const QModelIndex &idx)
-{
-    if (!idx.isValid())
-        return false;
-
-    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())
-        return false;
-
-    QString zoneName = gparent.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
-    QString otherZoneName = zoneName == DECK_ZONE_MAIN ? DECK_ZONE_SIDE : DECK_ZONE_MAIN;
-
-    QString reason = tr("Moved to %1 1 × \"%2\" (%3)") //
-                         .arg(otherZoneName)
-                         .arg(cardName)
-                         .arg(providerId);
-
-    return modifyDeck(reason, [&idx, &cardName, &providerId, &otherZoneName](auto model) {
-        return doSwapCard(model, idx, cardName, providerId, otherZoneName);
-    });
-}
-
-bool DeckStateManager::removeCardAtIndex(const QModelIndex &idx)
-{
-    if (!idx.isValid() || deckListModel->hasChildren(idx)) {
-        return false;
-    }
-
-    QString cardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString();
-
-    QString reason = tr("Removed \"%1\" (all copies)").arg(cardName);
-
-    return modifyDeck(reason, [&idx](auto model) { return model->removeRow(idx.row(), idx.parent()); });
-}
-
-bool DeckStateManager::incrementCountAtIndex(const QModelIndex &idx)
-{
-    return offsetCountAtIndex(idx, 1);
-}
-
-bool DeckStateManager::decrementCountAtIndex(const QModelIndex &idx)
-{
-    return offsetCountAtIndex(idx, -1);
-}
-
-bool DeckStateManager::offsetCountAtIndex(const QModelIndex &idx, int offset)
-{
-    if (!idx.isValid()) {
-        return false;
-    }
-
-    QString cardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
-    QString providerId = idx.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::DisplayRole).toString();
-
-    QString reason = tr("%1 1 × \"%2\" (%3)") //
-                         .arg(offset > 0 ? tr("Added") : tr("Removed"))
-                         .arg(cardName)
-                         .arg(providerId);
-
-    return modifyDeck(reason, [&idx, &offset](auto model) { return model->offsetCountAtIndex(idx, offset); });
-}
-
-void DeckStateManager::undo(int steps)
-{
-    if (!historyManager->canUndo()) {
-        return;
-    }
-
-    for (int i = 0; i < steps; i++) {
-        if (!historyManager->canUndo()) {
-            continue;
-        }
-        historyManager->undo(deckList.get());
-    }
-
-    deckListModel->rebuildTree();
-
-    emit deckListModel->layoutChanged();
-    emit deckReplaced();
-}
-
-void DeckStateManager::redo(int steps)
-{
-    if (!historyManager->canRedo()) {
-        return;
-    }
-
-    for (int i = 0; i < steps; i++) {
-        if (!historyManager->canRedo()) {
-            continue;
-        }
-        historyManager->redo(deckList.get());
-    }
-
-    deckListModel->rebuildTree();
-
-    emit deckListModel->layoutChanged();
-    emit deckReplaced();
-}
-
-void DeckStateManager::requestHistorySave(const QString &reason)
-{
-    historyManager->save(deckList->createMemento(reason));
-}
-
-/**
- * @brief Handles updating state and emitting signals whenever the cards are modified
- */
-void DeckStateManager::doCardModified()
-{
-    setModified(true);
-    emit cardModified();
-    emit deckModified();
-}
-
-/**
- * @brief Handles updating state and emitting signals whenever the metadata is modified
- */
-void DeckStateManager::doMetadataModified()
-{
-    setModified(true);
-    emit metadataModified();
-    emit deckModified();
-}
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
deleted file mode 100644
index 4f1ec7e04..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
+++ /dev/null
@@ -1,298 +0,0 @@
-#ifndef COCKATRICE_DECK_STATE_MANAGER_H
-#define COCKATRICE_DECK_STATE_MANAGER_H
-
-#include "../../deck_loader/loaded_deck.h"
-#include "deck_list_model.h"
-
-#include <QSharedPointer>
-#include <libcockatrice/deck_list/deck_list.h>
-
-class DeckListHistoryManager;
-
-/**
- * @brief This class centralizes the management of the state of the deck in the deck editor tab.
- * It is responsible for owning and managing the DeckListModel, underlying DeckList, load info, and edit history.
- *
- * Although this class provides getters for the underlying DeckListModel, you should generally refrain from directly
- * modifying the returned model. Outside modifications to the deck state should be done through @link
- * DeckStateManager::modifyDeck and the metadata setters.
- * Those methods ensure that the history is recorded and correct signals are emitted.
- */
-class DeckStateManager : public QObject
-{
-    Q_OBJECT
-
-    LoadedDeck::LoadInfo lastLoadInfo;
-    QSharedPointer<DeckList> deckList;
-    DeckListModel *deckListModel;
-    DeckListHistoryManager *historyManager;
-
-    bool modified = false;
-
-public:
-    explicit DeckStateManager(QObject *parent = nullptr);
-
-    /**
-     * Gets the underlying HistoryManager.
-     * @return The DeckListHistoryManager instance
-     */
-    DeckListHistoryManager *getHistoryManager() const
-    {
-        return historyManager;
-    }
-
-    /**
-     * @brief Gets the underlying DeckListModel.
-     * You should generally refrain modifying the returned model directly.
-     * However, it's fine (and intended) to perform queries on the returned model.
-     * @return The DeckListModel instance
-     */
-    DeckListModel *getModel() const
-    {
-        return deckListModel;
-    }
-
-    /**
-     * @brief Gets a view of the current deck.
-     */
-    const DeckList &getDeckList() const;
-
-    /**
-     * @brief Creates a LoadedDeck containing the contents of the current deck and the current LoadInfo.
-     *
-     * @return A new LoadedDeck instance.
-     */
-    LoadedDeck toLoadedDeck() const;
-
-    /**
-     * @brief Gets a view of the metadata in the DeckList
-     */
-    DeckList::Metadata const &getMetadata() const;
-
-    /**
-     * @brief Gets the deck's simplified name.
-     */
-    QString getSimpleDeckName() const;
-
-    /**
-     * @brief Gets the deck hash.
-     */
-    QString getDeckHash() const;
-
-    /**
-     * @brief Checks if the deck has been modified since it was last saved
-     */
-    bool isModified() const;
-
-    /**
-     * @brief Sets the new isModified state, emitting a signal if the state changed.
-     * This class will automatically update its isModified state, but you may need to set it manually to handle, for
-     * example, saving.
-     * @param state The state
-     */
-    void setModified(bool state);
-
-    /**
-     * @brief Checks if the deck state is as if it was a new deck
-     */
-    bool isBlankNewDeck() const;
-
-    /**
-     * @brief Overwrites the current deck with a new deck, resetting all history
-     * @param deck The new deck.
-     */
-    void replaceDeck(const LoadedDeck &deck);
-
-    /**
-     * @brief Resets the deck to a blank new deck, resetting all history.
-     */
-    void clearDeck();
-
-    /**
-     * @brief Sets the lastLoadInfo.
-     * @param loadInfo The lastLoadInfo
-     */
-    void setLastLoadInfo(const LoadedDeck::LoadInfo &loadInfo)
-    {
-        lastLoadInfo = loadInfo;
-    }
-
-    /**
-     * @brief Modifies the cards in the deck, in a wrapped operation that is saved to the history.
-     *
-     * The operation is a function that accepts a DeckListModel that it operates upon, and returns a bool.
-     *
-     * This method will pass the underlying DeckListModel into the operation function. The function can call methods on
-     * the model to modify the deck.
-     * The function should return a bool to indicate success/failure.
-     *
-     * If the operation returns true, the state of the deck before the operation is ran is saved to the history, and the
-     * isModified state is updated.
-     * If the operation returns false, the history and isModified state is not updated.
-     *
-     * Note that even if the operation fails, any modifications to the model will already have been made.
-     * It's recommended for the operation to always return true if any modification has already been made to the model,
-     * as not doing that may cause the state to become desynced.
-     *
-     * @param reason The reason to display in the history
-     * @param operation The modification operation.
-     * @return The bool returned from the operation
-     */
-    bool modifyDeck(const QString &reason, const std::function<bool(DeckListModel *)> &operation);
-
-    /**
-     * @brief Modifies the cards in the deck, in a wrapped operation that is saved to the history.
-     *
-     * The operation is a function that accepts a DeckListModel that it operates upon, and returns a QModelIndex.
-     * If the index is invalid, then the operation is considered to be a failure.
-     *
-     * See the other @link DeckStateManager::modifyDeck for more info about the behavior of this method.
-     *
-     * @param reason The reason to display in the history
-     * @param operation The modification operation.
-     * @return The QModelIndex returned from the operation
-     */
-    QModelIndex modifyDeck(const QString &reason, const std::function<QModelIndex(DeckListModel *)> &operation);
-
-    /// @name Metadata setters
-    /// @brief These methods set the metadata. Will no-op if the new value is the same as the current value.
-    /// Saves the operation to history if successful.
-    ///@{
-    void setName(const QString &name);
-    void setComments(const QString &comments);
-    void setBannerCard(const CardRef &bannerCard);
-    void setTags(const QStringList &tags);
-    void setFormat(const QString &format);
-    ///@}
-
-    /**
-     * @brief Adds the given card to the given zone.
-     * Saves the operation to history if successful.
-     *
-     * @param card The card to add
-     * @param zoneName The zone to add the card to
-     * @return The index of the added card
-     */
-    QModelIndex addCard(const ExactCard &card, const QString &zoneName);
-
-    /**
-     * @brief Removes 1 copy of the given card from the given zone.
-     * Saves the operation to history if successful.
-     *
-     * @param card The card to remove
-     * @param zoneName The zone to remove the card from
-     * @return The index of the removed card. Will be invalid if the last copy was removed.
-     */
-    QModelIndex decrementCard(const ExactCard &card, const QString &zoneName);
-
-    /**
-     * @brief Swaps one copy of the card at the given index between the maindeck and sideboard.
-     * No-ops if index is invalid or not a card node.
-     * Saves the operation to history if successful.
-     *
-     * @param idx The model index
-     * @return Whether the operation was successfully performed
-     */
-    bool swapCardAtIndex(const QModelIndex &idx);
-
-    /**
-     * @brief Removes all copies of the card at the given index.
-     * No-ops if index is invalid or not a card node.
-     * Saves the operation to history if successful.
-     *
-     * @param idx The model index
-     * @return Whether the operation was successfully performed
-     */
-    bool removeCardAtIndex(const QModelIndex &idx);
-
-    /**
-     * @brief Increments the number of copies of the card at the given index by 1.
-     * No-ops if index is invalid or not a card node.
-     * Saves the operation to history if successful.
-     *
-     * @param idx The model index
-     * @return Whether the operation was successfully performed
-     */
-    bool incrementCountAtIndex(const QModelIndex &idx);
-
-    /**
-     * @brief Decrements the number of copies of the card at the given index by 1.
-     * No-ops if index is invalid or not a card node.
-     * Saves the operation to history if successful.
-     *
-     * @param idx The model index
-     * @return Whether the operation was successfully performed
-     */
-    bool decrementCountAtIndex(const QModelIndex &idx);
-
-    /**
-     * Undoes n steps of the history, setting the decklist state and updating the current step in the historyManager.
-     * @param steps Number of steps to undo.
-     */
-    void undo(int steps = 1);
-
-    /**
-     * Redoes n steps of the history, setting the decklist state and updating the current step in the historyManager.
-     * @param steps Number of steps to redo.
-     */
-    void redo(int steps = 1);
-
-public slots:
-    /**
-     * Saves the current decklist state to history.
-     * @param reason The reason that is shown in the history.
-     */
-    void requestHistorySave(const QString &reason);
-
-private:
-    bool offsetCountAtIndex(const QModelIndex &idx, int offset);
-    void doCardModified();
-    void doMetadataModified();
-
-signals:
-    /**
-     * A modification has been made to the cards in the deck
-     */
-    void cardModified();
-
-    /**
-     * A card that wasn't previously in the deck was added to the deck, or the last copy of a card was removed from the
-     * deck.
-     */
-    void uniqueCardsChanged();
-
-    /**
-     * A modification has been made to the metadata in the deck
-     */
-    void metadataModified();
-
-    /**
-     * A modification has been made to the cards or metadata in the deck
-     */
-    void deckModified();
-
-    /**
-     * The history has been greatly changed and needs to be reloaded.
-     */
-    void historyChanged();
-
-    /**
-     * The deck has been completely changed.
-     */
-    void deckReplaced();
-
-    /**
-     * The isModified state of the deck has changed
-     * @param isModified the new state
-     */
-    void isModifiedChanged(bool isModified);
-
-    /**
-     * The selected card on any views connected to this deck should be changed to this index.
-     * @param index The model index
-     * @param preserveWidgetFocus Whether to keep the widget focus unchanged
-     */
-    void focusIndexChanged(QModelIndex index, bool preserveWidgetFocus);
-};
-
-#endif // COCKATRICE_DECK_STATE_MANAGER_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
deleted file mode 100644
index 23670b1b3..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "printing_disabled_info_widget.h"
-
-#include "../dialogs/override_printing_warning.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QStyle>
-#include <qguiapplication.h>
-
-PrintingDisabledInfoWidget::PrintingDisabledInfoWidget(QWidget *parent) : QWidget(parent)
-{
-    auto layout = new QVBoxLayout(this);
-    layout->setObjectName("PrintingDisabledInfoWidgetFrame");
-
-    QLabel *imageLabel = new QLabel(this);
-    imageLabel->setAlignment(Qt::AlignCenter);
-    QIcon icon = style()->standardIcon(QStyle::SP_MessageBoxWarning);
-    imageLabel->setPixmap(icon.pixmap({60, 60}));
-
-    textLabel = new QLabel(this);
-    textLabel->setWordWrap(true);
-    textLabel->setAlignment(Qt::AlignCenter);
-
-    settingsButton = new QPushButton(this);
-    connect(settingsButton, &QPushButton::clicked, this, &PrintingDisabledInfoWidget::disableOverridePrintings);
-
-    auto buttonLayout = new QHBoxLayout();
-    buttonLayout->addStretch();
-    buttonLayout->addWidget(settingsButton);
-    buttonLayout->addStretch();
-
-    layout->addStretch();
-    layout->addWidget(imageLabel);
-    layout->addWidget(textLabel);
-    layout->addLayout(buttonLayout);
-    layout->addStretch();
-
-    retranslateUi();
-}
-
-void PrintingDisabledInfoWidget::retranslateUi()
-{
-    textLabel->setText(
-        tr("The Printing Selector is disabled because you have currently enabled the setting to override all "
-           "selected printings with personal set preferences.\n\n"
-           "This setting means you'll only see the default printing for each card, instead of being able to select a "
-           "printing, and will not see the printings other people have selected.\n\n"));
-    settingsButton->setText(tr("Enable printings again"));
-}
-
-void PrintingDisabledInfoWidget::disableOverridePrintings()
-{
-    OverridePrintingWarning::execMessageBox(this, false);
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h
deleted file mode 100644
index 0851ccfad..000000000
--- a/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef COCKATRICE_PRINTING_DISABLED_INFO_WIDGET_H
-#define COCKATRICE_PRINTING_DISABLED_INFO_WIDGET_H
-#include <QWidget>
-
-class QPushButton;
-class QLabel;
-
-class PrintingDisabledInfoWidget : public QWidget
-{
-    Q_OBJECT
-
-    QLabel *textLabel;
-    QPushButton *settingsButton;
-
-private slots:
-    void disableOverridePrintings();
-
-public:
-    explicit PrintingDisabledInfoWidget(QWidget *parent);
-
-    void retranslateUi();
-};
-
-#endif // COCKATRICE_PRINTING_DISABLED_INFO_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
deleted file mode 100644
index d2d291556..000000000
--- a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "dlg_local_game_options.h"
-
-#include "../../../client/settings/cache_settings.h"
-
-#include <QCheckBox>
-#include <QDialogButtonBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QSpinBox>
-#include <QVBoxLayout>
-
-DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
-{
-    numberPlayersLabel = new QLabel(tr("Players:"), this);
-    numberPlayersEdit = new QSpinBox(this);
-    numberPlayersEdit->setMinimum(1);
-    numberPlayersEdit->setMaximum(8);
-    numberPlayersEdit->setValue(1);
-    numberPlayersLabel->setBuddy(numberPlayersEdit);
-
-    auto *generalGrid = new QGridLayout;
-    generalGrid->setContentsMargins(5, 5, 5, 5);
-    generalGrid->addWidget(numberPlayersLabel, 0, 0);
-    generalGrid->addWidget(numberPlayersEdit, 0, 1);
-    generalGroupBox = new QGroupBox(tr("General"), this);
-    generalGroupBox->setLayout(generalGrid);
-
-    startingLifeTotalLabel = new QLabel(tr("Starting life total:"), this);
-    startingLifeTotalEdit = new QSpinBox(this);
-    startingLifeTotalEdit->setMinimum(-999999999);
-    startingLifeTotalEdit->setMaximum(999999999);
-    startingLifeTotalEdit->setValue(20);
-    startingLifeTotalLabel->setBuddy(startingLifeTotalEdit);
-
-    auto *gameSetupGrid = new QGridLayout;
-    gameSetupGrid->setContentsMargins(5, 5, 5, 5);
-    gameSetupGrid->addWidget(startingLifeTotalLabel, 0, 0);
-    gameSetupGrid->addWidget(startingLifeTotalEdit, 0, 1);
-    gameSetupOptionsGroupBox = new QGroupBox(tr("Game setup options"), this);
-    gameSetupOptionsGroupBox->setLayout(gameSetupGrid);
-
-    rememberSettingsCheckBox = new QCheckBox(tr("Remember settings"), this);
-
-    buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
-    connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgLocalGameOptions::actOK);
-    connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgLocalGameOptions::reject);
-
-    auto *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(generalGroupBox);
-    mainLayout->addWidget(gameSetupOptionsGroupBox);
-    mainLayout->addWidget(rememberSettingsCheckBox);
-    mainLayout->addWidget(buttonBox);
-    setLayout(mainLayout);
-
-    rememberSettingsCheckBox->setChecked(SettingsCache::instance().getLocalGameRememberSettings());
-    if (rememberSettingsCheckBox->isChecked()) {
-        numberPlayersEdit->setValue(SettingsCache::instance().getLocalGameMaxPlayers());
-        startingLifeTotalEdit->setValue(SettingsCache::instance().getLocalGameStartingLifeTotal());
-    }
-
-    setWindowTitle(tr("Local game options"));
-    setFixedHeight(sizeHint().height());
-
-    numberPlayersEdit->setFocus();
-}
-
-void DlgLocalGameOptions::actOK()
-{
-    SettingsCache::instance().setLocalGameRememberSettings(rememberSettingsCheckBox->isChecked());
-    if (rememberSettingsCheckBox->isChecked()) {
-        SettingsCache::instance().setLocalGameMaxPlayers(numberPlayersEdit->value());
-        SettingsCache::instance().setLocalGameStartingLifeTotal(startingLifeTotalEdit->value());
-    }
-
-    accept();
-}
-
-LocalGameOptions DlgLocalGameOptions::getOptions() const
-{
-    return LocalGameOptions{
-        .numberPlayers = numberPlayersEdit->value(),
-        .startingLifeTotal = startingLifeTotalEdit->value(),
-    };
-}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h
deleted file mode 100644
index 4307581a4..000000000
--- a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @file dlg_local_game_options.h
- * @ingroup RoomDialogs
- * @brief Dialog for configuring local game options.
- *
- * Provides a user interface for setting up local games with configurable
- * number of players and starting life total.
- */
-
-#ifndef DLG_LOCAL_GAME_OPTIONS_H
-#define DLG_LOCAL_GAME_OPTIONS_H
-
-#include <QDialog>
-
-struct LocalGameOptions
-{
-    int numberPlayers = 1;
-    int startingLifeTotal = 20;
-};
-
-class QCheckBox;
-class QDialogButtonBox;
-class QGroupBox;
-class QLabel;
-class QSpinBox;
-
-class DlgLocalGameOptions : public QDialog
-{
-    Q_OBJECT
-public:
-    explicit DlgLocalGameOptions(QWidget *parent = nullptr);
-
-    [[nodiscard]] LocalGameOptions getOptions() const;
-
-private slots:
-    void actOK();
-
-private:
-    QGroupBox *generalGroupBox;
-    QGroupBox *gameSetupOptionsGroupBox;
-
-    QLabel *numberPlayersLabel;
-    QSpinBox *numberPlayersEdit;
-
-    QLabel *startingLifeTotalLabel;
-    QSpinBox *startingLifeTotalEdit;
-
-    QCheckBox *rememberSettingsCheckBox;
-
-    QDialogButtonBox *buttonBox;
-};
-
-#endif // DLG_LOCAL_GAME_OPTIONS_H
diff --git a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp
deleted file mode 100644
index d7699fbe4..000000000
--- a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "override_printing_warning.h"
-
-#include "../../card_picture_loader/card_picture_loader.h"
-#include "../../client/settings/cache_settings.h"
-
-bool OverridePrintingWarning::execMessageBox(QWidget *parent, bool enable)
-{
-    QString message;
-    if (enable) {
-        message =
-            QObject::tr("Enabling this feature will disable the use of the Printing Selector.\n\n"
-                        "You will not be able to manage printing preferences on a per-deck basis, "
-                        "or see printings other people have selected for their decks.\n\n"
-                        "You will have to use the Set Manager, available through Card Database -> Manage Sets.\n\n"
-                        "Are you sure you would like to enable this feature?");
-    } else {
-        message = QObject::tr(
-            "Disabling this feature will enable the Printing Selector.\n\n"
-            "You can now choose printings on a per-deck basis in the Deck Editor and configure which printing "
-            "gets added to a deck by default by pinning it in the Printing Selector.\n\n"
-            "You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector"
-            " (other sort orders like alphabetical or release date are available).\n\n"
-            "Are you sure you would like to disable this feature?");
-    }
-
-    QMessageBox::StandardButton result =
-        QMessageBox::question(parent, QObject::tr("Confirm Change"), message, QMessageBox::Yes | QMessageBox::No);
-
-    if (result == QMessageBox::Yes) {
-        SettingsCache::instance().setOverrideAllCardArtWithPersonalPreference(static_cast<Qt::CheckState>(enable));
-        // Caches are now invalid.
-        CardPictureLoader::clearPixmapCache();
-        CardPictureLoader::clearNetworkCache();
-        return true;
-    }
-
-    return false;
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h
deleted file mode 100644
index f2c926fc3..000000000
--- a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef COCKATRICE_OVERRIDE_PRINTING_WARN_H
-#define COCKATRICE_OVERRIDE_PRINTING_WARN_H
-#include <QMessageBox>
-
-namespace OverridePrintingWarning
-{
-
-/**
- * @brief Pops up the warning message for the changing the override printing setting.
- * If the user clicks accept, then this also handles changing the setting and resetting the card image cache.
- *
- * @param parent The parent widget
- * @param enable Whether the user is trying to enable or disable the setting
- * @return Whether the user clicked accept. All other ways of closing the window returns false.
- */
-bool execMessageBox(QWidget *parent, bool enable);
-
-} // namespace OverridePrintingWarning
-
-#endif // COCKATRICE_OVERRIDE_PRINTING_WARN_H
diff --git a/cockatrice/src/interface/widgets/general/background_sources.h b/cockatrice/src/interface/widgets/general/background_sources.h
index 15bf1d377..2b4cb64cc 100644
--- a/cockatrice/src/interface/widgets/general/background_sources.h
+++ b/cockatrice/src/interface/widgets/general/background_sources.h
@@ -1,9 +1,3 @@
-/**
- * @file background_sources.h
- * @ingroup UI
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_BACKGROUND_SOURCES_H
 #define COCKATRICE_BACKGROUND_SOURCES_H
 
diff --git a/cockatrice/src/interface/widgets/general/display/background_plate_widget.cpp b/cockatrice/src/interface/widgets/general/display/background_plate_widget.cpp
deleted file mode 100644
index aad259900..000000000
--- a/cockatrice/src/interface/widgets/general/display/background_plate_widget.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "background_plate_widget.h"
-
-#include <QBrush>
-#include <QColor>
-#include <QPainter>
-#include <QPen>
-
-BackgroundPlateWidget::BackgroundPlateWidget(QWidget *parent) : QWidget(parent)
-{
-    setAutoFillBackground(true); // For automatic background filling
-}
-
-void BackgroundPlateWidget::paintEvent(QPaintEvent *event)
-{
-    QWidget::paintEvent(event);
-    QPainter painter(this);
-    painter.setRenderHint(QPainter::Antialiasing, true);
-
-    // Set the background color to semi-transparent black with rounded corners
-    QRect rect = this->rect();
-    painter.setPen(Qt::NoPen); // No border
-    if (focused) {
-        painter.setBrush(QColor(85, 190, 75, 140));
-    } else {
-        painter.setBrush(QColor(0, 0, 0, 140)); // semi-transparent black
-    }
-    painter.drawRoundedRect(rect, 6, 6); // rounded corners
-}
-
-void BackgroundPlateWidget::setFocused(bool _focused)
-{
-    focused = _focused;
-    update();
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/general/display/background_plate_widget.h b/cockatrice/src/interface/widgets/general/display/background_plate_widget.h
deleted file mode 100644
index 1fc1bc3ba..000000000
--- a/cockatrice/src/interface/widgets/general/display/background_plate_widget.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef COCKATRICE_BACKGROUND_PLATE_WIDGET_H
-#define COCKATRICE_BACKGROUND_PLATE_WIDGET_H
-
-#include <QWidget>
-
-class BackgroundPlateWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit BackgroundPlateWidget(QWidget *parent);
-
-    void setFocused(bool focused);
-
-private:
-    bool focused = false;
-
-protected:
-    void paintEvent(QPaintEvent *event) override;
-};
-
-#endif // COCKATRICE_BACKGROUND_PLATE_WIDGET_H
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 8a81dcfce..2f7db1726 100644
--- a/cockatrice/src/interface/widgets/general/display/banner_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/banner_widget.h
@@ -1,11 +1,3 @@
-/**
- * @file banner_widget.h
- * @ingroup Widgets
- * @ingroup DeckEditorCardGroupWidgets
- * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef BANNER_WIDGET_H
 #define BANNER_WIDGET_H
 
@@ -26,7 +18,7 @@ public:
     void setText(const QString &text) const;
     void setClickable(bool _clickable);
     void setBuddy(QWidget *_buddy);
-    [[nodiscard]] QString getText() const
+    QString getText() const
     {
         return bannerLabel->text();
     }
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/bar_widget.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp
rename to cockatrice/src/interface/widgets/general/display/bar_widget.cpp
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h b/cockatrice/src/interface/widgets/general/display/bar_widget.h
similarity index 79%
rename from cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
rename to cockatrice/src/interface/widgets/general/display/bar_widget.h
index 67ad24995..e32d773e8 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/bar_widget.h
@@ -1,13 +1,8 @@
-/**
- * @file bar_widget.h
- * @ingroup Widgets
- * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef BAR_WIDGET_H
 #define BAR_WIDGET_H
 
+#include <QColor>
+#include <QString>
 #include <QWidget>
 
 class BarWidget : public QWidget
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
deleted file mode 100644
index f7ca669f3..000000000
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "bar_chart_background_widget.h"
-
-BarChartBackgroundWidget::BarChartBackgroundWidget(QWidget *parent) : QWidget(parent)
-{
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-}
-
-QSize BarChartBackgroundWidget::sizeHint() const
-{
-    return QSize(100, 150);
-}
-
-void BarChartBackgroundWidget::paintEvent(QPaintEvent *event)
-{
-    Q_UNUSED(event);
-    QPainter p(this);
-    p.setRenderHint(QPainter::Antialiasing);
-
-    constexpr int PAD = 4;
-    constexpr int LABEL_H = 20;
-
-    int left = 46; // axis space + internal padding
-    int right = width() - PAD;
-    int top = PAD;
-    int bottom = height() - PAD - LABEL_H;
-
-    int barAreaHeight = bottom - top;
-    int barAreaWidth = right - left;
-
-    p.fillRect(QRect(left, top, barAreaWidth, barAreaHeight), QColor(250, 250, 250));
-
-    int ticks = 5;
-    for (int i = 0; i <= ticks; i++) {
-        float r = float(i) / ticks;
-        int y = bottom - r * barAreaHeight;
-
-        p.setPen(QPen(QColor(180, 180, 180, 120), 1));
-        p.drawLine(left, y, right, y);
-
-        p.setPen(Qt::black);
-        p.drawText(left - 35, y - 6, 32, 12, Qt::AlignRight | Qt::AlignVCenter, QString::number(int(r * highest)));
-    }
-}
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h
deleted file mode 100644
index 06a17c7c6..000000000
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef COCKATRICE_BAR_CHART_BACKGROUND_WIDGET_H
-#define COCKATRICE_BAR_CHART_BACKGROUND_WIDGET_H
-
-#include <QPainter>
-#include <QWidget>
-
-class BarChartBackgroundWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    int highest = 0;      // global maximum (shared across bars)
-    int barCount = 0;     // number of CMC columns
-    int labelHeight = 20; // reserved for CMC numbers
-
-    explicit BarChartBackgroundWidget(QWidget *parent);
-public slots:
-    QSize sizeHint() const override;
-
-protected:
-    void paintEvent(QPaintEvent *event) override;
-};
-
-#endif // COCKATRICE_BAR_CHART_BACKGROUND_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
deleted file mode 100644
index 998808307..000000000
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-#include "bar_chart_widget.h"
-
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPainterPath>
-#include <QToolTip>
-
-BarChartWidget::BarChartWidget(QWidget *parent) : QWidget(parent)
-{
-    setMouseTracking(true);
-}
-
-void BarChartWidget::setBars(const QVector<BarData> &newBars)
-{
-    bars = newBars;
-    update();
-}
-
-void BarChartWidget::setHighest(int h)
-{
-    highest = qMax(1, h);
-    update();
-}
-
-QSize BarChartWidget::sizeHint() const
-{
-    return QSize(300, 200);
-}
-
-QSize BarChartWidget::minimumSizeHint() const
-{
-    return QSize(300, 50);
-}
-
-void BarChartWidget::paintEvent(QPaintEvent *)
-{
-    QPainter p(this);
-    p.setRenderHint(QPainter::Antialiasing);
-
-    constexpr int PAD = 4;
-    constexpr int LABEL_H = 20;
-
-    int w = width();
-    int h = height();
-
-    int left = 46;
-    int right = w - PAD;
-    int top = PAD;
-    int bottom = h - PAD - LABEL_H;
-
-    int barAreaHeight = bottom - top;
-    int barAreaWidth = right - left;
-
-    int barCount = bars.size();
-    if (barCount == 0)
-        return;
-
-    int spacing = 6;
-    int barWidth = (barAreaWidth - (barCount - 1) * spacing) / barCount;
-
-    // background
-    p.fillRect(QRect(left, top, barAreaWidth, barAreaHeight), QColor(250, 250, 250));
-
-    // y-axis ticks
-    int ticks = 5;
-    // qInfo() << "Tick Positions ";
-    for (int i = 0; i <= ticks; i++) {
-        float r = float(i) / ticks;
-        int tickVal = i * highest / ticks; // integer value of tick
-        int y = bottom - (tickVal * barAreaHeight / highest);
-
-        // qInfo() << "Tick" << i << "value" << int(r * highest) << "y" << y;
-
-        p.setPen(QPen(QColor(180, 180, 180, 120), 1));
-        p.drawLine(left, y, right, y);
-
-        p.setPen(Qt::black);
-        p.drawText(left - 35, y - 6, 32, 12, Qt::AlignRight | Qt::AlignVCenter, QString::number(int(r * highest)));
-    }
-
-    // draw bars
-    // qInfo() << "Bar Segments";
-    int drawWidth = barWidth / 4;             // 1/4 of allocated width
-    int xOffset = (barWidth - drawWidth) / 2; // center the narrow bar
-
-    for (int i = 0; i < barCount; i++) {
-        const BarData &bar = bars[i];
-        int x = left + i * (barWidth + spacing) + xOffset; // shift to center
-        int yCurrent = bottom;
-
-        for (int j = 0; j < bar.segments.size(); j++) {
-            const auto &seg = bar.segments[j];
-            int segHeight = (seg.value * barAreaHeight / highest);
-            if (segHeight < 2 && seg.value > 0)
-                segHeight = 2;
-
-            int topY = yCurrent - segHeight;
-
-            QRect r(x, topY, drawWidth, segHeight); // use drawWidth instead of barWidth
-            bool isTop = (j == bar.segments.size() - 1);
-
-            QLinearGradient g(r.topLeft(), r.bottomLeft());
-            g.setColorAt(0, seg.color.lighter(120));
-            g.setColorAt(1, seg.color.darker(110));
-            p.setBrush(g);
-            p.setPen(Qt::NoPen);
-
-            if (isTop) {
-                QPainterPath path;
-                int radius = 6;
-
-                int bx = r.x();
-                int by = r.y();
-                int bw = r.width();
-                int bh = r.height();
-
-                path.moveTo(bx, by + bh);
-                path.lineTo(bx, by + radius);
-                path.quadTo(bx, by, bx + radius, by);
-                path.lineTo(bx + bw - radius, by);
-                path.quadTo(bx + bw, by, bx + bw, by + radius);
-                path.lineTo(bx + bw, by + bh);
-                path.lineTo(bx, by + bh);
-                path.closeSubpath();
-
-                p.drawPath(path);
-            } else {
-                p.drawRect(r);
-            }
-
-            yCurrent -= segHeight;
-        }
-
-        // draw label below bar
-        QRect labelRect(left + i * (barWidth + spacing), bottom, barWidth, LABEL_H);
-        QFont f = p.font();
-        f.setBold(true);
-        p.setFont(f);
-        p.setPen(Qt::black);
-        p.drawText(labelRect, Qt::AlignCenter, bar.label);
-    }
-}
-
-void BarChartWidget::leaveEvent(QEvent *)
-{
-    hoveredBar = -1;
-    hoveredSegment = -1;
-    QToolTip::hideText();
-}
-
-void BarChartWidget::mouseMoveEvent(QMouseEvent *e)
-{
-    if (bars.isEmpty()) {
-        return;
-    }
-
-    constexpr int PAD = 4;
-    constexpr int LABEL_H = 20;
-    int w = width();
-    int h = height();
-    int left = 46;
-    int right = w - PAD;
-    int top = PAD;
-    int bottom = h - PAD - LABEL_H;
-    int barAreaHeight = bottom - top;
-
-    int barCount = bars.size();
-    int spacing = 6;
-    int barWidth = (right - left - (barCount - 1) * spacing) / barCount;
-
-    // find hovered bar
-    int mx = e->pos().x();
-    hoveredBar = -1;
-    for (int i = 0; i < barCount; i++) {
-        int x0 = left + i * (barWidth + spacing);
-        if (mx >= x0 && mx <= x0 + barWidth) {
-            hoveredBar = i;
-            break;
-        }
-    }
-    if (hoveredBar < 0) {
-        return;
-    }
-
-    // find hovered segment
-    int yCurrent = bottom;
-    const auto &segments = bars[hoveredBar].segments;
-    hoveredSegment = -1;
-    for (int i = 0; i < segments.size(); i++) {
-        const auto &seg = segments[i];
-        int segHeight = (seg.value * barAreaHeight / highest);
-        if (segHeight < 2 && seg.value > 0)
-            segHeight = 2;
-
-        int topY = yCurrent - segHeight;
-        int bottomY = yCurrent;
-        if (e->pos().y() >= topY && e->pos().y() <= bottomY) {
-            hoveredSegment = i;
-            break;
-        }
-        yCurrent -= segHeight;
-    }
-
-    if (hoveredSegment >= 0) {
-        const auto &s = segments[hoveredSegment];
-        QString text = QString("%1: %2 cards\n\n%3").arg(s.category).arg(s.value).arg(s.cards.join("\n"));
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        QToolTip::showText(e->globalPosition().toPoint(), text, this);
-#else
-        QToolTip::showText(e->globalPos(), text, this);
-#endif
-    } else {
-        QToolTip::hideText();
-    }
-}
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h
deleted file mode 100644
index e80a3f8e8..000000000
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef COCKATRICE_BAR_CHART_WIDGET_H
-#define COCKATRICE_BAR_CHART_WIDGET_H
-
-#include <QColor>
-#include <QString>
-#include <QVector>
-#include <QWidget>
-
-struct BarSegment
-{
-    QString category;
-    int value;
-    QStringList cards;
-    QColor color;
-};
-
-struct BarData
-{
-    QString label;
-    QVector<BarSegment> segments;
-};
-
-class BarChartWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit BarChartWidget(QWidget *parent = nullptr);
-
-    void setBars(const QVector<BarData> &bars);
-    void setHighest(int h); // global max for scaling
-    int barCount() const
-    {
-        return bars.size();
-    }
-
-protected:
-    void paintEvent(QPaintEvent *event) override;
-    QSize sizeHint() const override;
-    QSize minimumSizeHint() const override;
-
-    void mouseMoveEvent(QMouseEvent *event) override;
-    void leaveEvent(QEvent *event) override;
-
-private:
-    QVector<BarData> bars;
-    int highest = 1; // global maximum value
-
-    int hoveredBar = -1;
-    int hoveredSegment = -1;
-};
-
-#endif // COCKATRICE_BAR_CHART_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
deleted file mode 100644
index ed91ba03d..000000000
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-#include "color_bar.h"
-
-#include "libcockatrice/utility/color.h"
-
-#include <QLinearGradient>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QToolTip>
-
-ColorBar::ColorBar(const QMap<QString, int> &_colors, QWidget *parent)
-    : QWidget(parent), colors(GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors))
-{
-    setMouseTracking(true);
-}
-
-void ColorBar::setColors(const QMap<QString, int> &_colors)
-{
-    colors = GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors);
-    update();
-}
-
-QSize ColorBar::minimumSizeHint() const
-{
-    return QSize(200, 22);
-}
-
-void ColorBar::paintEvent(QPaintEvent *)
-{
-    if (colors.isEmpty())
-        return;
-
-    int total = 0;
-    for (const auto &pair : colors)
-        total += pair.second;
-
-    // Prevent divide-by-zero
-    if (total == 0)
-        return;
-
-    QPainter p(this);
-    p.setRenderHint(QPainter::Antialiasing, true);
-
-    const int w = width();
-    const int h = height();
-    int x = 0;
-
-    // Draw rounded border background
-    QRectF bounds(0.5, 0.5, w - 1, h - 1);
-    p.setPen(QPen(Qt::black, 1));
-    p.setBrush(Qt::NoBrush);
-    p.drawRoundedRect(bounds, 6, 6);
-
-    // Clip to inside the border
-    p.setClipRect(bounds.adjusted(2, 2, -2, -2));
-
-    // Draw segments IN ORDER
-    for (const auto &[key, value] : colors) {
-        const double ratio = double(value) / total;
-        if (ratio <= minRatioThreshold) {
-            continue;
-        }
-
-        int segmentWidth = int(ratio * w);
-
-        // Ensure the segment width is at least 1 to avoid degenerate rectangles
-        if (segmentWidth < 1)
-            segmentWidth = 1;
-
-        QColor base = colorFromName(key);
-
-        // Slight gradient for nicer look
-        QLinearGradient grad(x, 0, x, h);
-        grad.setColorAt(0, base.lighter(120));
-        grad.setColorAt(1, base.darker(120));
-
-        p.fillRect(QRect(x, 0, segmentWidth, h), grad);
-
-        x += segmentWidth;
-    }
-}
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-void ColorBar::enterEvent(QEnterEvent *event)
-{
-    Q_UNUSED(event);
-    isHovered = true;
-}
-#else
-void ColorBar::enterEvent(QEvent *event)
-{
-    Q_UNUSED(event);
-    isHovered = true;
-}
-#endif
-
-void ColorBar::leaveEvent(QEvent *)
-{
-    isHovered = false;
-}
-
-void ColorBar::mouseMoveEvent(QMouseEvent *event)
-{
-    if (!isHovered || colors.isEmpty())
-        return;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    int x = int(event->position().x());
-    QPoint gp = event->globalPosition().toPoint();
-#else
-    int x = event->pos().x();
-    QPoint gp = event->globalPos();
-#endif
-
-    QString text = tooltipForPosition(x);
-    if (!text.isEmpty())
-        QToolTip::showText(gp, text, this);
-}
-
-QString ColorBar::tooltipForPosition(int x) const
-{
-    int total = 0;
-    for (const auto &pair : colors)
-        total += pair.second;
-
-    if (total == 0)
-        return {};
-
-    int pos = 0;
-
-    for (const auto &[key, value] : colors) {
-        const double ratio = double(value) / total;
-        const int segmentWidth = int(ratio * width());
-
-        if (x >= pos && x < pos + segmentWidth) {
-            const double percent = (100.0 * value) / total;
-            return QString("%1: %2 cards (%3%)").arg(key).arg(value).arg(QString::number(percent, 'f', 1));
-        }
-
-        pos += segmentWidth;
-    }
-
-    return {};
-}
-
-QColor ColorBar::colorFromName(const QString &name) const
-{
-    static QMap<QString, QColor> map = {
-        {"R", QColor(220, 30, 30)},   {"G", QColor(40, 170, 40)}, {"U", QColor(40, 90, 200)},
-        {"W", QColor(235, 235, 230)}, {"B", QColor(30, 30, 30)},
-    };
-
-    if (map.contains(name))
-        return map[name];
-
-    QColor c(name);
-    if (!c.isValid())
-        c = Qt::gray;
-
-    return c;
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
deleted file mode 100644
index 0ef68f578..000000000
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef COCKATRICE_COLOR_BAR_H
-#define COCKATRICE_COLOR_BAR_H
-
-#include <QColor>
-#include <QMap>
-#include <QString>
-#include <QWidget>
-
-/**
- * @class ColorBar
- * @brief A widget for visualizing proportional color distributions as a horizontal bar.
- *
- * This widget renders a horizontal bar divided into colored segments whose widths reflect
- * the relative values associated with each color key in a `QMap<QString, int>`. The class
- * is designed as a small, lightweight, and self-contained visualization component suitable
- * for representing distributions such as color counts, mana statistics, categorical frequencies, and similar data sets.
- *
- * Key features:
- *  - Filled segments for better visual clarity.
- *  - Deterministic alphabetical ordering of color keys.
- *  - Optional minimum percentage threshold for filtering out insignificant segments.
- *  - Mouse-hover tooltips showing each segment’s key, count, and percentage of total.
- *
- * Default color mappings exist for `"R"`, `"G"`, `"U"`, `"W"`, and `"B"`, using named
- * colors, but any string recognized by `QColor` may be used. If an unknown name is provided,
- * the segment will fall back to gray.
- *
- * This component is display-only and does not interpret or mutate domain-level data.
- */
-class ColorBar : public QWidget
-{
-    Q_OBJECT
-
-public:
-    /**
-     * @brief Constructs a ColorBar widget.
-     *
-     * @param colors Map of color identifiers to integer counts.
-     * @param parent Optional parent widget.
-     */
-    explicit ColorBar(const QMap<QString, int> &colors, QWidget *parent = nullptr);
-
-    /**
-     * @brief Updates the color distribution map.
-     * @param colors New color → count mapping.
-     *
-     * Triggers an immediate repaint.
-     */
-    void setColors(const QMap<QString, int> &colors);
-
-    /**
-     * @brief Sets a minimum percentage threshold below which segments are not drawn.
-     *
-     * @param treshold Percentage from 0 to 100.
-     *
-     * Internally converted into a ratio (0.05 = 5%).
-     */
-    void setMinPercentThreshold(double treshold)
-    {
-        minRatioThreshold = treshold / 100.0;
-    }
-
-    /**
-     * @brief Returns the recommended minimum size.
-     */
-    QSize minimumSizeHint() const override;
-
-protected:
-    /**
-     * @brief Paints the color distribution bar.
-     *
-     * Draws:
-     *  - A rounded border
-     *  - Filled segments for each color
-     *  - Only segments above the minimum ratio threshold
-     */
-    void paintEvent(QPaintEvent *event) override;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    /**
-     * @brief Handles mouse hover entering (Qt6 version).
-     */
-    void enterEvent(QEnterEvent *event) override;
-#else
-    /**
-     * @brief Handles mouse hover entering (Qt5 version).
-     */
-    void enterEvent(QEvent *event) override;
-#endif
-
-    /**
-     * @brief Handles mouse hover leaving.
-     */
-    void leaveEvent(QEvent *event) override;
-
-    /**
-     * @brief Handles mouse movement to update contextual tooltips.
-     */
-    void mouseMoveEvent(QMouseEvent *event) override;
-
-private:
-    /// Map of color keys to counts used for rendering.
-    QList<QPair<QString, int>> colors;
-
-    /// True if the mouse is currently inside the widget.
-    bool isHovered = false;
-
-    /// Minimum ratio a segment must exceed to be drawn.
-    double minRatioThreshold = 0.0;
-
-    /**
-     * @brief Converts a color name into a display QColor.
-     *
-     * Recognized special keys: `"R", "G", "U", "W", "B"`.
-     * Other strings are treated as QColor names or fall back to gray.
-     */
-    QColor colorFromName(const QString &name) const;
-
-    /**
-     * @brief Returns tooltip text for a given x-coordinate in the bar.
-     *
-     * @param x Horizontal coordinate relative to widget.
-     * @return Tooltip text or empty string if no segment applies.
-     */
-    QString tooltipForPosition(int x) const;
-};
-
-#endif // COCKATRICE_COLOR_BAR_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
deleted file mode 100644
index e027aabdd..000000000
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-#include "segmented_bar_widget.h"
-
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPainterPath>
-#include <QToolTip>
-
-SegmentedBarWidget::SegmentedBarWidget(QString label, QVector<Segment> segments, int total, QWidget *parent)
-    : QWidget(parent), label(std::move(label)), segments(std::move(segments)), total(total)
-{
-    setMouseTracking(true);
-    setMinimumWidth(36);
-    setMaximumWidth(50);
-    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
-}
-
-QSize SegmentedBarWidget::sizeHint() const
-{
-    return QSize(50, 150);
-}
-
-void SegmentedBarWidget::paintEvent(QPaintEvent *)
-{
-    QPainter p(this);
-    p.setRenderHint(QPainter::Antialiasing);
-
-    constexpr int PAD = 4;
-    constexpr int LABEL_H = 20;
-
-    int w = width();
-    int h = height();
-
-    int barX = PAD;
-    int barWidth = w - PAD * 2;
-
-    int barTop = PAD;
-    int barBottom = h - PAD - LABEL_H;
-    int barHeight = barBottom - barTop;
-
-    int yCurrent = barBottom;
-
-    // draw stacked segments
-    for (int i = 0; i < segments.size(); i++) {
-        const auto &seg = segments[i];
-
-        int segHeight = total > 0 ? (seg.value * barHeight / total) : 0;
-        if (segHeight < 2)
-            segHeight = 2;
-
-        QRect r(barX, yCurrent - segHeight, barWidth, segHeight);
-        bool isTop = (i == segments.size() - 1);
-
-        QLinearGradient g(r.topLeft(), r.bottomLeft());
-        g.setColorAt(0, seg.color.lighter(120));
-        g.setColorAt(1, seg.color.darker(110));
-        p.setBrush(g);
-        p.setPen(Qt::NoPen);
-
-        if (isTop) {
-            QPainterPath path;
-            int radius = 6;
-
-            int x = r.x();
-            int y = r.y();
-            int w = r.width();
-            int h = r.height();
-
-            path.moveTo(x, y + h);
-            path.lineTo(x, y + radius);
-            path.quadTo(x, y, x + radius, y);
-            path.lineTo(x + w - radius, y);
-            path.quadTo(x + w, y, x + w, y + radius);
-            path.lineTo(x + w, y + h);
-            path.lineTo(x, y + h);
-            path.closeSubpath();
-
-            p.drawPath(path);
-        } else {
-            p.drawRect(r);
-        }
-
-        yCurrent -= segHeight;
-    }
-
-    // draw label
-    QRect labelRect(0, h - LABEL_H, w, LABEL_H);
-    QFont f = p.font();
-    f.setBold(true);
-    p.setFont(f);
-    p.setPen(Qt::black);
-    p.drawText(labelRect, Qt::AlignCenter, label);
-}
-
-int SegmentedBarWidget::segmentAt(int y) const
-{
-    int padding = 4;
-    int labelHeight = 20;
-    int barHeight = height() - padding * 2 - labelHeight;
-    int barTop = padding;
-    int barBottom = barTop + barHeight;
-
-    int currentTop = barBottom;
-
-    for (int i = 0; i < segments.size(); i++) {
-        int segHeight = total > 0 ? (segments[i].value * barHeight / total) : 0;
-        if (segHeight < 1) {
-            segHeight = 1;
-        }
-
-        int top = currentTop - segHeight;
-        int bottom = currentTop;
-
-        if (y >= top && y <= bottom)
-            return i;
-
-        currentTop -= segHeight;
-    }
-    return -1;
-}
-
-void SegmentedBarWidget::mouseMoveEvent(QMouseEvent *e)
-{
-    if (!hovered) {
-        return;
-    }
-
-    int idx = segmentAt(e->pos().y());
-    if (idx < 0) {
-        return;
-    }
-
-    const Segment &s = segments[idx];
-    QString text = QString("%1: %2 cards\n%3").arg(s.category).arg(s.value).arg(s.cards.join(", "));
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    QToolTip::showText(e->globalPosition().toPoint(), text, this);
-#else
-    QToolTip::showText(e->globalPos(), text, this);
-#endif
-}
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h
deleted file mode 100644
index 4df54e42e..000000000
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef COCKATRICE_SEGMENTED_BAR_WIDGET_H
-#define COCKATRICE_SEGMENTED_BAR_WIDGET_H
-
-#include <QColor>
-#include <QVector>
-#include <QWidget>
-
-class SegmentedBarWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    struct Segment
-    {
-        QString category;
-        int value = 0;
-        QStringList cards;
-        QColor color;
-    };
-
-    QString label;
-    QVector<Segment> segments;
-    float total = 1.0;
-
-    explicit SegmentedBarWidget(QString label, QVector<Segment> segments, int total, QWidget *parent = nullptr);
-    QSize sizeHint() const override;
-
-protected:
-    void paintEvent(QPaintEvent *event) override;
-    void mouseMoveEvent(QMouseEvent *e) override;
-
-    int segmentAt(int y) const;
-
-private:
-    bool hovered = true;
-};
-
-#endif // COCKATRICE_SEGMENTED_BAR_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
deleted file mode 100644
index 84232b36f..000000000
--- a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-#include "color_pie.h"
-
-#include "libcockatrice/utility/color.h"
-
-#include <QMouseEvent>
-#include <QPainter>
-#include <QToolTip>
-#include <QtMath>
-
-ColorPie::ColorPie(const QMap<QString, int> &_colors, QWidget *parent)
-    : QWidget(parent), colors(GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors))
-{
-    setMouseTracking(true);
-}
-
-void ColorPie::setColors(const QMap<QString, int> &_colors)
-{
-    colors = GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors);
-    update();
-}
-
-QSize ColorPie::minimumSizeHint() const
-{
-    return QSize(200, 200);
-}
-
-void ColorPie::paintEvent(QPaintEvent *)
-{
-    if (colors.isEmpty()) {
-        return;
-    }
-
-    int total = 0;
-    for (const auto &pair : colors) {
-        total += pair.second;
-    }
-
-    if (total == 0) {
-        return;
-    }
-
-    QPainter p(this);
-    p.setRenderHint(QPainter::Antialiasing, true);
-
-    int w = width();
-    int h = height();
-    int size = qMin(w, h) - 40;
-    QRectF rect((w - size) / 2.0, (h - size) / 2.0, size, size);
-
-    // Border
-    p.setPen(QPen(Qt::black, 1));
-    p.setBrush(Qt::NoBrush);
-    p.drawEllipse(rect);
-
-    double startAngle = 0.0;
-
-    for (const auto &[key, value] : colors) {
-        double ratio = double(value) / total;
-        if (ratio <= minRatioThreshold) {
-            continue;
-        }
-
-        double spanAngle = ratio * 360.0;
-
-        QColor base = colorFromName(key);
-
-        QRadialGradient grad(rect.center(), size / 2);
-        grad.setColorAt(0, base.lighter(130));
-        grad.setColorAt(1, base.darker(130));
-
-        p.setBrush(grad);
-        p.setPen(Qt::NoPen);
-        p.drawPie(rect, int(startAngle * 16), int(spanAngle * 16));
-
-        // Percent label
-        double midAngle = startAngle + spanAngle / 2.0;
-        double rad = qDegreesToRadians(midAngle);
-        double labelRadius = size / 2 + 15;
-        QPointF center = rect.center();
-        QPointF labelPos(center.x() + labelRadius * qCos(rad), center.y() - labelRadius * qSin(rad));
-
-        QString label = QString("%1%").arg(int(ratio * 100 + 0.5));
-
-        QFontMetrics fm(p.font());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-        int labelWidth = fm.horizontalAdvance(label);
-#else
-        int labelWidth = fm.width(label);
-#endif
-        QRectF textRect(labelPos.x() - labelWidth / 2.0, labelPos.y() - fm.height() / 2.0, labelWidth, fm.height());
-
-        p.setPen(Qt::black);
-        p.drawText(textRect, Qt::AlignCenter, label);
-
-        startAngle += spanAngle;
-    }
-}
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-void ColorPie::enterEvent(QEnterEvent *event)
-{
-    Q_UNUSED(event);
-    isHovered = true;
-}
-#else
-void ColorPie::enterEvent(QEvent *event)
-{
-    Q_UNUSED(event);
-    isHovered = true;
-}
-#endif
-
-void ColorPie::leaveEvent(QEvent *)
-{
-    isHovered = false;
-}
-
-void ColorPie::mouseMoveEvent(QMouseEvent *event)
-{
-    if (!isHovered || colors.isEmpty()) {
-        return;
-    }
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    QPoint p = event->position().toPoint();
-    QPoint gp = event->globalPosition().toPoint();
-#else
-    QPoint p = event->pos();
-    QPoint gp = event->globalPos();
-#endif
-
-    QString text = tooltipForPoint(p);
-    if (!text.isEmpty()) {
-        QToolTip::showText(gp, text, this);
-    }
-}
-
-QString ColorPie::tooltipForPoint(const QPoint &pt) const
-{
-    if (colors.isEmpty()) {
-        return {};
-    }
-
-    int total = 0;
-    for (const auto &pair : colors) {
-        total += pair.second;
-    }
-
-    if (total == 0) {
-        return {};
-    }
-
-    int w = width();
-    int h = height();
-    int size = qMin(w, h) - 40;
-    QPointF center(w / 2.0, h / 2.0);
-
-    QPointF v = pt - center;
-    double distance = std::hypot(v.x(), v.y());
-    if (distance > size / 2.0)
-        return {};
-
-    double angle = std::atan2(-v.y(), v.x()) * 180.0 / M_PI;
-    if (angle < 0) {
-        angle += 360.0;
-    }
-
-    double acc = 0.0;
-
-    for (const auto &[key, value] : colors) {
-        double ratio = double(value) / total;
-        if (ratio <= minRatioThreshold) {
-            continue;
-        }
-
-        double span = ratio * 360.0;
-
-        if (angle >= acc && angle < acc + span) {
-            double percent = (100.0 * value) / total;
-            return QString("%1: %2 cards (%3%)").arg(key).arg(value).arg(QString::number(percent, 'f', 1));
-        }
-
-        acc += span;
-    }
-
-    return {};
-}
-
-QColor ColorPie::colorFromName(const QString &name) const
-{
-    static QMap<QString, QColor> map = {
-        {"R", QColor(220, 30, 30)},   {"G", QColor(40, 170, 40)}, {"U", QColor(40, 90, 200)},
-        {"W", QColor(235, 235, 230)}, {"B", QColor(30, 30, 30)},
-    };
-
-    if (map.contains(name)) {
-        return map[name];
-    }
-
-    QColor c(name);
-    if (!c.isValid()) {
-        c = Qt::gray;
-    }
-
-    return c;
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
deleted file mode 100644
index 7d71ea3b9..000000000
--- a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef COCKATRICE_COLOR_PIE_H
-#define COCKATRICE_COLOR_PIE_H
-
-#ifndef COLOR_PIE_H
-#define COLOR_PIE_H
-
-#include <QMap>
-#include <QString>
-#include <QWidget>
-
-class ColorPie : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit ColorPie(const QMap<QString, int> &_colors = {}, QWidget *parent = nullptr);
-
-    void setColors(const QMap<QString, int> &_colors);
-
-    QSize minimumSizeHint() const override;
-
-protected:
-    void paintEvent(QPaintEvent *) override;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    void enterEvent(QEnterEvent *event) override;
-#else
-    void enterEvent(QEvent *event) override;
-#endif
-    void leaveEvent(QEvent *) override;
-    void mouseMoveEvent(QMouseEvent *event) override;
-
-private:
-    QList<QPair<QString, int>> colors;
-    bool isHovered = false;
-    const double minRatioThreshold = 0.01; // skip tiny slices
-
-    QColor colorFromName(const QString &name) const;
-    QString tooltipForPoint(const QPoint &pt) const;
-};
-
-#endif // COLOR_PIE_H
-
-#endif // COCKATRICE_COLOR_PIE_H
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
index f485e0040..ed4db1fd3 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
@@ -1,6 +1,7 @@
 #include "dynamic_font_size_label.h"
 #define FONT_PRECISION (0.5)
 
+#include <QDebug>
 #include <QElapsedTimer>
 
 DynamicFontSizeLabel::DynamicFontSizeLabel(QWidget *parent, Qt::WindowFlags f) : QLabel(parent, f)
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.h
index ca3043d10..2f66227e9 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,9 +1,3 @@
-/**
- * @file dynamic_font_size_label.h
- * @ingroup Widgets
- * @brief TODO: Document this.
- */
-
 #ifndef DYNAMICFONTSIZELABEL_H
 #define DYNAMICFONTSIZELABEL_H
 
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
index 653b2cd5c..fce4512e8 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
@@ -2,6 +2,7 @@
 
 #include "dynamic_font_size_label.h"
 
+#include <QDebug>
 #include <QPainter>
 
 DynamicFontSizePushButton::DynamicFontSizePushButton(QWidget *parent) : QPushButton(parent)
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.h
index 19e67fd28..eb33a7d80 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,9 +1,3 @@
-/**
- * @file dynamic_font_size_push_button.h
- * @ingroup PrintingWidgets
- * @brief TODO: Document this.
- */
-
 #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 8424e09f0..078db95f8 100644
--- a/cockatrice/src/interface/widgets/general/display/labeled_input.h
+++ b/cockatrice/src/interface/widgets/general/display/labeled_input.h
@@ -1,9 +1,3 @@
-/**
- * @file labeled_input.h
- * @ingroup DeckEditorCardGroupWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef LABELED_INPUT_H
 #define LABELED_INPUT_H
 
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/percent_bar_widget.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
rename to cockatrice/src/interface/widgets/general/display/percent_bar_widget.cpp
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h b/cockatrice/src/interface/widgets/general/display/percent_bar_widget.h
similarity index 83%
rename from cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
rename to cockatrice/src/interface/widgets/general/display/percent_bar_widget.h
index ff7d91363..c782b448b 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/percent_bar_widget.h
@@ -1,13 +1,7 @@
-/**
- * @file percent_bar_widget.h
- * @ingroup Widgets
- * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef PERCENT_BAR_WIDGET_H
 #define PERCENT_BAR_WIDGET_H
 
+#include <QColor>
 #include <QPainter>
 #include <QWidget>
 
diff --git a/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp b/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp
index 7db18c57d..fbca8df8d 100644
--- a/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp
+++ b/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp
@@ -12,18 +12,12 @@
  */
 ShadowBackgroundLabel::ShadowBackgroundLabel(QWidget *parent, const QString &text) : QLabel(parent)
 {
-    setAttribute(Qt::WA_TranslucentBackground); // Allows transparency.
-    setLabelText(text);
+    setAttribute(Qt::WA_TranslucentBackground);                // Allows transparency.
+    setText("<font color='white'>" + text + "</font>");        ///< Ensures the text is rendered in white.
     setAlignment(Qt::AlignCenter);                             ///< Centers the text within the label.
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); ///< Ensures minimum size constraints.
 }
 
-void ShadowBackgroundLabel::setLabelText(const QString &text)
-{
-    setText("<font color='white'>" + text + "</font>"); ///< Ensures the text is rendered in white.
-    update();
-}
-
 /**
  * @brief Handles resizing of the label.
  *
diff --git a/cockatrice/src/interface/widgets/general/display/shadow_background_label.h b/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
index b2344b7d0..992c8e81c 100644
--- a/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
+++ b/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
@@ -1,9 +1,3 @@
-/**
- * @file shadow_background_label.h
- * @ingroup PrintingWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef STYLEDLABEL_H
 #define STYLEDLABEL_H
 
@@ -15,7 +9,6 @@ class ShadowBackgroundLabel : public QLabel
 
 public:
     explicit ShadowBackgroundLabel(QWidget *parent, const QString &text);
-    void setLabelText(const QString &text);
 
 protected:
     void resizeEvent(QResizeEvent *event) override;
diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.cpp b/cockatrice/src/interface/widgets/general/home_styled_button.cpp
index c7bdd1e5e..66bb0417b 100644
--- a/cockatrice/src/interface/widgets/general/home_styled_button.cpp
+++ b/cockatrice/src/interface/widgets/general/home_styled_button.cpp
@@ -9,7 +9,7 @@ HomeStyledButton::HomeStyledButton(const QString &text, QPair<QColor, QColor> _g
     : QPushButton(text, parent), gradientColors(_gradientColors)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    setMinimumHeight(25);
+    setMinimumHeight(50);
     setStyleSheet(generateButtonStylesheet(gradientColors));
 }
 
@@ -41,8 +41,6 @@ QString HomeStyledButton::generateButtonStylesheet(const QPair<QColor, QColor> &
     return QString(R"(
         QPushButton {
             font-size: 34px;
-            font-weight: bold;
-            font-family: sans-serif, "Segoe UI", "Helvetica Neue";
             padding: 30px;
             color: white;
             border: 2px solid %1;
@@ -90,14 +88,18 @@ void HomeStyledButton::paintEvent(QPaintEvent *event)
     painter.setRenderHint(QPainter::Antialiasing);
     painter.setRenderHint(QPainter::TextAntialiasing);
 
-    QFontMetrics fm(font());
-    QSize textSize = fm.size(Qt::TextSingleLine, text());
+    QFont font = this->font();
+    font.setBold(true);
+    painter.setFont(font);
+
+    QFontMetrics fm(font);
+    QSize textSize = fm.size(Qt::TextSingleLine, this->text());
     QPointF center((width() - textSize.width()) / 2.0, (height() + textSize.height() / 2.0) / 2.0);
 
     QPainterPath path;
-    path.addText(center, font(), text());
+    path.addText(center, font, this->text());
 
-    QPen pen(Qt::black, 4.0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-    painter.strokePath(path, pen);
-    painter.fillPath(path, Qt::white);
+    painter.setPen(QPen(Qt::black, 2.0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+    painter.setBrush(Qt::white);
+    painter.drawPath(path);
 }
diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.h b/cockatrice/src/interface/widgets/general/home_styled_button.h
index a053993da..2ff30fc81 100644
--- a/cockatrice/src/interface/widgets/general/home_styled_button.h
+++ b/cockatrice/src/interface/widgets/general/home_styled_button.h
@@ -1,8 +1,6 @@
-/**
- * @file home_styled_button.h
- * @ingroup Widgets
- * @brief TODO: Document this.
- */
+//
+// Created by ascor on 6/15/25.
+//
 
 #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 ea20ef6a0..50823db4b 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@@ -1,18 +1,17 @@
 #include "home_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../server/remote/remote_client.h"
+#include "../../../settings/cache_settings.h"
+#include "../../../tabs/tab_supervisor.h"
 #include "../../window_main.h"
 #include "background_sources.h"
 #include "home_styled_button.h"
 
-#include <QGroupBox>
 #include <QPainter>
 #include <QPainterPath>
 #include <QPushButton>
 #include <QVBoxLayout>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/network/client/remote/remote_client.h>
 
 HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
     : QWidget(parent), tabSupervisor(_tabSupervisor), background("theme:backgrounds/home"), overlay("theme:cockatrice")
@@ -20,6 +19,10 @@ HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
     layout = new QGridLayout(this);
 
     backgroundSourceCard = new CardInfoPictureArtCropWidget(this);
+    backgroundSourceDeck = new DeckLoader();
+
+    backgroundSourceDeck->loadFromFile(SettingsCache::instance().getDeckPath() + "background.cod",
+                                       DeckLoader::CockatriceFormat, false);
 
     gradientColors = extractDominantColors(background);
 
@@ -44,10 +47,6 @@ HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
             &HomeWidget::initializeBackgroundFromSource);
     connect(&SettingsCache::instance(), &SettingsCache::homeTabBackgroundShuffleFrequencyChanged, this,
             &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::updateButtonsToBackgroundColor);
 }
 
 void HomeWidget::initializeBackgroundFromSource()
@@ -60,49 +59,25 @@ void HomeWidget::initializeBackgroundFromSource()
 
     auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource());
 
+    cardChangeTimer->stop();
+
     switch (backgroundSourceType) {
         case BackgroundSources::Theme:
-            cardChangeTimer->stop();
             background = QPixmap("theme:backgrounds/home");
-            backgroundSourceDeck = DeckList();
-            backgroundSourceCard->setCard(ExactCard());
             updateButtonsToBackgroundColor();
             update();
             break;
         case BackgroundSources::RandomCardArt:
-            backgroundSourceDeck = DeckList();
-            updateRandomCard();
-            onBackgroundShuffleFrequencyChanged();
+            cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
             break;
         case BackgroundSources::DeckFileArt:
-            loadBackgroundSourceDeck();
-            updateRandomCard();
-            onBackgroundShuffleFrequencyChanged();
+            backgroundSourceDeck->loadFromFile(SettingsCache::instance().getDeckPath() + "background.cod",
+                                               DeckLoader::CockatriceFormat, false);
+            cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
             break;
     }
 }
 
-void HomeWidget::loadBackgroundSourceDeck()
-{
-    std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(
-        SettingsCache::instance().getDeckPath() + "background.cod", DeckFileFormat::Cockatrice, false);
-    backgroundSourceDeck = deckOpt.has_value() ? deckOpt.value().deckList : DeckList();
-}
-
-void HomeWidget::setRandomCard(ExactCard &newCard)
-{
-    static constexpr int ATTEMPTS = 10;
-    for (int i = 0; i < ATTEMPTS; ++i) {
-        ExactCard tmpCard = CardDatabaseManager::query()->getRandomCard();
-        if (tmpCard != backgroundSourceCard->getCard() && tmpCard.getCardPtr()->getProperty("layout") == "normal" &&
-            tmpCard.getPrinting().getSet() != nullptr) {
-            newCard = tmpCard;
-            return;
-        }
-    }
-    qWarning() << "failed to set random card image after" << ATTEMPTS << "attempts";
-}
-
 void HomeWidget::updateRandomCard()
 {
     auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource());
@@ -113,10 +88,13 @@ void HomeWidget::updateRandomCard()
         case BackgroundSources::Theme:
             break;
         case BackgroundSources::RandomCardArt:
-            setRandomCard(newCard);
+            do {
+                newCard = CardDatabaseManager::query()->getRandomCard();
+            } while (newCard == backgroundSourceCard->getCard() &&
+                     newCard.getCardPtr()->getProperty("layout") != "normal");
             break;
         case BackgroundSources::DeckFileArt:
-            QList<CardRef> cardRefs = backgroundSourceDeck.getCardRefList();
+            QList<CardRef> cardRefs = backgroundSourceDeck->getCardRefList();
             ExactCard oldCard = backgroundSourceCard->getCard();
 
             if (!cardRefs.empty()) {
@@ -141,20 +119,25 @@ void HomeWidget::updateRandomCard()
 
     connect(newCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &HomeWidget::updateBackgroundProperties);
     backgroundSourceCard->setCard(newCard);
-    background = backgroundSourceCard->getBackground();
+    background = backgroundSourceCard->getProcessedBackground(size());
+
+    if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() <= 0) {
+        cardChangeTimer->stop();
+    }
 }
 
 void HomeWidget::onBackgroundShuffleFrequencyChanged()
 {
     cardChangeTimer->stop();
-    if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() > 0) {
-        cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
+    if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() <= 0) {
+        return;
     }
+    cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
 }
 
 void HomeWidget::updateBackgroundProperties()
 {
-    background = backgroundSourceCard->getBackground();
+    background = backgroundSourceCard->getProcessedBackground(size());
     updateButtonsToBackgroundColor();
     update(); // Triggers repaint
 }
@@ -195,11 +178,11 @@ QGroupBox *HomeWidget::createButtons()
     boxLayout->addSpacing(25);
 
     connectButton = new HomeStyledButton("Connect/Play", gradientColors);
-    boxLayout->addWidget(connectButton);
+    boxLayout->addWidget(connectButton, 1);
 
     auto visualDeckEditorButton = new HomeStyledButton(tr("Create New Deck"), gradientColors);
     connect(visualDeckEditorButton, &QPushButton::clicked, tabSupervisor,
-            [this] { tabSupervisor->openDeckInNewTab(LoadedDeck()); });
+            [this] { tabSupervisor->openDeckInNewTab(nullptr); });
     boxLayout->addWidget(visualDeckEditorButton);
     auto visualDeckStorageButton = new HomeStyledButton(tr("Browse Decks"), gradientColors);
     connect(visualDeckStorageButton, &QPushButton::clicked, tabSupervisor,
@@ -212,9 +195,6 @@ QGroupBox *HomeWidget::createButtons()
     auto edhrecButton = new HomeStyledButton(tr("Browse EDHRec"), gradientColors);
     connect(edhrecButton, &QPushButton::clicked, tabSupervisor, &TabSupervisor::addEdhrecMainTab);
     boxLayout->addWidget(edhrecButton);
-    auto archidektButton = new HomeStyledButton(tr("Browse Archidekt"), gradientColors);
-    connect(archidektButton, &QPushButton::clicked, tabSupervisor, &TabSupervisor::addArchidektTab);
-    boxLayout->addWidget(archidektButton);
     auto replaybutton = new HomeStyledButton(tr("View Replays"), gradientColors);
     connect(replaybutton, &QPushButton::clicked, tabSupervisor, [this] { tabSupervisor->actTabReplays(true); });
     boxLayout->addWidget(replaybutton);
@@ -310,65 +290,24 @@ QPair<QColor, QColor> HomeWidget::extractDominantColors(const QPixmap &pixmap)
 void HomeWidget::paintEvent(QPaintEvent *event)
 {
     QPainter painter(this);
-    painter.setRenderHint(QPainter::Antialiasing);
 
-    if (!background.isNull()) {
-        QSize widgetSize = size() * devicePixelRatio();
-        QPixmap toDraw = background.scaled(widgetSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+    background = background.scaled(size(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
 
-        // Draw scaled background centered
-        QSize bgSize = toDraw.size();
-        QPoint topLeft((widgetSize.width() - bgSize.width()) / (devicePixelRatio() * 2), // undo scaling for painter
-                       (widgetSize.height() - bgSize.height()) / (devicePixelRatio() * 2));
+    // Draw already-scaled background centered
+    QSize widgetSize = size();
+    QSize bgSize = background.size();
+    QPoint topLeft((widgetSize.width() - bgSize.width()) / 2, (widgetSize.height() - bgSize.height()) / 2);
 
-        painter.drawPixmap(topLeft, toDraw);
-    }
+    painter.drawPixmap(topLeft, background);
 
     // Draw translucent black overlay with rounded corners
-    QRectF overlayRect(5, 5, width() - 10, height() - 10);
+    QRectF overlayRect(5, 5, width() - 10, height() - 10); // 5px inset
     QPainterPath roundedRectPath;
-    roundedRectPath.addRoundedRect(overlayRect, 20, 20);
+    roundedRectPath.addRoundedRect(overlayRect, 20, 20); // 20px corner radius
 
-    QColor semiTransparentBlack(0, 0, 0, static_cast<int>(255 * 0.33));
+    QColor semiTransparentBlack(0, 0, 0, static_cast<int>(255 * 0.33)); // 33% opacity
+    painter.setRenderHint(QPainter::Antialiasing);
     painter.fillPath(roundedRectPath, semiTransparentBlack);
 
-    // Card name overlay (bottom-right)
-    QString cardName;
-    ExactCard card = backgroundSourceCard->getCard();
-    if (card) {
-        cardName = card.getCardPtr()->getName();
-        if (card.getPrinting().getSet() != nullptr) {
-            cardName += " (" + card.getPrinting().getSet()->getCorrectedShortName() + ") " +
-                        card.getPrinting().getProperty("num");
-        }
-    }
-
-    if (!cardName.isEmpty() && SettingsCache::instance().getHomeTabDisplayCardName()) {
-        QFont font = painter.font();
-        font.setPointSize(14);
-        font.setBold(true);
-        painter.setFont(font);
-
-        QFontMetrics fm(font);
-        constexpr int padding = 10;
-        constexpr int margin = 15;
-
-        QRect textRect = fm.boundingRect(cardName);
-
-        QRect bgRect(width() - textRect.width() - padding * 2 - margin,
-                     height() - textRect.height() - padding * 2 - margin, textRect.width() + padding * 2,
-                     textRect.height() + padding * 2);
-
-        // Background bubble
-        painter.setPen(Qt::NoPen);
-        painter.setBrush(QColor(0, 0, 0, 160));
-        painter.drawRoundedRect(bgRect, 8, 8);
-
-        // Text
-        painter.setPen(Qt::white);
-        painter.drawText(bgRect.adjusted(padding, padding, -padding, -padding), Qt::AlignRight | Qt::AlignVCenter,
-                         cardName);
-    }
-
     QWidget::paintEvent(event);
 }
diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h
index b30bb5407..1e870d1b6 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.h
+++ b/cockatrice/src/interface/widgets/general/home_widget.h
@@ -1,19 +1,13 @@
-/**
- * @file home_widget.h
- * @ingroup Core
- * @ingroup Widgets
- * @brief TODO: Document this.
- */
-
 #ifndef HOME_WIDGET_H
 #define HOME_WIDGET_H
-#include "../../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../../server/abstract_client.h"
+#include "../../../tabs/tab_supervisor.h"
 #include "../cards/card_info_picture_art_crop_widget.h"
 #include "home_styled_button.h"
 
 #include <QGridLayout>
+#include <QGroupBox>
 #include <QWidget>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
 
 class HomeWidget : public QWidget
 {
@@ -40,13 +34,10 @@ private:
     TabSupervisor *tabSupervisor;
     QPixmap background;
     CardInfoPictureArtCropWidget *backgroundSourceCard = nullptr;
-    DeckList backgroundSourceDeck;
+    DeckLoader *backgroundSourceDeck;
     QPixmap overlay;
     QPair<QColor, QColor> gradientColors;
     HomeStyledButton *connectButton;
-
-    void setRandomCard(ExactCard &newCard);
-    void loadBackgroundSourceDeck();
 };
 
 #endif // HOME_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
index d9fa49937..246b5a274 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
@@ -1,9 +1,3 @@
-/**
- * @file flow_widget.h
- * @ingroup UI
- * @brief TODO: Document this.
- */
-
 #ifndef FLOW_WIDGET_H
 #define FLOW_WIDGET_H
 #include "../../../layouts/flow_layout.h"
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/overlap_control_widget.h
index b2c19a07f..eecf304a2 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,9 +1,3 @@
-/**
- * @file overlap_control_widget.h
- * @ingroup UI
- * @brief TODO: Document this.
- */
-
 #ifndef OVERLAP_CONTROL_WIDGET_H
 #define OVERLAP_CONTROL_WIDGET_H
 #include "../display/labeled_input.h"
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
index 1c4ee30ab..ac5d9f520 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp
@@ -1,9 +1,9 @@
 #include "overlap_widget.h"
 
+#include "../../../../deck/deck_list_model.h"
 #include "../../../layouts/flow_layout.h"
 
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 /**
  * @class OverlapWidget
diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
index 9ac6ac80e..2d2a94132 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
@@ -1,9 +1,3 @@
-/**
- * @file overlap_widget.h
- * @ingroup UI
- * @brief TODO: Document this.
- */
-
 #ifndef OVERLAP_WIDGET_H
 #define OVERLAP_WIDGET_H
 
diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
index 36bccbcc3..5b67ae727 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
@@ -11,15 +11,20 @@
  * UI elements for managing card counts in both the mainboard and sideboard zones.
  *
  * @param parent The parent widget.
- * @param deckStateManager Pointer to the DeckStateManager
+ * @param deckEditor Pointer to the TabDeckEditor.
+ * @param deckModel Pointer to the DeckListModel.
+ * @param deckView Pointer to the QTreeView for the deck display.
  * @param cardSizeSlider Pointer to the QSlider used for dynamic font resizing.
  * @param rootCard The root card for the widget.
  */
 AllZonesCardAmountWidget::AllZonesCardAmountWidget(QWidget *parent,
-                                                   DeckStateManager *deckStateManager,
+                                                   AbstractTabDeckEditor *deckEditor,
+                                                   DeckListModel *deckModel,
+                                                   QTreeView *deckView,
                                                    QSlider *cardSizeSlider,
                                                    const ExactCard &rootCard)
-    : QWidget(parent), cardSizeSlider(cardSizeSlider)
+    : QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView), cardSizeSlider(cardSizeSlider),
+      rootCard(rootCard)
 {
     layout = new QVBoxLayout(this);
     layout->setAlignment(Qt::AlignHCenter);
@@ -28,9 +33,11 @@ AllZonesCardAmountWidget::AllZonesCardAmountWidget(QWidget *parent,
     setContentsMargins(5, 5, 5, 5); // Padding around the text
 
     zoneLabelMainboard = new ShadowBackgroundLabel(this, tr("Mainboard"));
-    buttonBoxMainboard = new CardAmountWidget(this, deckStateManager, cardSizeSlider, rootCard, DECK_ZONE_MAIN);
+    buttonBoxMainboard =
+        new CardAmountWidget(this, deckEditor, deckModel, deckView, cardSizeSlider, rootCard, DECK_ZONE_MAIN);
     zoneLabelSideboard = new ShadowBackgroundLabel(this, tr("Sideboard"));
-    buttonBoxSideboard = new CardAmountWidget(this, deckStateManager, cardSizeSlider, rootCard, DECK_ZONE_SIDE);
+    buttonBoxSideboard =
+        new CardAmountWidget(this, deckEditor, deckModel, deckView, cardSizeSlider, rootCard, DECK_ZONE_SIDE);
 
     layout->addWidget(zoneLabelMainboard, 0, Qt::AlignHCenter | Qt::AlignBottom);
     layout->addWidget(buttonBoxMainboard, 0, Qt::AlignHCenter | Qt::AlignTop);
@@ -72,12 +79,6 @@ void AllZonesCardAmountWidget::adjustFontSize(int scalePercentage)
     repaint();
 }
 
-void AllZonesCardAmountWidget::setAmounts(int mainboardAmount, int sideboardAmount)
-{
-    buttonBoxMainboard->setAmount(mainboardAmount);
-    buttonBoxSideboard->setAmount(sideboardAmount);
-}
-
 /**
  * @brief Gets the card count in the mainboard zone.
  *
@@ -85,7 +86,7 @@ void AllZonesCardAmountWidget::setAmounts(int mainboardAmount, int sideboardAmou
  */
 int AllZonesCardAmountWidget::getMainboardAmount()
 {
-    return buttonBoxMainboard->getAmount();
+    return buttonBoxMainboard->countCardsInZone(DECK_ZONE_MAIN);
 }
 
 /**
@@ -95,15 +96,7 @@ int AllZonesCardAmountWidget::getMainboardAmount()
  */
 int AllZonesCardAmountWidget::getSideboardAmount()
 {
-    return buttonBoxSideboard->getAmount();
-}
-
-/**
- * @brief Checks if the amount is at least one in either the mainboard or sideboard.
- */
-bool AllZonesCardAmountWidget::isNonZero()
-{
-    return getMainboardAmount() > 0 || getSideboardAmount() > 0;
+    return buttonBoxSideboard->countCardsInZone(DECK_ZONE_SIDE);
 }
 
 /**
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 d158d257e..9f45660ee 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
@@ -1,30 +1,24 @@
-/**
- * @file all_zones_card_amount_widget.h
- * @ingroup CardExtraInfoWidgets
- * @ingroup PrintingWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef ALL_ZONES_CARD_AMOUNT_WIDGET_H
 #define ALL_ZONES_CARD_AMOUNT_WIDGET_H
-#include "../../deck_loader/deck_loader.h"
+#include "../../../deck/deck_list_model.h"
+#include "../../../deck/deck_loader.h"
 #include "card_amount_widget.h"
 
+#include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class AllZonesCardAmountWidget : public QWidget
 {
     Q_OBJECT
 public:
     explicit AllZonesCardAmountWidget(QWidget *parent,
-                                      DeckStateManager *deckStateManager,
+                                      AbstractTabDeckEditor *deckEditor,
+                                      DeckListModel *deckModel,
+                                      QTreeView *deckView,
                                       QSlider *cardSizeSlider,
                                       const ExactCard &rootCard);
     int getMainboardAmount();
     int getSideboardAmount();
-    bool isNonZero();
-
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     void enterEvent(QEnterEvent *event) override;
 #else
@@ -33,11 +27,14 @@ public:
 
 public slots:
     void adjustFontSize(int scalePercentage);
-    void setAmounts(int mainboardAmount, int sideboardAmount);
 
 private:
     QVBoxLayout *layout;
+    AbstractTabDeckEditor *deckEditor;
+    DeckListModel *deckModel;
+    QTreeView *deckView;
     QSlider *cardSizeSlider;
+    ExactCard rootCard;
     QLabel *zoneLabelMainboard;
     CardAmountWidget *buttonBoxMainboard;
     QLabel *zoneLabelSideboard;
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 25222f437..168a21ee7 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
@@ -1,7 +1,5 @@
 #include "card_amount_widget.h"
 
-#include "../deck_editor/deck_state_manager.h"
-
 #include <QPainter>
 #include <QTimer>
 
@@ -9,17 +7,22 @@
  * @brief Constructs a widget for displaying and controlling the card count in a specific zone.
  *
  * @param parent The parent widget.
+ * @param deckEditor Pointer to the TabDeckEditor instance.
+ * @param deckModel Pointer to the DeckListModel instance.
+ * @param deckView Pointer to the QTreeView displaying the deck.
  * @param cardSizeSlider Pointer to the QSlider for adjusting font size.
  * @param rootCard The root card to manage within the widget.
  * @param zoneName The zone name (e.g., DECK_ZONE_MAIN or DECK_ZONE_SIDE).
  */
 CardAmountWidget::CardAmountWidget(QWidget *parent,
-                                   DeckStateManager *deckStateManager,
+                                   AbstractTabDeckEditor *deckEditor,
+                                   DeckListModel *deckModel,
+                                   QTreeView *deckView,
                                    QSlider *cardSizeSlider,
                                    const ExactCard &rootCard,
                                    const QString &zoneName)
-    : QWidget(parent), deckStateManager(deckStateManager), cardSizeSlider(cardSizeSlider), rootCard(rootCard),
-      zoneName(zoneName), hovered(false)
+    : QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView), cardSizeSlider(cardSizeSlider),
+      rootCard(rootCard), zoneName(zoneName), hovered(false)
 {
     layout = new QHBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -45,28 +48,21 @@ CardAmountWidget::CardAmountWidget(QWidget *parent,
         connect(decrementButton, &QPushButton::clicked, this, &CardAmountWidget::removePrintingSideboard);
     }
 
-    cardCountInZone = new QLabel(QString::number(amount), this);
+    cardCountInZone = new QLabel(QString::number(countCardsInZone(zoneName)), this);
     cardCountInZone->setAlignment(Qt::AlignCenter);
 
     layout->addWidget(decrementButton);
     layout->addWidget(cardCountInZone);
     layout->addWidget(incrementButton);
 
+    // React to model changes
+    connect(deckModel, &DeckListModel::dataChanged, this, &CardAmountWidget::updateCardCount);
+    connect(deckModel, &QAbstractItemModel::rowsRemoved, this, &CardAmountWidget::updateCardCount);
+
     // Connect slider for dynamic font size adjustment
     connect(cardSizeSlider, &QSlider::valueChanged, this, &CardAmountWidget::adjustFontSize);
 }
 
-int CardAmountWidget::getAmount()
-{
-    return amount;
-}
-
-void CardAmountWidget::setAmount(int _amount)
-{
-    amount = _amount;
-    updateCardCount();
-}
-
 /**
  * @brief Handles the painting of the widget, drawing a semi-transparent background.
  *
@@ -132,34 +128,11 @@ void CardAmountWidget::adjustFontSize(int scalePercentage)
  */
 void CardAmountWidget::updateCardCount()
 {
-    cardCountInZone->setText("<font color='white'>" + QString::number(amount) + "</font>");
+    cardCountInZone->setText("<font color='white'>" + QString::number(countCardsInZone(zoneName)) + "</font>");
     layout->invalidate();
     layout->activate();
 }
 
-static QModelIndex addAndReplacePrintings(DeckListModel *model,
-                                          const QModelIndex &existing,
-                                          const ExactCard &rootCard,
-                                          const QString &zone,
-                                          int extraCopies,
-                                          bool replaceProviderless)
-{
-    auto newCardIndex = model->addCard(rootCard, zone);
-    if (!newCardIndex.isValid()) {
-        return {};
-    }
-
-    // Check if a card without a providerId already exists in the deckModel and replace it, if so.
-    if (existing.isValid() && existing != newCardIndex && replaceProviderless) {
-        model->offsetCountAtIndex(newCardIndex, extraCopies);
-        model->removeCardAtIndex(existing);
-    }
-
-    // Set Index and Focus as if the user had just clicked the new card and modify the deckEditor saveState
-    return model->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
-                           rootCard.getPrinting().getProperty("num"));
-}
-
 /**
  * @brief Adds a printing of the card to the specified zone (Mainboard or Sideboard).
  *
@@ -167,39 +140,27 @@ static QModelIndex addAndReplacePrintings(DeckListModel *model,
  */
 void CardAmountWidget::addPrinting(const QString &zone)
 {
-    // Check if we will need to add extra copies due to replacing copies without providerIds
-    QModelIndex existing = deckStateManager->getModel()->findCard(rootCard.getName(), zone);
-
-    int extraCopies = 0;
-    bool replacingProviderless = false;
-
-    if (existing.isValid()) {
-        QString foundProviderId =
-            existing.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::DisplayRole).toString();
-        if (foundProviderId.isEmpty()) {
-            int existingAmount = existing.data(Qt::DisplayRole).toInt();
-            extraCopies = existingAmount - 1; // One less because we *always* add one
-            replacingProviderless = true;
-        }
-    }
-
-    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(zone == DECK_ZONE_MAIN ? "mainboard" : "sideboard")
-                         .arg(rootCard.getPrinting().getUuid())
-                         .arg(replacingProviderless ? " (replaced providerless printings)" : "");
-
     // Add the card and expand the list UI
-    QModelIndex newCardIndex = deckStateManager->modifyDeck(reason, [&](auto model) {
-        return addAndReplacePrintings(model, existing, rootCard, zone, extraCopies, replacingProviderless);
-    });
+    auto newCardIndex = deckModel->addCard(rootCard, zone);
+    recursiveExpand(newCardIndex);
 
-    if (newCardIndex.isValid()) {
-        emit deckStateManager->focusIndexChanged(newCardIndex, false);
+    // Check if a card without a providerId already exists in the deckModel and replace it, if so.
+    QModelIndex find_card = deckModel->findCard(rootCard.getName(), zone);
+    QString foundProviderId = deckModel->data(find_card.sibling(find_card.row(), 4), Qt::DisplayRole).toString();
+    if (find_card.isValid() && find_card != newCardIndex && foundProviderId == "") {
+        auto amount = deckModel->data(find_card, Qt::DisplayRole);
+        for (int i = 0; i < amount.toInt() - 1; i++) {
+            deckModel->addCard(rootCard, zone);
+        }
+        deckModel->removeRow(find_card.row(), find_card.parent());
     }
+
+    // Set Index and Focus as if the user had just clicked the new card and modify the deckEditor saveState
+    newCardIndex = deckModel->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
+                                       rootCard.getPrinting().getProperty("num"));
+    deckView->setCurrentIndex(newCardIndex);
+    deckView->setFocus(Qt::FocusReason::MouseFocusReason);
+    deckEditor->setModified(true);
 }
 
 /**
@@ -234,6 +195,43 @@ void CardAmountWidget::removePrintingSideboard()
     decrementCardHelper(DECK_ZONE_SIDE);
 }
 
+/**
+ * @brief Recursively expands the card in the deck view starting from the given index.
+ *
+ * @param index The model index of the card to expand.
+ */
+void CardAmountWidget::recursiveExpand(const QModelIndex &index)
+{
+    if (index.parent().isValid()) {
+        recursiveExpand(index.parent());
+    }
+    deckView->expand(index);
+}
+
+/**
+ * @brief Offsets the card count at the specified index by the given amount.
+ *
+ * @param idx The model index of the card.
+ * @param offset The amount to add or subtract from the card count.
+ */
+void CardAmountWidget::offsetCountAtIndex(const QModelIndex &idx, int offset)
+{
+    if (!idx.isValid() || offset == 0) {
+        return;
+    }
+
+    const QModelIndex numberIndex = idx.sibling(idx.row(), 0);
+    const int count = deckModel->data(numberIndex, Qt::EditRole).toInt();
+    const int new_count = count + offset;
+    deckView->setCurrentIndex(numberIndex);
+    if (new_count <= 0) {
+        deckModel->removeRow(idx.row(), idx.parent());
+    } else {
+        deckModel->setData(numberIndex, new_count, Qt::EditRole);
+    }
+    deckEditor->setModified(true);
+}
+
 /**
  * @brief Helper function to decrement the card count for a given zone.
  *
@@ -241,16 +239,62 @@ void CardAmountWidget::removePrintingSideboard()
  */
 void CardAmountWidget::decrementCardHelper(const QString &zone)
 {
-    QString reason = QString("Removed 1 copy of '%1 (%2) %3' from %4 [ProviderID: %5]")
-                         .arg(rootCard.getName())
-                         .arg(rootCard.getPrinting().getSet()->getShortName())
-                         .arg(rootCard.getPrinting().getProperty("num"))
-                         .arg(zone == DECK_ZONE_MAIN ? "mainboard" : "sideboard")
-                         .arg(rootCard.getPrinting().getUuid());
-
-    deckStateManager->modifyDeck(reason, [this, &zone](auto model) {
-        QModelIndex idx = model->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
+    QModelIndex idx = deckModel->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
                                           rootCard.getPrinting().getProperty("num"));
-        return model->offsetCountAtIndex(idx, -1);
-    });
+    offsetCountAtIndex(idx, -1);
+    deckEditor->setModified(true);
 }
+
+/**
+ * @brief Counts the number of cards in a specific zone (mainboard or sideboard).
+ *
+ * @param deckZone The name of the zone (e.g., DECK_ZONE_MAIN or DECK_ZONE_SIDE).
+ * @return The number of cards in the zone.
+ */
+int CardAmountWidget::countCardsInZone(const QString &deckZone)
+{
+    if (rootCard.getPrinting().getUuid().isEmpty()) {
+        return 0; // Cards without uuids/providerIds CANNOT match another card, they are undefined for us.
+    }
+
+    if (!deckModel) {
+        return -1;
+    }
+
+    DeckList *decklist = deckModel->getDeckList();
+    if (!decklist) {
+        return -1;
+    }
+
+    InnerDecklistNode *listRoot = decklist->getRoot();
+    if (!listRoot) {
+        return -1;
+    }
+
+    int count = 0;
+
+    for (auto *i : *listRoot) {
+        auto *countCurrentZone = dynamic_cast<InnerDecklistNode *>(i);
+        if (!countCurrentZone) {
+            continue;
+        }
+
+        if (countCurrentZone->getName() != deckZone) {
+            continue;
+        }
+
+        for (auto *cardNode : *countCurrentZone) {
+            auto *currentCard = dynamic_cast<DecklistCardNode *>(cardNode);
+            if (!currentCard) {
+                continue;
+            }
+
+            for (int k = 0; k < currentCard->getNumber(); ++k) {
+                if (currentCard->getCardProviderId() == rootCard.getPrinting().getProperty("uuid")) {
+                    count++;
+                }
+            }
+        }
+    }
+    return count;
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
index 3051b1691..fbf159312 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
@@ -1,40 +1,32 @@
-/**
- * @file card_amount_widget.h
- * @ingroup CardExtraInfoWidgets
- * @ingroup PrintingWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_AMOUNT_WIDGET_H
 #define CARD_AMOUNT_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../../../card/card_info.h"
+#include "../../../deck/deck_list_model.h"
+#include "../../../deck/deck_loader.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
 #include "../general/display/dynamic_font_size_push_button.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QPushButton>
 #include <QTreeView>
 #include <QWidget>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class CardAmountWidget : public QWidget
 {
     Q_OBJECT
-
-signals:
-    void deckModified(const QString &modificationReason);
-
 public:
     explicit CardAmountWidget(QWidget *parent,
-                              DeckStateManager *deckStateManager,
+                              AbstractTabDeckEditor *deckEditor,
+                              DeckListModel *deckModel,
+                              QTreeView *deckView,
                               QSlider *cardSizeSlider,
                               const ExactCard &rootCard,
                               const QString &zoneName);
-    int getAmount();
+    int countCardsInZone(const QString &deckZone);
 
 public slots:
-    void setAmount(int _amount);
     void updateCardCount();
     void addPrinting(const QString &zone);
 
@@ -43,7 +35,9 @@ protected:
     void showEvent(QShowEvent *event) override;
 
 private:
-    DeckStateManager *deckStateManager;
+    AbstractTabDeckEditor *deckEditor;
+    DeckListModel *deckModel;
+    QTreeView *deckView;
     QSlider *cardSizeSlider;
     ExactCard rootCard;
     QString zoneName;
@@ -53,9 +47,10 @@ private:
     QLabel *cardCountInZone;
 
     bool hovered;
-    int amount = 0;
 
+    void offsetCountAtIndex(const QModelIndex &idx, int offset);
     void decrementCardHelper(const QString &zoneName);
+    void recursiveExpand(const QModelIndex &index);
 
 private slots:
     void addPrintingMainboard();
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
index 71b93b297..e49fd2c9d 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
@@ -1,17 +1,16 @@
 #include "printing_selector.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../../interface/card_picture_loader/card_picture_loader.h"
-#include "../../../interface/widgets/dialogs/dlg_select_set_for_cards.h"
-#include "../deck_editor/deck_state_manager.h"
+#include "../../../dialogs/dlg_select_set_for_cards.h"
+#include "../../../picture_loader/picture_loader.h"
+#include "../../../settings/cache_settings.h"
 #include "printing_selector_card_display_widget.h"
 #include "printing_selector_card_search_widget.h"
 #include "printing_selector_card_selection_widget.h"
 #include "printing_selector_card_sorting_widget.h"
-#include "printing_selector_placeholder_widget.h"
 
-#include <QBoxLayout>
+#include <QFrame>
 #include <QScrollBar>
+#include <qboxlayout.h>
 
 /**
  * @brief Constructs a PrintingSelector widget to display and manage card printings.
@@ -23,9 +22,12 @@
  *
  * @param parent The parent widget for the PrintingSelector.
  * @param deckEditor The TabDeckEditor instance used for managing the deck.
+ * @param deckModel The DeckListModel instance that provides data for the deck's contents.
+ * @param deckView The QTreeView instance used to display the deck and its contents.
  */
 PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deckEditor)
-    : QWidget(parent), deckEditor(_deckEditor), deckStateManager(_deckEditor->deckStateManager)
+    : QWidget(parent), deckEditor(_deckEditor), deckModel(deckEditor->deckDockWidget->deckModel),
+      deckView(deckEditor->deckDockWidget->deckView)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     layout = new QVBoxLayout(this);
@@ -35,8 +37,6 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
 
-    placeholderWidget = new PrintingSelectorPlaceholderWidget(this);
-
     sortToolBar = new PrintingSelectorCardSortingWidget(this);
     sortToolBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
@@ -73,20 +73,15 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck
 
     layout->addWidget(sortAndOptionsContainer);
 
-    layout->addWidget(placeholderWidget);
     layout->addWidget(flowWidget);
 
-    // Initially show placeholder, hide flowWidget
-    placeholderWidget->setVisible(true);
-    flowWidget->setVisible(false);
-
-    cardSelectionBar = new PrintingSelectorCardSelectionWidget(this, deckStateManager);
+    cardSelectionBar = new PrintingSelectorCardSelectionWidget(this);
     cardSelectionBar->setVisible(SettingsCache::instance().getPrintingSelectorNavigationButtonsVisible());
     layout->addWidget(cardSelectionBar);
 
     // Connect deck model data change signal to update display
-    connect(deckStateManager, &DeckStateManager::uniqueCardsChanged, this, &PrintingSelector::printingsInDeckChanged);
-    connect(deckStateManager, &DeckStateManager::cardModified, this, &PrintingSelector::updateCardAmounts);
+    connect(deckModel, &DeckListModel::rowsInserted, this, &PrintingSelector::printingsInDeckChanged);
+    connect(deckModel, &DeckListModel::rowsRemoved, this, &PrintingSelector::printingsInDeckChanged);
 
     retranslateUi();
 }
@@ -98,44 +93,8 @@ void PrintingSelector::retranslateUi()
 
 void PrintingSelector::printingsInDeckChanged()
 {
-    if (SettingsCache::instance().getBumpSetsWithCardsInDeckToTop()) {
-        // Delay the update to avoid race conditions
-        QTimer::singleShot(100, this, &PrintingSelector::updateDisplay);
-    }
-}
-
-/**
- * @return A map of uuid to amounts (main, side).
- */
-static QMap<QString, QPair<int, int>> tallyUuidCounts(const DeckListModel *model, const QString &cardName)
-{
-    QMap<QString, QPair<int, int>> map;
-
-    auto mainNodes = model->getCardNodesForZone(DECK_ZONE_MAIN);
-    for (auto &node : mainNodes) {
-        if (node->getName() == cardName) {
-            map[node->getCardProviderId()].first += node->getNumber();
-        }
-    }
-
-    auto sideNodes = model->getCardNodesForZone(DECK_ZONE_SIDE);
-    for (auto &node : sideNodes) {
-        if (node->getName() == cardName) {
-            map[node->getCardProviderId()].second += node->getNumber();
-        }
-    }
-
-    return map;
-}
-
-void PrintingSelector::updateCardAmounts()
-{
-    if (selectedCard.isNull()) {
-        return;
-    }
-
-    auto map = tallyUuidCounts(deckStateManager->getModel(), selectedCard->getName());
-    emit cardAmountsChanged(map);
+    // Delay the update to avoid race conditions
+    QTimer::singleShot(100, this, &PrintingSelector::updateDisplay);
 }
 
 /**
@@ -147,16 +106,7 @@ void PrintingSelector::updateDisplay()
     widgetLoadingBufferTimer->deleteLater();
     widgetLoadingBufferTimer = new QTimer(this);
     flowWidget->clearLayout();
-
-    if (selectedCard.isNull()) {
-        // Show placeholder, hide flowWidget
-        placeholderWidget->setVisible(true);
-        flowWidget->setVisible(false);
-        setWindowTitle(tr("Printing Selector"));
-    } else {
-        // Hide placeholder, show flowWidget
-        placeholderWidget->setVisible(false);
-        flowWidget->setVisible(true);
+    if (selectedCard != nullptr) {
         setWindowTitle(selectedCard->getName());
     }
     getAllSetsForCurrentCard();
@@ -166,12 +116,11 @@ void PrintingSelector::updateDisplay()
  * @brief Sets the current card for the selector and updates the display.
  *
  * @param newCard The new card to set.
+ * @param _currentZone The current zone the card is in.
  */
-void PrintingSelector::setCard(const CardInfoPtr &newCard)
+void PrintingSelector::setCard(const CardInfoPtr &newCard, const QString &_currentZone)
 {
     if (newCard.isNull()) {
-        selectedCard = newCard;
-        updateDisplay();
         return;
     }
 
@@ -181,6 +130,7 @@ void PrintingSelector::setCard(const CardInfoPtr &newCard)
     }
 
     selectedCard = newCard;
+    currentZone = _currentZone;
     if (isVisible()) {
         updateDisplay();
     }
@@ -189,6 +139,58 @@ void PrintingSelector::setCard(const CardInfoPtr &newCard)
     flowWidget->repaint();
 }
 
+/**
+ * @brief Selects the previous card in the list.
+ */
+void PrintingSelector::selectPreviousCard()
+{
+    selectCard(-1);
+}
+
+/**
+ * @brief Selects the next card in the list.
+ */
+void PrintingSelector::selectNextCard()
+{
+    selectCard(1);
+}
+
+/**
+ * @brief Selects a card based on the change direction.
+ *
+ * @param changeBy The direction to change, -1 for previous, 1 for next.
+ */
+void PrintingSelector::selectCard(const int changeBy)
+{
+    if (changeBy == 0) {
+        return;
+    }
+
+    // Get the current index of the selected item
+    auto deckViewCurrentIndex = deckView->currentIndex();
+
+    auto nextIndex = deckViewCurrentIndex.siblingAtRow(deckViewCurrentIndex.row() + changeBy);
+    if (!nextIndex.isValid()) {
+        nextIndex = deckViewCurrentIndex;
+
+        // Increment to the next valid index, skipping header rows
+        AbstractDecklistNode *node;
+        do {
+            if (changeBy > 0) {
+                nextIndex = deckView->indexBelow(nextIndex);
+            } else {
+                nextIndex = deckView->indexAbove(nextIndex);
+            }
+            node = static_cast<AbstractDecklistNode *>(nextIndex.internalPointer());
+        } while (node && node->isDeckHeader());
+    }
+
+    if (nextIndex.isValid()) {
+        deckView->setCurrentIndex(nextIndex);
+        deckView->setFocus(Qt::FocusReason::MouseFocusReason);
+    }
+}
+
 /**
  * @brief Loads and displays all sets for the current selected card.
  */
@@ -205,29 +207,24 @@ void PrintingSelector::getAllSetsForCurrentCard()
     QList<PrintingInfo> printingsToUse;
 
     if (SettingsCache::instance().getBumpSetsWithCardsInDeckToTop()) {
-        printingsToUse =
-            sortToolBar->prependPrintingsInDeck(filteredPrintings, selectedCard, deckStateManager->getModel());
+        printingsToUse = sortToolBar->prependPrintingsInDeck(filteredPrintings, selectedCard, deckModel);
     } else {
         printingsToUse = filteredPrintings;
     }
     printingsToUse = sortToolBar->prependPinnedPrintings(printingsToUse, selectedCard->getName());
 
-    auto uuidToAmounts = tallyUuidCounts(deckStateManager->getModel(), selectedCard->getName());
-
     // Defer widget creation
     currentIndex = 0;
 
     connect(widgetLoadingBufferTimer, &QTimer::timeout, this, [=, this]() mutable {
         for (int i = 0; i < BATCH_SIZE && currentIndex < printingsToUse.size(); ++i, ++currentIndex) {
-            auto card = ExactCard(selectedCard, printingsToUse[currentIndex]);
-            auto *cardDisplayWidget = new PrintingSelectorCardDisplayWidget(this, deckEditor, deckStateManager,
-                                                                            cardSizeWidget->getSlider(), card);
+            ExactCard card = ExactCard(selectedCard, printingsToUse[currentIndex]);
+            auto *cardDisplayWidget = new PrintingSelectorCardDisplayWidget(
+                this, deckEditor, deckModel, deckView, cardSizeWidget->getSlider(), card, currentZone);
             flowWidget->addWidget(cardDisplayWidget);
-            cardDisplayWidget->updateCardAmounts(uuidToAmounts);
+            cardDisplayWidget->clampSetNameToPicture();
             connect(cardDisplayWidget, &PrintingSelectorCardDisplayWidget::cardPreferenceChanged, this,
                     &PrintingSelector::updateDisplay);
-            connect(this, &PrintingSelector::cardAmountsChanged, cardDisplayWidget,
-                    &PrintingSelectorCardDisplayWidget::updateCardAmounts);
         }
 
         // Stop timer when done
@@ -247,4 +244,4 @@ void PrintingSelector::getAllSetsForCurrentCard()
 void PrintingSelector::toggleVisibilityNavigationButtons(bool _state)
 {
     cardSelectionBar->setVisible(_state);
-}
\ No newline at end of file
+}
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
index f7844504d..5afdd00f4 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
@@ -1,28 +1,21 @@
-/**
- * @file printing_selector.h
- * @ingroup PrintingWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef PRINTING_SELECTOR_H
 #define PRINTING_SELECTOR_H
 
+#include "../../../card/card_info.h"
+#include "../../../deck/deck_list_model.h"
 #include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "../quick_settings/settings_button_widget.h"
-#include "printing_selector_placeholder_widget.h"
 
 #include <QCheckBox>
 #include <QLabel>
+#include <QPushButton>
 #include <QTreeView>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 #define BATCH_SIZE 10
 
-class DeckStateManager;
 class PrintingSelectorCardSearchWidget;
 class PrintingSelectorCardSelectionWidget;
 class PrintingSelectorCardSortingWidget;
@@ -35,33 +28,22 @@ class PrintingSelector : public QWidget
 public:
     PrintingSelector(QWidget *parent, AbstractTabDeckEditor *deckEditor);
 
-    void setCard(const CardInfoPtr &newCard);
+    void setCard(const CardInfoPtr &newCard, const QString &_currentZone);
     void getAllSetsForCurrentCard();
+    DeckListModel *getDeckModel() const
+    {
+        return deckModel;
+    };
 
 public slots:
     void retranslateUi();
     void updateDisplay();
+    void selectPreviousCard();
+    void selectNextCard();
     void toggleVisibilityNavigationButtons(bool _state);
 
 private slots:
     void printingsInDeckChanged();
-    void updateCardAmounts();
-
-signals:
-    /**
-     * Requests the previous card in the list
-     */
-    void prevCardRequested();
-    /**
-     * Requests the next card in the list
-     */
-    void nextCardRequested();
-
-    /**
-     * The amounts of the printings in the deck has changed
-     * @param uuidToAmounts Map of uuids to the amounts (maindeck, sideboard) in the deck
-     */
-    void cardAmountsChanged(const QMap<QString, QPair<int, int>> &uuidToAmounts);
 
 private:
     QVBoxLayout *layout;
@@ -71,15 +53,17 @@ private:
     QCheckBox *navigationCheckBox;
     PrintingSelectorCardSortingWidget *sortToolBar;
     PrintingSelectorCardSearchWidget *searchBar;
-    PrintingSelectorPlaceholderWidget *placeholderWidget;
     FlowWidget *flowWidget;
     CardSizeWidget *cardSizeWidget;
     PrintingSelectorCardSelectionWidget *cardSelectionBar;
     AbstractTabDeckEditor *deckEditor;
-    DeckStateManager *deckStateManager;
+    DeckListModel *deckModel;
+    QTreeView *deckView;
     CardInfoPtr selectedCard;
+    QString currentZone;
     QTimer *widgetLoadingBufferTimer;
     int currentIndex = 0;
+    void selectCard(int changeBy);
 };
 
 #endif // PRINTING_SELECTOR_H
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
index 7d0b4882f..0da80b522 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
@@ -1,9 +1,11 @@
 #include "printing_selector_card_display_widget.h"
 
+#include "card_amount_widget.h"
 #include "printing_selector_card_overlay_widget.h"
 #include "set_name_and_collectors_number_display_widget.h"
 
 #include <QGraphicsEffect>
+#include <QStackedWidget>
 #include <QVBoxLayout>
 #include <utility>
 
@@ -17,26 +19,30 @@
  * display.
  *
  * @param parent The parent widget for this display.
- * @param deckEditor The TabDeckEditor instance for deck management.
- * @param deckStateManager The DeckStateManager instance providing deck data.
- * @param cardSizeSlider The slider controlling the size of the displayed card.
- * @param rootCard The root card object, representing the card to be displayed.
+ * @param _deckEditor The TabDeckEditor instance for deck management.
+ * @param _deckModel The DeckListModel instance providing deck data.
+ * @param _deckView The QTreeView instance displaying the deck.
+ * @param _cardSizeSlider The slider controlling the size of the displayed card.
+ * @param _rootCard The root card object, representing the card to be displayed.
+ * @param _currentZone The current zone in which the card is located.
  */
 PrintingSelectorCardDisplayWidget::PrintingSelectorCardDisplayWidget(QWidget *parent,
-                                                                     AbstractTabDeckEditor *deckEditor,
-                                                                     DeckStateManager *deckStateManager,
-                                                                     QSlider *cardSizeSlider,
-                                                                     const ExactCard &rootCard)
-    : QWidget(parent), rootCard(rootCard)
+                                                                     AbstractTabDeckEditor *_deckEditor,
+                                                                     DeckListModel *_deckModel,
+                                                                     QTreeView *_deckView,
+                                                                     QSlider *_cardSizeSlider,
+                                                                     const ExactCard &_rootCard,
+                                                                     QString &_currentZone)
+    : QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView),
+      cardSizeSlider(_cardSizeSlider), rootCard(_rootCard), currentZone(_currentZone)
 {
     layout = new QVBoxLayout(this);
-    layout->setContentsMargins(5, 5, 5, 5);
-    layout->setSpacing(3);
     setLayout(layout);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
     // Create the overlay widget for the card display
-    overlayWidget = new PrintingSelectorCardOverlayWidget(this, deckEditor, deckStateManager, cardSizeSlider, rootCard);
+    overlayWidget =
+        new PrintingSelectorCardOverlayWidget(this, deckEditor, deckModel, deckView, cardSizeSlider, rootCard);
     connect(overlayWidget, &PrintingSelectorCardOverlayWidget::cardPreferenceChanged, this,
             [this]() { emit cardPreferenceChanged(); });
 
@@ -44,8 +50,8 @@ PrintingSelectorCardDisplayWidget::PrintingSelectorCardDisplayWidget(QWidget *pa
 
     // Create the widget to display the set name and collector's number
     QString combinedSetName = QString(set->getLongName() + " (" + set->getShortName() + ")");
-    setNameAndCollectorsNumberDisplayWidget =
-        new SetNameAndCollectorsNumberDisplayWidget(this, combinedSetName, rootCard.getPrinting().getProperty("num"));
+    setNameAndCollectorsNumberDisplayWidget = new SetNameAndCollectorsNumberDisplayWidget(
+        this, combinedSetName, rootCard.getPrinting().getProperty("num"), cardSizeSlider);
 
     // Add the widgets to the layout
     layout->addWidget(overlayWidget, 0, Qt::AlignHCenter);
@@ -66,15 +72,3 @@ void PrintingSelectorCardDisplayWidget::clampSetNameToPicture()
     }
     update();
 }
-
-void PrintingSelectorCardDisplayWidget::updateCardAmounts(const QMap<QString, QPair<int, int>> &uuidToAmounts)
-{
-    auto [main, side] = uuidToAmounts.value(rootCard.getPrinting().getUuid());
-    overlayWidget->updateCardAmounts(main, side);
-}
-
-void PrintingSelectorCardDisplayWidget::resizeEvent(QResizeEvent *event)
-{
-    QWidget::resizeEvent(event);
-    clampSetNameToPicture();
-}
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
index ac5c7c05f..b7e27547d 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
@@ -1,18 +1,14 @@
-/**
- * @file printing_selector_card_display_widget.h
- * @ingroup PrintingWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H
 #define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../../../card/card_info.h"
+#include "../../../deck/deck_list_model.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
 #include "printing_selector_card_overlay_widget.h"
 #include "set_name_and_collectors_number_display_widget.h"
 
+#include <QPainter>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class PrintingSelectorCardDisplayWidget : public QWidget
 {
@@ -20,24 +16,28 @@ class PrintingSelectorCardDisplayWidget : public QWidget
 
 public:
     PrintingSelectorCardDisplayWidget(QWidget *parent,
-                                      AbstractTabDeckEditor *deckEditor,
-                                      DeckStateManager *deckStateManager,
-                                      QSlider *cardSizeSlider,
-                                      const ExactCard &rootCard);
+                                      AbstractTabDeckEditor *_deckEditor,
+                                      DeckListModel *_deckModel,
+                                      QTreeView *_deckView,
+                                      QSlider *_cardSizeSlider,
+                                      const ExactCard &_rootCard,
+                                      QString &_currentZone);
 
 public slots:
     void clampSetNameToPicture();
-    void updateCardAmounts(const QMap<QString, QPair<int, int>> &uuidToAmounts);
-
-    void resizeEvent(QResizeEvent *event) override;
 
 signals:
     void cardPreferenceChanged();
 
 private:
-    ExactCard rootCard;
     QVBoxLayout *layout;
     SetNameAndCollectorsNumberDisplayWidget *setNameAndCollectorsNumberDisplayWidget;
+    AbstractTabDeckEditor *deckEditor;
+    DeckListModel *deckModel;
+    QTreeView *deckView;
+    QSlider *cardSizeSlider;
+    ExactCard rootCard;
+    QString currentZone;
     PrintingSelectorCardOverlayWidget *overlayWidget;
 };
 
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
index 1508b5243..9ed59d46e 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
@@ -1,16 +1,12 @@
 #include "printing_selector_card_overlay_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../settings/cache_settings.h"
 #include "printing_selector_card_display_widget.h"
 
-#include <QImageReader>
-#include <QLabel>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QVBoxLayout>
-#include <QtMath>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/relation/card_relation.h>
 #include <utility>
 
 /**
@@ -22,16 +18,19 @@
  *
  * @param parent The parent widget for this overlay.
  * @param _deckEditor The TabDeckEditor instance for deck management.
- * @param deckStateManager The DeckStateManager instance providing deck data.
- * @param cardSizeSlider The slider controlling the size of the card.
+ * @param _deckModel The DeckListModel instance providing deck data.
+ * @param _deckView The QTreeView instance displaying the deck.
+ * @param _cardSizeSlider The slider controlling the size of the card.
  * @param _rootCard The root card object that contains information about the card.
  */
 PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *parent,
                                                                      AbstractTabDeckEditor *_deckEditor,
-                                                                     DeckStateManager *deckStateManager,
-                                                                     QSlider *cardSizeSlider,
+                                                                     DeckListModel *_deckModel,
+                                                                     QTreeView *_deckView,
+                                                                     QSlider *_cardSizeSlider,
                                                                      const ExactCard &_rootCard)
-    : QWidget(parent), deckEditor(_deckEditor), rootCard(_rootCard)
+    : QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView),
+      cardSizeSlider(_cardSizeSlider), rootCard(_rootCard)
 {
     // Set up the main layout
     auto *mainLayout = new QVBoxLayout(this);
@@ -46,19 +45,23 @@ PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *pa
     cardInfoPicture->setCard(_rootCard);
     mainLayout->addWidget(cardInfoPicture);
 
-    initializePinBadge();
-
-    // Update when this overlay emits cardPreferenceChanged or when size/scale changes
-    connect(this, &PrintingSelectorCardOverlayWidget::cardPreferenceChanged, this,
-            &PrintingSelectorCardOverlayWidget::updatePinBadgeVisibility);
-    connect(cardSizeSlider, &QSlider::valueChanged, this, &PrintingSelectorCardOverlayWidget::updatePinBadgeVisibility);
-    // initial state
-    updatePinBadgeVisibility();
-
     // Add AllZonesCardAmountWidget
-    allZonesCardAmountWidget = new AllZonesCardAmountWidget(this, deckStateManager, cardSizeSlider, _rootCard);
+    allZonesCardAmountWidget =
+        new AllZonesCardAmountWidget(this, deckEditor, deckModel, deckView, cardSizeSlider, _rootCard);
 
     allZonesCardAmountWidget->raise(); // Ensure it's on top of the picture
+    // Set initial visibility based on amounts
+    if (allZonesCardAmountWidget->getMainboardAmount() > 0 || allZonesCardAmountWidget->getSideboardAmount() > 0) {
+        allZonesCardAmountWidget->setVisible(true);
+    } else {
+        allZonesCardAmountWidget->setVisible(false);
+    }
+
+    // Attempt to cast the parent to PrintingSelectorCardDisplayWidget
+    if (const auto *parentWidget = qobject_cast<PrintingSelectorCardDisplayWidget *>(parent)) {
+        connect(cardInfoPicture, &CardInfoPictureWidget::cardScaleFactorChanged, parentWidget,
+                &PrintingSelectorCardDisplayWidget::clampSetNameToPicture);
+    }
 
     connect(cardSizeSlider, &QSlider::valueChanged, cardInfoPicture, &CardInfoPictureWidget::setScaleFactor);
 }
@@ -101,7 +104,8 @@ void PrintingSelectorCardOverlayWidget::resizeEvent(QResizeEvent *event)
 /**
  * @brief Handles the mouse enter event when the cursor enters the overlay widget area.
  *
- * When the cursor enters the widget, the card amount widget becomes visible regardless of whether the amounts are zero.
+ * When the cursor enters the widget, the card information is updated, and the card amount widget
+ * is displayed if the amounts are zero for both the mainboard and sideboard.
  *
  * @param event The event triggered when the mouse enters the widget.
  */
@@ -113,60 +117,15 @@ void PrintingSelectorCardOverlayWidget::enterEvent(QEvent *event)
 {
     QWidget::enterEvent(event);
     deckEditor->updateCard(rootCard);
-    updateVisibility();
-}
 
-void PrintingSelectorCardOverlayWidget::updateCardAmounts(int mainboardAmount, int sideboardAmount)
-{
-    allZonesCardAmountWidget->setAmounts(mainboardAmount, sideboardAmount);
-    updateVisibility();
-}
-
-/**
- * @brief Sets the visibility of the widgets depending on the amounts and whether the mouse is hovering over.
- */
-void PrintingSelectorCardOverlayWidget::updateVisibility()
-{
-    if (allZonesCardAmountWidget->isNonZero() || underMouse()) {
-        allZonesCardAmountWidget->setVisible(true);
-    } else {
-        allZonesCardAmountWidget->setVisible(false);
-    }
-}
-
-/**
- * @brief Updates the pin badge visibility and position based on the card's pinned state.
- *
- * This method checks whether the current card printing is pinned and updates the
- * pin badge accordingly. If the card is pinned, the badge is made visible and positioned in the
- * top-right corner of the card image with appropriate margins. If the card is not pinned, the
- * badge is hidden.
- *
- * The method is called whenever the card preference changes or the card size is adjusted via
- * the slider to ensure the badge remains properly positioned.
- */
-void PrintingSelectorCardOverlayWidget::updatePinBadgeVisibility()
-{
-    if (!pinBadge || !cardInfoPicture)
+    // Check if either mainboard or sideboard amount is greater than 0
+    if (allZonesCardAmountWidget->getMainboardAmount() > 0 || allZonesCardAmountWidget->getSideboardAmount() > 0) {
+        // Don't change visibility if amounts are greater than 0
         return;
-
-    // Query the persisted preference override to decide whether this printing is pinned.
-    const auto &preferredProviderId =
-        SettingsCache::instance().cardOverrides().getCardPreferenceOverride(rootCard.getName());
-    const auto &cardProviderId = rootCard.getPrinting().getUuid();
-    const bool isPinned = (!preferredProviderId.isEmpty() && preferredProviderId == cardProviderId);
-
-    // Toggle the badge once; the pixmap was already rasterized in initializePinBadge().
-    pinBadge->setVisible(isPinned);
-
-    if (isPinned) {
-        // Keep a small margin that scales with the card size to avoid obscuring stuff.
-        const int margin = qMax(3, int(cardInfoPicture->width() * 0.03));
-        int x = qMax(0, cardInfoPicture->width() - pinBadge->width() - margin);
-        int y = margin * 3;
-        pinBadge->move(x, y);
-        pinBadge->raise();
     }
+
+    // Show the widget if amounts are 0
+    allZonesCardAmountWidget->setVisible(true);
 }
 
 /**
@@ -180,7 +139,15 @@ void PrintingSelectorCardOverlayWidget::updatePinBadgeVisibility()
 void PrintingSelectorCardOverlayWidget::leaveEvent(QEvent *event)
 {
     QWidget::leaveEvent(event);
-    updateVisibility();
+
+    // Check if either mainboard or sideboard amount is greater than 0
+    if (allZonesCardAmountWidget->getMainboardAmount() > 0 || allZonesCardAmountWidget->getSideboardAmount() > 0) {
+        // Don't hide the widget if amounts are greater than 0
+        return;
+    }
+
+    // Hide the widget if amounts are 0
+    allZonesCardAmountWidget->setVisible(false);
 }
 
 /**
@@ -236,57 +203,3 @@ void PrintingSelectorCardOverlayWidget::customMenu(QPoint point)
     }
     menu.exec(this->mapToGlobal(point));
 }
-
-/**
- * @brief Initializes the pin badge overlay and loads its icon with DPI-aware rasterization.
- *
- * The icon is rasterized once using the label's device pixel ratio so it stays crisp on HiDPI
- * displays. The resulting pixmap is cached on the QLabel and simply shown/hidden when needed.
- * If the SVG cannot be read, a textual fallback badge is created instead.
- */
-void PrintingSelectorCardOverlayWidget::initializePinBadge()
-{
-    if (!pinBadge) {
-        // construct the overlay label once
-        pinBadge = new QLabel(this);
-        pinBadge->setObjectName(QStringLiteral("printingSelectorPinBadge"));
-    } else {
-        // Clear any previous pixmap / style in case we reinitialize for a DPR change.
-        pinBadge->clear();
-        pinBadge->setStyleSheet(QString());
-    }
-
-    bool pinLoaded = false;
-    QImageReader pinReader(QStringLiteral("theme:icons/pin"));
-
-    if (pinReader.canRead()) {
-        // Rasterize a 64×64 logical icon so it has a consistent size regardless of card scaling.
-        const QSize targetSize(64, 64);
-        const qreal dpr = pinBadge->devicePixelRatioF();
-        const QSize rasterSize(qMax(1, qCeil(targetSize.width() * dpr)), qMax(1, qCeil(targetSize.height() * dpr)));
-        pinReader.setScaledSize(rasterSize);
-        const QImage pinImage = pinReader.read();
-        if (!pinImage.isNull()) {
-            // Tag the pixmap with the same DPR so Qt renders it at the correct physical size.
-            QPixmap pinPix = QPixmap::fromImage(pinImage);
-            pinPix.setDevicePixelRatio(dpr);
-            pinBadge->setPixmap(pinPix);
-            pinBadge->setFixedSize(targetSize);
-            pinBadge->setStyleSheet(QStringLiteral("background: transparent;"));
-            pinLoaded = true;
-        }
-    }
-
-    if (!pinLoaded) {
-        // Fall back to a text badge when the SVG cannot be decoded (e.g., missing theme resource).
-        pinBadge->setText(QStringLiteral("PIN"));
-        pinBadge->setAlignment(Qt::AlignCenter);
-        pinBadge->setFixedSize(24, 12);
-        pinBadge->setStyleSheet(QStringLiteral("background: yellow; color: black; border: 1px solid red;"));
-    }
-
-    // The overlay is mouse-transparent and hidden until we know the card is pinned.
-    pinBadge->setAttribute(Qt::WA_TransparentForMouseEvents);
-    pinBadge->setVisible(false);
-    pinBadge->raise();
-}
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 ae2307c45..d981f5f9a 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,18 +1,14 @@
-/**
- * @file printing_selector_card_overlay_widget.h
- * @ingroup PrintingWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
 #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../../../card/card_info.h"
+#include "../../../deck/deck_list_model.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../cards/card_info_picture_widget.h"
 #include "all_zones_card_amount_widget.h"
+#include "card_amount_widget.h"
 #include "set_name_and_collectors_number_display_widget.h"
 
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-
 class PrintingSelectorCardOverlayWidget : public QWidget
 {
     Q_OBJECT
@@ -20,7 +16,8 @@ class PrintingSelectorCardOverlayWidget : public QWidget
 public:
     explicit PrintingSelectorCardOverlayWidget(QWidget *parent,
                                                AbstractTabDeckEditor *_deckEditor,
-                                               DeckStateManager *_deckStateManager,
+                                               DeckListModel *_deckModel,
+                                               QTreeView *_deckView,
                                                QSlider *_cardSizeSlider,
                                                const ExactCard &_rootCard);
 
@@ -38,19 +35,13 @@ protected:
 signals:
     void cardPreferenceChanged();
 
-public slots:
-    void updateCardAmounts(int mainboardAmount, int sideboardAmount);
-
-private slots:
-    void updateVisibility();
-    void updatePinBadgeVisibility();
-
 private:
-    void initializePinBadge();
     CardInfoPictureWidget *cardInfoPicture;
     AllZonesCardAmountWidget *allZonesCardAmountWidget;
-    QLabel *pinBadge = nullptr;
     AbstractTabDeckEditor *deckEditor;
+    DeckListModel *deckModel;
+    QTreeView *deckView;
+    QSlider *cardSizeSlider;
     ExactCard rootCard;
 };
 
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_search_widget.h
index 821addd01..737d9b7ba 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,9 +1,3 @@
-/**
- * @file printing_selector_card_search_widget.h
- * @ingroup PrintingWidgets
- * @brief TODO: Document this.
- */
-
 #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.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
index 2eb2ef245..5b2935b7b 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
@@ -1,7 +1,6 @@
 #include "printing_selector_card_selection_widget.h"
 
-#include "../../../interface/widgets/dialogs/dlg_select_set_for_cards.h"
-#include "../tabs/abstract_tab_deck_editor.h"
+#include "../../../dialogs/dlg_select_set_for_cards.h"
 
 /**
  * @brief Constructs a PrintingSelectorCardSelectionWidget for navigating through cards in the deck.
@@ -11,9 +10,7 @@
  *
  * @param parent The parent PrintingSelector widget responsible for managing card selection.
  */
-PrintingSelectorCardSelectionWidget::PrintingSelectorCardSelectionWidget(PrintingSelector *parent,
-                                                                         DeckStateManager *deckStateManager)
-    : parent(parent), deckStateManager(deckStateManager)
+PrintingSelectorCardSelectionWidget::PrintingSelectorCardSelectionWidget(PrintingSelector *parent) : parent(parent)
 {
     cardSelectionBarLayout = new QHBoxLayout(this);
     cardSelectionBarLayout->setContentsMargins(9, 0, 9, 0);
@@ -44,12 +41,14 @@ PrintingSelectorCardSelectionWidget::PrintingSelectorCardSelectionWidget(Printin
  */
 void PrintingSelectorCardSelectionWidget::connectSignals()
 {
-    connect(previousCardButton, &QPushButton::clicked, parent, &PrintingSelector::prevCardRequested);
-    connect(nextCardButton, &QPushButton::clicked, parent, &PrintingSelector::nextCardRequested);
+    connect(previousCardButton, &QPushButton::clicked, parent, &PrintingSelector::selectPreviousCard);
+    connect(nextCardButton, &QPushButton::clicked, parent, &PrintingSelector::selectNextCard);
 }
 
 void PrintingSelectorCardSelectionWidget::selectSetForCards()
 {
-    auto *setSelectionDialog = new DlgSelectSetForCards(nullptr, deckStateManager);
-    setSelectionDialog->exec();
+    DlgSelectSetForCards *setSelectionDialog = new DlgSelectSetForCards(nullptr, parent->getDeckModel());
+    if (!setSelectionDialog->exec()) {
+        return;
+    }
 }
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 ecd5c83e3..89229bda8 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,9 +1,3 @@
-/**
- * @file printing_selector_card_selection_widget.h
- * @ingroup PrintingWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef PRINTING_SELECTOR_CARD_SELECTION_WIDGET_H
 #define PRINTING_SELECTOR_CARD_SELECTION_WIDGET_H
 
@@ -18,7 +12,7 @@ class PrintingSelectorCardSelectionWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit PrintingSelectorCardSelectionWidget(PrintingSelector *parent, DeckStateManager *deckStateManager);
+    explicit PrintingSelectorCardSelectionWidget(PrintingSelector *parent);
 
     void connectSignals();
 
@@ -27,7 +21,6 @@ public slots:
 
 private:
     PrintingSelector *parent;
-    DeckStateManager *deckStateManager;
     QHBoxLayout *cardSelectionBarLayout;
     QPushButton *previousCardButton;
     QPushButton *selectSetForCardsButton;
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
index c04d6bbf1..2da987762 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
@@ -1,8 +1,7 @@
 #include "printing_selector_card_sorting_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
-
-#include <libcockatrice/card/set/card_set_comparator.h>
+#include "../../../settings/cache_settings.h"
+#include "../../../utility/card_set_comparator.h"
 
 const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr("Alphabetical");
 const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference");
@@ -21,7 +20,6 @@ PrintingSelectorCardSortingWidget::PrintingSelectorCardSortingWidget(PrintingSel
 {
     setMinimumWidth(300);
     sortToolBar = new QHBoxLayout(this);
-    sortToolBar->setContentsMargins(11, 0, 11, 0);
 
     sortOptionsSelector = new QComboBox(this);
     sortOptionsSelector->setFocusPolicy(Qt::StrongFocus);
@@ -90,7 +88,7 @@ QList<PrintingInfo> PrintingSelectorCardSortingWidget::sortSets(const SetToPrint
     }
 
     if (sortedSets.empty()) {
-        sortedSets << CardSet::newInstance(SettingsCache::instance().cardDatabase(), "", "", "", QDate());
+        sortedSets << CardSet::newInstance("", "", "", QDate());
     }
 
     if (sortOptionsSelector->currentText() == SORT_OPTIONS_PREFERENCE) {
@@ -184,7 +182,7 @@ QList<PrintingInfo> PrintingSelectorCardSortingWidget::prependPinnedPrintings(co
  */
 QList<PrintingInfo> PrintingSelectorCardSortingWidget::prependPrintingsInDeck(const QList<PrintingInfo> &printings,
                                                                               const CardInfoPtr &selectedCard,
-                                                                              const DeckListModel *deckModel)
+                                                                              DeckListModel *deckModel)
 {
     if (!selectedCard) {
         return {};
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.h
index b5a00b81e..c91b363c9 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,9 +1,3 @@
-/**
- * @file printing_selector_card_sorting_widget.h
- * @ingroup PrintingWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef PRINTING_SELECTOR_CARD_SORTING_WIDGET_H
 #define PRINTING_SELECTOR_CARD_SORTING_WIDGET_H
 
@@ -23,7 +17,7 @@ public:
     QList<PrintingInfo> prependPinnedPrintings(const QList<PrintingInfo> &printings, const QString &cardName);
     QList<PrintingInfo> prependPrintingsInDeck(const QList<PrintingInfo> &printings,
                                                const CardInfoPtr &selectedCard,
-                                               const DeckListModel *deckModel);
+                                               DeckListModel *deckModel);
 
 public slots:
     void updateSortOrder();
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
deleted file mode 100644
index aee34bccd..000000000
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "printing_selector_placeholder_widget.h"
-
-PrintingSelectorPlaceholderWidget::PrintingSelectorPlaceholderWidget(QWidget *parent) : QWidget(parent)
-{
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    mainLayout = new QVBoxLayout(this);
-    mainLayout->setAlignment(Qt::AlignCenter);
-    setLayout(mainLayout);
-
-    // Image label with the background image
-    imageLabel = new QLabel(this);
-    imageLabel->setAlignment(Qt::AlignCenter);
-    imageLabel->setStyleSheet(R"(
-        QLabel {
-            background-image: url(theme:backgrounds/placeholder_printing_selector.svg);
-            background-repeat: no-repeat;
-            background-position: center;
-        }
-    )");
-    imageLabel->setFixedSize(300, 300);
-
-    textLabel = new QLabel(this);
-    textLabel->setAlignment(Qt::AlignCenter);
-    textLabel->setWordWrap(true);
-    textLabel->setStyleSheet(R"(
-        QLabel {
-            color: palette(mid);
-            font-size: 14px;
-            padding: 10px;
-        }
-    )");
-
-    mainLayout->addWidget(imageLabel);
-    mainLayout->addWidget(textLabel);
-
-    retranslateUi();
-}
-
-void PrintingSelectorPlaceholderWidget::retranslateUi()
-{
-    textLabel->setText(tr("Select a card to view its available printings"));
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
deleted file mode 100644
index abf030c69..000000000
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H
-#define COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H
-
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QWidget>
-
-class PrintingSelectorPlaceholderWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit PrintingSelectorPlaceholderWidget(QWidget *parent = nullptr);
-
-private:
-    QVBoxLayout *mainLayout;
-    QLabel *imageLabel;
-    QLabel *textLabel;
-
-    void retranslateUi();
-};
-
-#endif // COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
index e12775a04..b1a6a61c1 100644
--- a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
@@ -6,17 +6,17 @@
  * @class SetNameAndCollectorsNumberDisplayWidget
  * @brief A widget to display the set name and collectors number with adjustable font size.
  *
- * This widget displays the set name and collectors number on two separate labels.
+ * This widget displays the set name and collectors number on two separate labels. The font size is resized dynamically
+ * when the card size is changed.
  */
 SetNameAndCollectorsNumberDisplayWidget::SetNameAndCollectorsNumberDisplayWidget(QWidget *parent,
                                                                                  const QString &_setName,
-                                                                                 const QString &_collectorsNumber)
+                                                                                 const QString &_collectorsNumber,
+                                                                                 QSlider *_cardSizeSlider)
     : QWidget(parent)
 {
     // Set up the layout for the widget
     layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->setSpacing(1);
     setLayout(layout);
 
     // Set the widget's size policy and minimum size
@@ -26,19 +26,58 @@ SetNameAndCollectorsNumberDisplayWidget::SetNameAndCollectorsNumberDisplayWidget
     // Create and configure the set name label
     setName = new QLabel(_setName);
     setName->setWordWrap(true);
-    setName->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    setName->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
     setName->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
 
     // Create and configure the collectors number label
     collectorsNumber = new QLabel(_collectorsNumber);
-    collectorsNumber->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    collectorsNumber->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
     collectorsNumber->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 
+    // Store the card size slider and connect its signal to the font size adjustment slot
+    cardSizeSlider = _cardSizeSlider;
+    connect(cardSizeSlider, &QSlider::valueChanged, this, &SetNameAndCollectorsNumberDisplayWidget::adjustFontSize);
+
     // Add labels to the layout
     layout->addWidget(setName);
     layout->addWidget(collectorsNumber);
 }
 
+/**
+ * @brief Adjusts the font size of the labels based on the slider value.
+ *
+ * This method adjusts the font size of the set name and collectors number labels
+ * according to the scale percentage provided by the slider. The font size is clamped
+ * to a range between the defined minimum and maximum font sizes.
+ *
+ * @param scalePercentage The scale percentage from the slider.
+ */
+void SetNameAndCollectorsNumberDisplayWidget::adjustFontSize(int scalePercentage)
+{
+    // Define the base font size and the range
+    const int minFontSize = 8;      // Minimum font size
+    const int maxFontSize = 32;     // Maximum font size
+    const int basePercentage = 100; // Scale at 100%
+
+    // Calculate the new font size
+    int newFontSize = minFontSize + (scalePercentage - basePercentage) * (maxFontSize - minFontSize) / 225;
+
+    // Clamp the font size to the defined range
+    newFontSize = std::clamp(newFontSize, minFontSize, maxFontSize);
+
+    // Update the fonts for both labels
+    QFont setNameFont = setName->font();
+    setNameFont.setPointSize(newFontSize);
+    setName->setFont(setNameFont);
+
+    QFont collectorsNumberFont = collectorsNumber->font();
+    collectorsNumberFont.setPointSize(newFontSize);
+    collectorsNumber->setFont(collectorsNumberFont);
+
+    // Optionally trigger a resize to accommodate new font size
+    adjustSize();
+}
+
 /**
  * @brief Handles resize events to adjust the height of the set name label.
  *
diff --git a/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.h
index 220f57256..dfaa98caa 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
@@ -1,10 +1,3 @@
-/**
- * @file set_name_and_collectors_number_display_widget.h
- * @ingroup CardExtraInfoWidgets
- * @ingroup PrintingWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H
 #define SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H
 
@@ -17,13 +10,20 @@ class SetNameAndCollectorsNumberDisplayWidget : public QWidget
 {
     Q_OBJECT
 public:
-    SetNameAndCollectorsNumberDisplayWidget(QWidget *parent, const QString &setName, const QString &collectorsNumber);
+    SetNameAndCollectorsNumberDisplayWidget(QWidget *parent,
+                                            const QString &setName,
+                                            const QString &collectorsNumber,
+                                            QSlider *cardSizeSlider);
     void resizeEvent(QResizeEvent *event) override;
 
+public slots:
+    void adjustFontSize(int scalePercentage);
+
 private:
     QVBoxLayout *layout;
     QLabel *setName;
     QLabel *collectorsNumber;
+    QSlider *cardSizeSlider;
 };
 
 #endif // SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
index 81812104a..17087c8bc 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
@@ -8,6 +8,7 @@
 SettingsButtonWidget::SettingsButtonWidget(QWidget *parent)
     : QWidget(parent), button(new QToolButton(this)), popup(new SettingsPopupWidget(nullptr))
 {
+
     button->setIcon(QPixmap("theme:icons/cogwheel"));
     button->setCheckable(true);
     button->setFixedSize(32, 32);
@@ -35,21 +36,6 @@ void SettingsButtonWidget::setButtonIcon(QPixmap iconMap)
     button->setIcon(iconMap);
 }
 
-void SettingsButtonWidget::setButtonText(const QString &buttonText)
-{
-    // 🔓 unlock size constraints
-    button->setMinimumSize(QSize(0, 0));
-    button->setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
-
-    button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    button->setText(buttonText);
-
-    button->setFixedHeight(32);
-    button->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-
-    button->setMinimumWidth(button->sizeHint().width());
-}
-
 void SettingsButtonWidget::togglePopup()
 {
     if (popup->isVisible()) {
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 36f01ac38..3483b7625 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
@@ -1,10 +1,3 @@
-/**
- * @file settings_button_widget.h
- * @ingroup Widgets
- * @ingroup Settings
- * @brief TODO: Document this.
- */
-
 #ifndef SETTINGS_BUTTON_WIDGET_H
 #define SETTINGS_BUTTON_WIDGET_H
 
@@ -22,7 +15,6 @@ public:
     void addSettingsWidget(QWidget *toAdd) const;
     void removeSettingsWidget(QWidget *toRemove) const;
     void setButtonIcon(QPixmap iconMap);
-    void setButtonText(const QString &buttonText);
 
 protected:
     void mousePressEvent(QMouseEvent *event) override;
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
index 8389caea9..9b2e55e0f 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
@@ -10,7 +10,6 @@ SettingsPopupWidget::SettingsPopupWidget(QWidget *parent) : QWidget(parent, Qt::
 {
     // Main layout for the popup itself
     layout = new QVBoxLayout(this);
-    layout->setContentsMargins(5, 5, 5, 5);
 
     // Container for the content (with or without scroll area)
     containerWidget = new QWidget();
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
index e9605e473..6b6157b45 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
@@ -1,10 +1,3 @@
-/**
- * @file settings_popup_widget.h
- * @ingroup Widgets
- * @ingroup Settings
- * @brief TODO: Document this.
- */
-
 #ifndef SETTINGS_POPUP_WIDGET_H
 #define SETTINGS_POPUP_WIDGET_H
 
diff --git a/cockatrice/src/interface/widgets/server/game_selector.h b/cockatrice/src/interface/widgets/server/game_selector.h
deleted file mode 100644
index fa91e5f96..000000000
--- a/cockatrice/src/interface/widgets/server/game_selector.h
+++ /dev/null
@@ -1,207 +0,0 @@
-#ifndef GAMESELECTOR_H
-#define GAMESELECTOR_H
-
-#include "game_selector_quick_filter_toolbar.h"
-#include "game_type_map.h"
-
-#include <QGroupBox>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
-#include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
-
-class QTreeView;
-class GamesModel;
-class GamesProxyModel;
-class QPushButton;
-class QCheckBox;
-class QLabel;
-class AbstractClient;
-class TabSupervisor;
-class TabRoom;
-class ServerInfo_Game;
-class Response;
-
-/**
- * @class GameSelector
- * @ingroup Lobby
- * @brief Provides a widget for displaying, filtering, joining, spectating, and creating games in a room.
- *
- * The GameSelector displays all available games in a QTreeView. It supports filtering,
- * creating, joining, spectating, and viewing game details. Integrates with TabSupervisor
- * and TabRoom for room and game management.
- */
-class GameSelector : public QGroupBox
-{
-    Q_OBJECT
-private slots:
-    /**
-     * @brief Opens a dialog to set filters for the game list.
-     *
-     * 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.
-     *
-     * Resets the proxy model to show all games.
-     */
-    void actClearFilter();
-
-    /**
-     * @brief Opens the dialog to create a new game in the current room.
-     */
-    void actCreate();
-
-    /**
-     * @brief Joins the currently selected game as a player.
-     */
-    void actJoin();
-    /**
-     * @brief Joins the currently selected game as a judge.
-     */
-    void actJoinAsJudge();
-
-    /**
-     * @brief Joins the currently selected game as a spectator.
-     */
-    void actJoinAsSpectator();
-    void actJoinAsJudgeSpectator();
-
-    /**
-     * @brief Shows the custom context menu for a game when right-clicked.
-     * @param point The point at which the context menu is requested.
-     */
-    void customContextMenu(const QPoint &point);
-
-    /**
-     * @brief Slot called when the selected game changes.
-     * @param current The currently selected index.
-     * @param previous The previously selected index.
-     *
-     * Updates the enabled/disabled state of buttons depending on the selected game.
-     */
-    void actSelectedGameChanged(const QModelIndex &current, const QModelIndex &previous);
-
-    /**
-     * @brief Processes server responses for join or spectate commands.
-     * @param response The response from the server.
-     *
-     * Displays error messages for failed join/spectate attempts.
-     */
-    void checkResponse(const Response &response);
-
-    /**
-     * @brief Refreshes the game list when the ignore list is received from the server.
-     * @param _ignoreList The list of users being ignored.
-     */
-    void ignoreListReceived(const QList<ServerInfo_User> &_ignoreList);
-
-    /**
-     * @brief Processes events where a user is added to a list (e.g., ignore or buddy).
-     * @param event The event information.
-     */
-    void processAddToListEvent(const Event_AddToList &event);
-
-    /**
-     * @brief Processes events where a user is removed from a list (e.g., ignore or buddy).
-     * @param event The event information.
-     */
-    void processRemoveFromListEvent(const Event_RemoveFromList &event);
-
-signals:
-    /**
-     * @brief Emitted when a game has been successfully joined.
-     * @param gameId The ID of the joined game.
-     */
-    void gameJoined(int gameId);
-
-private:
-    AbstractClient *client;       /**< The network client used to communicate with the server. */
-    TabSupervisor *tabSupervisor; /**< Reference to TabSupervisor for managing tabs and rooms. */
-    TabRoom *room;                /**< The current room. */
-
-    QTreeView *gameListView;             /**< View widget for displaying the game list. */
-    GamesModel *gameListModel;           /**< Model containing all games. */
-    GamesProxyModel *gameListProxyModel; /**< Proxy model for filtering and sorting the game list. */
-
-    GameSelectorQuickFilterToolBar *quickFilterToolBar;
-
-    QPushButton *filterButton;               /**< Button to open the filter dialog. */
-    QPushButton *clearFilterButton;          /**< Button to clear active filters. */
-    QPushButton *createButton;               /**< Button to create a new game (only if room is set). */
-    QPushButton *joinButton;                 /**< Button to join the selected game. */
-    QPushButton *joinAsJudgeButton;          /**< Button to join the selected game as a judge. */
-    QPushButton *spectateButton;             /**< Button to spectate the selected game. */
-    QPushButton *joinAsJudgeSpectatorButton; /**< Button to join the selected game as a spectating judge. */
-
-    const bool showFilters;  /**< Determines whether filter buttons are displayed. */
-    GameTypeMap gameTypeMap; /**< Mapping of game types for the current room. */
-
-    /**
-     * @brief Updates the widget title to reflect the current number of displayed games.
-     *
-     * Shows the number of visible games versus total games if filters are enabled.
-     */
-    void updateTitle();
-
-    /**
-     * @brief Disables create/join/spectate buttons.
-     */
-    void disableButtons();
-
-    /**
-     * @brief Enables buttons for the currently selected game.
-     */
-    void enableButtons();
-
-    /**
-     * @brief Enables buttons for a specific game index.
-     * @param current The index of the currently selected game.
-     */
-    void enableButtonsForIndex(const QModelIndex &current);
-
-    /**
-     * @brief Performs the join or spectate action for the currently selected game.
-     * @param asSpectator True to join as a spectator, false to join as a player.
-     * @param asJudge True to join as a judge, false to join as a player.
-     *
-     * Handles password prompts, overrides, and sending the join command to the server.
-     */
-    void joinGame(bool asSpectator = false, bool asJudge = false);
-
-public:
-    /**
-     * @brief Constructs a GameSelector widget.
-     * @param _client The network client used to communicate with the server.
-     * @param _tabSupervisor Reference to TabSupervisor for managing tabs and rooms.
-     * @param _room Pointer to the current room; nullptr if no room is selected.
-     * @param _rooms Map of room IDs to room names.
-     * @param _gameTypes Map of room IDs to their available game types.
-     * @param restoresettings Whether to restore filter settings from previous sessions.
-     * @param _showfilters Whether to display filter buttons.
-     * @param parent Parent QWidget.
-     */
-    GameSelector(AbstractClient *_client,
-                 TabSupervisor *_tabSupervisor,
-                 TabRoom *_room,
-                 const QMap<int, QString> &_rooms,
-                 const QMap<int, GameTypeMap> &_gameTypes,
-                 const bool restoresettings,
-                 const bool _showfilters,
-                 QWidget *parent = nullptr);
-
-    /**
-     * @brief Updates UI text for translation/localization.
-     */
-    void retranslateUi();
-
-    /**
-     * @brief Updates or adds a game entry in the list.
-     * @param info The ServerInfo_Game object containing information about the game to update.
-     */
-    void processGameInfo(const ServerInfo_Game &info);
-};
-
-#endif
diff --git a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp b/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
deleted file mode 100644
index f7eacd636..000000000
--- a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-#include "game_selector_quick_filter_toolbar.h"
-
-#include "games_model.h"
-#include "user/user_list_manager.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLineEdit>
-
-GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
-                                                               TabSupervisor *_tabSupervisor,
-                                                               GamesProxyModel *_model,
-                                                               const QMap<int, QString> &allGameTypes)
-    : QWidget(parent), tabSupervisor(_tabSupervisor), model(_model)
-{
-    mainLayout = new QHBoxLayout(this);
-    mainLayout->setContentsMargins(0, 0, 0, 0);
-    mainLayout->setSpacing(5);
-
-    searchBar = new QLineEdit(this);
-    searchBar->setText(model->getGameNameFilter());
-    connect(searchBar, &QLineEdit::textChanged, this, [this](const QString &text) {
-        applyFilters([&](auto &, auto &, auto &, auto &, auto &, auto &, auto &, QString &gameNameFilter, auto &,
-                         auto &, auto &, auto &, auto &, auto &, auto &, auto &, auto &) { gameNameFilter = text; });
-    });
-
-    hideGamesNotCreatedByBuddiesCheckBox = new QCheckBox(this);
-    hideGamesNotCreatedByBuddiesCheckBox->setChecked(model->getHideNotBuddyCreatedGames());
-    connect(hideGamesNotCreatedByBuddiesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
-        applyFilters([&](auto &, auto &, auto &, auto &, auto &, bool &hideNotBuddyCreatedGames, auto &, auto &,
-                         QStringList &creatorNameFilters, auto &, auto &, auto &, auto &, auto &, auto &, auto &,
-                         auto &) {
-            hideNotBuddyCreatedGames = checked;
-
-            if (checked) {
-                QStringList buddyNames;
-                for (auto buddy : tabSupervisor->getUserListManager()->getBuddyList().values()) {
-                    buddyNames << QString::fromStdString(buddy.name());
-                }
-                creatorNameFilters = buddyNames;
-            } else {
-                creatorNameFilters.clear();
-            }
-        });
-    });
-
-    hideFullGamesCheckBox = new QCheckBox(this);
-    hideFullGamesCheckBox->setChecked(model->getHideFullGames());
-    connect(hideFullGamesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
-        applyFilters([&](auto &, auto &, bool &hideFullGames, auto &, auto &, auto &, auto &, auto &, auto &, auto &,
-                         auto &, auto &, auto &, auto &, auto &, auto &, auto &) { hideFullGames = checked; });
-    });
-
-    hideStartedGamesCheckBox = new QCheckBox(this);
-    hideStartedGamesCheckBox->setChecked(model->getHideGamesThatStarted());
-    connect(hideStartedGamesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
-        applyFilters([&](auto &, auto &, auto &, bool &hideGamesThatStarted, auto &, auto &, auto &, auto &, auto &,
-                         auto &, auto &, auto &, auto &, auto &, auto &, auto &,
-                         auto &) { hideGamesThatStarted = checked; });
-    });
-
-    filterToFormatComboBox = new QComboBox(this);
-
-    // Add a "No filter" / "All types" option first
-    filterToFormatComboBox->addItem(tr("All types"), QVariant()); // empty QVariant = no filter
-
-    QMapIterator<int, QString> i(allGameTypes);
-    while (i.hasNext()) {
-        i.next();
-        filterToFormatComboBox->addItem(i.value(), i.key()); // text = name, data = type ID
-    }
-
-    QSet<int> currentTypes = model->getGameTypeFilter();
-    if (currentTypes.size() == 1) {
-        int typeId = *currentTypes.begin();
-        int index = filterToFormatComboBox->findData(typeId);
-        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([&](auto &, auto &, auto &, auto &, auto &, auto &, auto &, auto &, auto &,
-                         QSet<int> &gameTypeFilter, auto &, auto &, auto &, auto &, auto &, auto &, auto &) {
-            QVariant data = filterToFormatComboBox->itemData(index);
-            if (!data.isValid()) {
-                gameTypeFilter.clear();
-            } else {
-                gameTypeFilter = {data.toInt()};
-            }
-        });
-    });
-
-    hideGamesNotCreatedByBuddiesCheckBox->setMinimumSize(20, 20);
-    hideFullGamesCheckBox->setMinimumSize(20, 20);
-    hideStartedGamesCheckBox->setMinimumSize(20, 20);
-
-#if defined(Q_OS_MAC)
-    mainLayout->setSpacing(6);
-#endif
-
-    mainLayout->addWidget(searchBar);
-    mainLayout->addWidget(filterToFormatComboBox);
-    mainLayout->addWidget(hideGamesNotCreatedByBuddiesCheckBox);
-    mainLayout->addSpacing(5);
-    mainLayout->addWidget(hideFullGamesCheckBox);
-    mainLayout->addSpacing(5);
-    mainLayout->addWidget(hideStartedGamesCheckBox);
-
-    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);
-
-    searchBar->setText(model->getGameNameFilter());
-
-    hideGamesNotCreatedByBuddiesCheckBox->setChecked(model->getHideNotBuddyCreatedGames());
-    hideFullGamesCheckBox->setChecked(model->getHideFullGames());
-    hideStartedGamesCheckBox->setChecked(model->getHideGamesThatStarted());
-
-    QSet<int> types = model->getGameTypeFilter();
-    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(bool &,
-                                                                     bool &,
-                                                                     bool &,
-                                                                     bool &,
-                                                                     bool &,
-                                                                     bool &,
-                                                                     bool &,
-                                                                     QString &,
-                                                                     QStringList &,
-                                                                     QSet<int> &,
-                                                                     int &,
-                                                                     int &,
-                                                                     QTime &,
-                                                                     bool &,
-                                                                     bool &,
-                                                                     bool &,
-                                                                     bool &)> mutator)
-{
-    bool hideBuddiesOnlyGames = model->getHideBuddiesOnlyGames();
-    bool hideIgnoredUserGames = model->getHideIgnoredUserGames();
-    bool hideFullGames = model->getHideFullGames();
-    bool hideGamesThatStarted = model->getHideGamesThatStarted();
-    bool hidePasswordProtectedGames = model->getHidePasswordProtectedGames();
-    bool hideNotBuddyCreatedGames = model->getHideNotBuddyCreatedGames();
-    bool hideOpenDecklistGames = model->getHideOpenDecklistGames();
-
-    QString gameNameFilter = model->getGameNameFilter();
-    QStringList creatorNameFilters = model->getCreatorNameFilters();
-    QSet<int> gameTypeFilter = model->getGameTypeFilter();
-
-    int minPlayers = model->getMaxPlayersFilterMin();
-    int maxPlayers = model->getMaxPlayersFilterMax();
-    QTime maxGameAge = model->getMaxGameAge();
-
-    bool showOnlyIfSpectatorsCanWatch = model->getShowOnlyIfSpectatorsCanWatch();
-    bool showSpectatorPasswordProtected = model->getShowSpectatorPasswordProtected();
-    bool showOnlyIfSpectatorsCanChat = model->getShowOnlyIfSpectatorsCanChat();
-    bool showOnlyIfSpectatorsCanSeeHands = model->getShowOnlyIfSpectatorsCanSeeHands();
-
-    mutator(hideBuddiesOnlyGames, hideIgnoredUserGames, hideFullGames, hideGamesThatStarted, hidePasswordProtectedGames,
-            hideNotBuddyCreatedGames, hideOpenDecklistGames, gameNameFilter, creatorNameFilters, gameTypeFilter,
-            minPlayers, maxPlayers, maxGameAge, showOnlyIfSpectatorsCanWatch, showSpectatorPasswordProtected,
-            showOnlyIfSpectatorsCanChat, showOnlyIfSpectatorsCanSeeHands);
-
-    model->setGameFilters(hideBuddiesOnlyGames, hideIgnoredUserGames, hideFullGames, hideGamesThatStarted,
-                          hidePasswordProtectedGames, hideNotBuddyCreatedGames, hideOpenDecklistGames, gameNameFilter,
-                          creatorNameFilters, gameTypeFilter, minPlayers, maxPlayers, maxGameAge,
-                          showOnlyIfSpectatorsCanWatch, showSpectatorPasswordProtected, showOnlyIfSpectatorsCanChat,
-                          showOnlyIfSpectatorsCanSeeHands);
-}
-
-void GameSelectorQuickFilterToolBar::retranslateUi()
-{
-    searchBar->setPlaceholderText(tr("Filter by game name..."));
-    filterToFormatComboBox->setToolTip(tr("Filter by game type/format"));
-    hideGamesNotCreatedByBuddiesCheckBox->setText(tr("Hide games not created by buddies"));
-    hideFullGamesCheckBox->setText(tr("Hide full games"));
-    hideStartedGamesCheckBox->setText(tr("Hide started games"));
-}
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
deleted file mode 100644
index c658418f9..000000000
--- a/cockatrice/src/interface/widgets/server/game_selector_quick_filter_toolbar.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef COCKATRICE_GAME_SELECTOR_QUICK_FILTER_TOOLBAR_H
-#define COCKATRICE_GAME_SELECTOR_QUICK_FILTER_TOOLBAR_H
-
-#include "../tabs/tab_supervisor.h"
-#include "games_model.h"
-
-#include <QHBoxLayout>
-#include <QLineEdit>
-#include <QWidget>
-
-class GameSelectorQuickFilterToolBar : public QWidget
-{
-
-    Q_OBJECT
-
-public:
-    explicit GameSelectorQuickFilterToolBar(QWidget *parent,
-                                            TabSupervisor *tabSupervisor,
-                                            GamesProxyModel *model,
-                                            const QMap<int, QString> &allGameTypes);
-    void syncFromModel();
-    void applyFilters(std::function<void(bool &,
-                                         bool &,
-                                         bool &,
-                                         bool &,
-                                         bool &,
-                                         bool &,
-                                         bool &,
-                                         QString &,
-                                         QStringList &,
-                                         QSet<int> &,
-                                         int &,
-                                         int &,
-                                         QTime &,
-                                         bool &,
-                                         bool &,
-                                         bool &,
-                                         bool &)> mutator);
-    void retranslateUi();
-
-private:
-    TabSupervisor *tabSupervisor;
-    GamesProxyModel *model;
-
-    QHBoxLayout *mainLayout;
-
-    QLineEdit *searchBar;
-    QCheckBox *hideGamesNotCreatedByBuddiesCheckBox;
-    QCheckBox *hideFullGamesCheckBox;
-    QCheckBox *hideStartedGamesCheckBox;
-    QComboBox *filterToFormatComboBox;
-};
-
-#endif // COCKATRICE_GAME_SELECTOR_QUICK_FILTER_TOOLBAR_H
diff --git a/cockatrice/src/interface/widgets/server/games_model.h b/cockatrice/src/interface/widgets/server/games_model.h
deleted file mode 100644
index c6884093d..000000000
--- a/cockatrice/src/interface/widgets/server/games_model.h
+++ /dev/null
@@ -1,367 +0,0 @@
-#ifndef GAMESMODEL_H
-#define GAMESMODEL_H
-
-#include "game_type_map.h"
-
-#include <QList>
-#include <QSet>
-#include <QSortFilterProxyModel>
-#include <QTime>
-#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
-
-class UserListProxy;
-
-/**
- * @class GamesModel
- * @ingroup Lobby
- * @brief Model storing all available games for display in a QTreeView or QTableView.
- *
- * Provides access to game information, supports sorting by different columns,
- * and updates when new game data is received from the server.
- */
-class GamesModel : public QAbstractTableModel
-{
-    Q_OBJECT
-private:
-    QList<ServerInfo_Game> gameList;  /**< List of games currently displayed. */
-    QMap<int, QString> rooms;         /**< Map of room IDs to room names. */
-    QMap<int, GameTypeMap> gameTypes; /**< Map of room IDs to available game types. */
-
-    static const int NUM_COLS = 8; /**< Number of columns in the table. */
-
-public:
-    static const int SORT_ROLE = Qt::UserRole + 1; /**< Role used for sorting. */
-
-    /**
-     * @brief Constructs a GamesModel.
-     * @param _rooms Mapping of room IDs to room names.
-     * @param _gameTypes Mapping of room IDs to their available game types.
-     * @param parent Parent QObject.
-     */
-    GamesModel(const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QObject *parent = nullptr);
-
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override
-    {
-        return parent.isValid() ? 0 : gameList.size();
-    }
-
-    [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override
-    {
-        return NUM_COLS;
-    }
-
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-
-    [[nodiscard]] QVariant
-    headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-
-    /**
-     * @brief Formats the game creation time into a human-readable string.
-     * @param secs Number of seconds since the game started.
-     * @return Short string representing game age (e.g., "new", ">5 min", ">2 hr").
-     */
-    static const QString getGameCreatedString(const int secs);
-
-    /**
-     * @brief Returns a reference to a specific game by row index.
-     * @param row Row index in the table.
-     * @return Reference to the ServerInfo_Game at the given row.
-     */
-    const ServerInfo_Game &getGame(int row);
-
-    /**
-     * @brief Updates the game list with a new or updated game.
-     * @param game The ServerInfo_Game object to add or update.
-     */
-    void updateGameList(const ServerInfo_Game &game);
-
-    /**
-     * @brief Returns the index of the room column.
-     */
-    int roomColIndex()
-    {
-        return 0;
-    }
-
-    /**
-     * @brief Returns the index of the start time column.
-     */
-    int startTimeColIndex()
-    {
-        return 1;
-    }
-
-    /**
-     * @brief Returns the map of game types per room.
-     */
-    const QMap<int, GameTypeMap> &getGameTypes()
-    {
-        return gameTypes;
-    }
-};
-
-/**
- * @class GamesProxyModel
- * @ingroup Lobby
- * @brief Proxy model for filtering and sorting the GamesModel based on user preferences.
- *
- * Supports filtering games based on buddies-only, ignored users, password protection,
- * game types, creator, age, player count, and spectator permissions.
- */
-class GamesProxyModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-private:
-    const UserListProxy *userListProxy; /**< Proxy for checking user ignore/buddy lists. */
-
-    // If adding any additional filters, make sure to update:
-    // - GamesProxyModel()
-    // - resetFilterParameters()
-    // - areFilterParametersSetToDefaults()
-    // - loadFilterParameters()
-    // - saveFilterParameters()
-    // - filterAcceptsRow()
-    bool hideBuddiesOnlyGames;
-    bool hideIgnoredUserGames;
-    bool hideFullGames;
-    bool hideGamesThatStarted;
-    bool hidePasswordProtectedGames;
-    bool hideNotBuddyCreatedGames;
-    bool hideOpenDecklistGames;
-    QString gameNameFilter;
-    QStringList creatorNameFilters;
-    QSet<int> gameTypeFilter;
-    quint32 maxPlayersFilterMin, maxPlayersFilterMax;
-    QTime maxGameAge;
-    bool showOnlyIfSpectatorsCanWatch;
-    bool showSpectatorPasswordProtected;
-    bool showOnlyIfSpectatorsCanChat;
-    bool showOnlyIfSpectatorsCanSeeHands;
-
-signals:
-    void filtersChanged();
-
-public:
-    /**
-     * @brief Constructs a GamesProxyModel.
-     * @param parent Parent QObject.
-     * @param _userListProxy Proxy for accessing ignore/buddy lists.
-     */
-    explicit GamesProxyModel(QObject *parent = nullptr, const UserListProxy *_userListProxy = nullptr);
-
-    // Getters for filter parameters
-    [[nodiscard]] bool getHideBuddiesOnlyGames() const
-    {
-        return hideBuddiesOnlyGames;
-    }
-    [[nodiscard]] bool getHideIgnoredUserGames() const
-    {
-        return hideIgnoredUserGames;
-    }
-    [[nodiscard]] bool getHideFullGames() const
-    {
-        return hideFullGames;
-    }
-    [[nodiscard]] bool getHideGamesThatStarted() const
-    {
-        return hideGamesThatStarted;
-    }
-    [[nodiscard]] bool getHidePasswordProtectedGames() const
-    {
-        return hidePasswordProtectedGames;
-    }
-    [[nodiscard]] bool getHideNotBuddyCreatedGames() const
-    {
-        return hideNotBuddyCreatedGames;
-    }
-    [[nodiscard]] bool getHideOpenDecklistGames() const
-    {
-        return hideOpenDecklistGames;
-    }
-    [[nodiscard]] QString getGameNameFilter() const
-    {
-        return gameNameFilter;
-    }
-    [[nodiscard]] QStringList getCreatorNameFilters() const
-    {
-        return creatorNameFilters;
-    }
-    [[nodiscard]] QSet<int> getGameTypeFilter() const
-    {
-        return gameTypeFilter;
-    }
-    [[nodiscard]] int getMaxPlayersFilterMin() const
-    {
-        return maxPlayersFilterMin;
-    }
-    [[nodiscard]] int getMaxPlayersFilterMax() const
-    {
-        return maxPlayersFilterMax;
-    }
-    [[nodiscard]] const QTime &getMaxGameAge() const
-    {
-        return maxGameAge;
-    }
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanWatch() const
-    {
-        return showOnlyIfSpectatorsCanWatch;
-    }
-    [[nodiscard]] bool getShowSpectatorPasswordProtected() const
-    {
-        return showSpectatorPasswordProtected;
-    }
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanChat() const
-    {
-        return showOnlyIfSpectatorsCanChat;
-    }
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanSeeHands() const
-    {
-        return showOnlyIfSpectatorsCanSeeHands;
-    }
-
-    /**
-     * @brief Sets all game filters at once.
-     */
-    void setGameFilters(bool _hideBuddiesOnlyGames,
-                        bool _hideIgnoredUserGames,
-                        bool _hideFullGames,
-                        bool _hideGamesThatStarted,
-                        bool _hidePasswordProtectedGames,
-                        bool _hideNotBuddyCreatedGames,
-                        bool _hideOpenDecklistGames,
-                        const QString &_gameNameFilter,
-                        const QStringList &_creatorNameFilter,
-                        const QSet<int> &_gameTypeFilter,
-                        int _maxPlayersFilterMin,
-                        int _maxPlayersFilterMax,
-                        const QTime &_maxGameAge,
-                        bool _showOnlyIfSpectatorsCanWatch,
-                        bool _showSpectatorPasswordProtected,
-                        bool _showOnlyIfSpectatorsCanChat,
-                        bool _showOnlyIfSpectatorsCanSeeHands);
-
-    // Individual setters
-    void setHideBuddiesOnlyGames(bool value)
-    {
-        hideBuddiesOnlyGames = value;
-        refresh();
-    }
-    void setHideIgnoredUserGames(bool value)
-    {
-        hideIgnoredUserGames = value;
-        refresh();
-    }
-    void setHideFullGames(bool value)
-    {
-        hideFullGames = value;
-        refresh();
-    }
-    void setHideGamesThatStarted(bool value)
-    {
-        hideGamesThatStarted = value;
-        refresh();
-    }
-    void setHidePasswordProtectedGames(bool value)
-    {
-        hidePasswordProtectedGames = value;
-        refresh();
-    }
-    void setHideNotBuddyCreatedGames(bool value)
-    {
-        hideNotBuddyCreatedGames = value;
-        refresh();
-    }
-    void setHideOpenDecklistGames(bool value)
-    {
-        hideOpenDecklistGames = value;
-        refresh();
-    }
-    void setGameNameFilter(const QString &value)
-    {
-        gameNameFilter = value;
-        refresh();
-    }
-    void setCreatorNameFilters(const QStringList &values)
-    {
-        creatorNameFilters = values;
-        refresh();
-    }
-    void setGameTypeFilter(const QSet<int> &value)
-    {
-        gameTypeFilter = value;
-        refresh();
-    }
-    void setMaxPlayersFilterMin(int value)
-    {
-        maxPlayersFilterMin = value;
-        refresh();
-    }
-    void setMaxPlayersFilterMax(int value)
-    {
-        maxPlayersFilterMax = value;
-        refresh();
-    }
-    void setMaxGameAge(const QTime &value)
-    {
-        maxGameAge = value;
-        refresh();
-    }
-    void setShowOnlyIfSpectatorsCanWatch(bool value)
-    {
-        showOnlyIfSpectatorsCanWatch = value;
-        refresh();
-    }
-    void setShowSpectatorPasswordProtected(bool value)
-    {
-        showSpectatorPasswordProtected = value;
-        refresh();
-    }
-    void setShowOnlyIfSpectatorsCanChat(bool value)
-    {
-        showOnlyIfSpectatorsCanChat = value;
-        refresh();
-    }
-    void setShowOnlyIfSpectatorsCanSeeHands(bool value)
-    {
-        showOnlyIfSpectatorsCanSeeHands = value;
-        refresh();
-    }
-
-    /**
-     * @brief Returns the number of games filtered out by the current filter.
-     */
-    [[nodiscard]] int getNumFilteredGames() const;
-
-    /**
-     * @brief Resets all filter parameters to default values.
-     */
-    void resetFilterParameters();
-
-    /**
-     * @brief Returns true if all filter parameters are set to their defaults.
-     */
-    [[nodiscard]] bool areFilterParametersSetToDefaults() const;
-
-    /**
-     * @brief Loads filter parameters from persistent settings.
-     * @param allGameTypes Mapping of all game types by room ID.
-     */
-    void loadFilterParameters(const QMap<int, QString> &allGameTypes);
-
-    /**
-     * @brief Saves filter parameters to persistent settings.
-     * @param allGameTypes Mapping of all game types by room ID.
-     */
-    void saveFilterParameters(const QMap<int, QString> &allGameTypes);
-
-    /**
-     * @brief Refreshes the proxy model (re-applies filters).
-     */
-    void refresh();
-
-protected:
-    [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
-    [[nodiscard]] bool filterAcceptsRow(int sourceRow) const;
-};
-
-#endif
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_proxy.h b/cockatrice/src/interface/widgets/server/user/user_list_proxy.h
deleted file mode 100644
index bff76077f..000000000
--- a/cockatrice/src/interface/widgets/server/user/user_list_proxy.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @file user_list_proxy.h
- * @ingroup UI
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
-#ifndef COCKATRICE_USERLISTPROXY_H
-#define COCKATRICE_USERLISTPROXY_H
-
-class QString;
-class ServerInfo_User;
-
-/**
- * Responsible for providing a bare-bones minimal interface into userlist information,
- * including your current connection to the server as well as buddy/ignore/alluser lists.
- */
-class UserListProxy
-{
-public:
-    [[nodiscard]] virtual bool isOwnUserRegistered() const = 0;
-    [[nodiscard]] virtual QString getOwnUsername() const = 0;
-    [[nodiscard]] virtual bool isUserBuddy(const QString &userName) const = 0;
-    [[nodiscard]] virtual bool isUserIgnored(const QString &userName) const = 0;
-    [[nodiscard]] virtual const ServerInfo_User *getOnlineUser(const QString &userName) const = 0; // Can return nullptr
-};
-
-#endif // COCKATRICE_USERLISTPROXY_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
deleted file mode 100644
index afc834e10..000000000
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ /dev/null
@@ -1,607 +0,0 @@
-/**
- * @file abstract_tab_deck_editor.cpp
- * @brief Implementation of the AbstractTabDeckEditor class.
- *
- * Handles deck editor tab UI, deck management, card operations, clipboard
- * operations, printing, deck export, remote uploads, and interactions with
- * external services (DeckStats, TappedOut, etc.).
- */
-
-#include "abstract_tab_deck_editor.h"
-
-#include "../../../client/settings/cache_settings.h"
-#include "../client/network/interfaces/deck_stats_interface.h"
-#include "../client/network/interfaces/tapped_out_interface.h"
-#include "../deck_editor/deck_state_manager.h"
-#include "../interface/card_picture_loader/card_picture_loader.h"
-#include "../interface/pixel_map_generator.h"
-#include "../interface/widgets/dialogs/dlg_load_deck.h"
-#include "../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
-#include "../interface/widgets/dialogs/dlg_load_deck_from_website.h"
-#include "../utility/visibility_change_listener.h"
-#include "tab_supervisor.h"
-
-#include <QAction>
-#include <QApplication>
-#include <QCloseEvent>
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QHeaderView>
-#include <QLineEdit>
-#include <QMessageBox>
-#include <QPrintPreviewDialog>
-#include <QPrinter>
-#include <QProcessEnvironment>
-#include <QPushButton>
-#include <QRegularExpression>
-#include <QSplitter>
-#include <QTreeView>
-#include <QUrl>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
-
-/**
- * @brief Constructs the AbstractTabDeckEditor.
- * Initializes all dock widgets and connects signals/slots.
- * @param _tabSupervisor The tab supervisor managing this tab.
- */
-AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
-{
-    setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
-
-    deckStateManager = new DeckStateManager(this);
-
-    cardDatabaseDockWidget = new DeckEditorCardDatabaseDockWidget(this);
-    deckDockWidget = new DeckEditorDeckDockWidget(this);
-    cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this);
-    filterDockWidget = new DeckEditorFilterDockWidget(this);
-    printingSelectorDockWidget = new DeckEditorPrintingSelectorDockWidget(this);
-
-    // Connect deck signals to this tab
-    connect(deckStateManager, &DeckStateManager::isModifiedChanged, this, &AbstractTabDeckEditor::onDeckModified);
-    connect(deckDockWidget, &DeckEditorDeckDockWidget::selectedCardChanged, this, &AbstractTabDeckEditor::updateCard);
-
-    // Connect filter signals
-    connect(filterDockWidget, &DeckEditorFilterDockWidget::clearAllDatabaseFilters, cardDatabaseDockWidget,
-            &DeckEditorCardDatabaseDockWidget::clearAllDatabaseFilters);
-
-    // Connect shortcut changes
-    connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
-            &AbstractTabDeckEditor::refreshShortcuts);
-}
-
-void AbstractTabDeckEditor::registerDockWidget(QMenu *_viewMenu, QDockWidget *widget, const QSize &defaultSize)
-{
-    QMenu *menu = _viewMenu->addMenu(QString());
-
-    QAction *aVisible = menu->addAction(QString());
-    aVisible->setCheckable(true);
-
-    QAction *aFloating = menu->addAction(QString());
-    aFloating->setCheckable(true);
-    aFloating->setEnabled(false);
-
-    // user interaction
-    connect(aVisible, &QAction::triggered, widget, [widget](bool checked) { widget->setVisible(checked); });
-    connect(aFloating, &QAction::triggered, this, [widget](bool checked) { widget->setFloating(checked); });
-
-    // sync aFloating's enabled state with aVisible's checked state
-    connect(aVisible, &QAction::toggled, aFloating, [aFloating](bool checked) { aFloating->setEnabled(checked); });
-
-    // sync aFloating with dockWidget's floating state
-    connect(widget, &QDockWidget::topLevelChanged, aFloating,
-            [aFloating](bool topLevel) { aFloating->setChecked(topLevel); });
-
-    // sync aVisible with dockWidget's visible state
-    auto filter = new VisibilityChangeListener(widget);
-    connect(filter, &VisibilityChangeListener::visibilityChanged, aVisible,
-            [aVisible](bool visible) { aVisible->setChecked(visible); });
-
-    dockToActions.insert(widget, {menu, aVisible, aFloating, defaultSize});
-}
-
-/**
- * @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());
-}
-
-/** @brief Placeholder: called when the deck changes. */
-void AbstractTabDeckEditor::onDeckChanged()
-{
-}
-
-/**
- * @brief Marks the tab as modified and updates the save menu status.
- */
-void AbstractTabDeckEditor::onDeckModified()
-{
-    deckMenu->setSaveStatus(!deckStateManager->isBlankNewDeck());
-    emit tabTextChanged(this, getTabText());
-}
-
-/**
- * @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();
-}
-
-/**
- * @brief Adds a card to the main deck or sideboard depending on Ctrl key.
- */
-void AbstractTabDeckEditor::actAddCard(const ExactCard &card)
-{
-    if (QApplication::keyboardModifiers() & Qt::ControlModifier)
-        actAddCardToSideboard(card);
-    else
-        addCardHelper(card, DECK_ZONE_MAIN);
-
-    deckMenu->setSaveStatus(true);
-}
-
-/** @brief Adds a card to the sideboard explicitly. */
-void AbstractTabDeckEditor::actAddCardToSideboard(const ExactCard &card)
-{
-    addCardHelper(card, DECK_ZONE_SIDE);
-    deckMenu->setSaveStatus(true);
-}
-
-/** @brief Decrements a card from the main deck. */
-void AbstractTabDeckEditor::actDecrementCard(const ExactCard &card)
-{
-    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);
-}
-
-/**
- * @brief Opens a deck in this tab.
- * @param deck The deck
- */
-void AbstractTabDeckEditor::openDeck(const LoadedDeck &deck)
-{
-    setDeck(deck);
-
-    if (!deck.lastLoadInfo.fileName.isEmpty()) {
-        SettingsCache::instance().recents().updateRecentlyOpenedDeckPaths(deck.lastLoadInfo.fileName);
-    }
-}
-
-/**
- * @brief Sets the currently active deck.
- * @param _deck The deck
- */
-void AbstractTabDeckEditor::setDeck(const LoadedDeck &_deck)
-{
-    deckStateManager->replaceDeck(_deck);
-    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(_deck.deckList.getCardRefList()));
-
-    dockToActions.value(deckDockWidget).aVisible->setChecked(true);
-    deckDockWidget->setVisible(dockToActions.value(deckDockWidget).aVisible->isChecked());
-}
-
-/** @brief Creates a new deck. Handles opening in new tab if needed. */
-void AbstractTabDeckEditor::actNewDeck()
-{
-    auto deckOpenLocation = confirmOpen(false);
-    if (deckOpenLocation == CANCELLED)
-        return;
-
-    if (deckOpenLocation == NEW_TAB) {
-        emit openDeckEditor(LoadedDeck());
-        return;
-    }
-
-    cleanDeckAndResetModified();
-}
-
-/** @brief Clears the current deck and resets modified flag. */
-void AbstractTabDeckEditor::cleanDeckAndResetModified()
-{
-    deckStateManager->clearDeck();
-    deckMenu->setSaveStatus(false);
-}
-
-/**
- * @brief Displays the save confirmation dialog before loading a deck.
- * @param openInSameTabIfBlank Open in same tab if current tab is blank.
- * @return DeckOpenLocation enum indicating where to open the deck.
- */
-AbstractTabDeckEditor::DeckOpenLocation AbstractTabDeckEditor::confirmOpen(const bool openInSameTabIfBlank)
-{
-    if (SettingsCache::instance().getOpenDeckInNewTab()) {
-        if (openInSameTabIfBlank && deckStateManager->isBlankNewDeck())
-            return SAME_TAB;
-        else
-            return NEW_TAB;
-    }
-
-    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)
-        return NEW_TAB;
-
-    switch (ret) {
-        case QMessageBox::Save:
-            return actSaveDeck() ? SAME_TAB : CANCELLED;
-        case QMessageBox::Discard:
-            return SAME_TAB;
-        default:
-            return CANCELLED;
-    }
-}
-
-/**
- * @brief Creates the base save confirmation dialog.
- * @return Pointer to a QMessageBox.
- */
-QMessageBox *AbstractTabDeckEditor::createSaveConfirmationWindow()
-{
-    QMessageBox *msgBox = new QMessageBox(this);
-    msgBox->setIcon(QMessageBox::Warning);
-    msgBox->setWindowTitle(tr("Are you sure?"));
-    msgBox->setText(tr("The decklist has been modified.\nDo you want to save the changes?"));
-    msgBox->setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
-    return msgBox;
-}
-
-/**
- * @brief Loads a deck from file using a dialog.
- * Displays a save confirmation if needed.
- */
-void AbstractTabDeckEditor::actLoadDeck()
-{
-    auto deckOpenLocation = confirmOpen();
-    if (deckOpenLocation == CANCELLED)
-        return;
-
-    DlgLoadDeck dialog(this);
-    if (!dialog.exec())
-        return;
-
-    QString fileName = dialog.selectedFiles().at(0);
-    openDeckFromFile(fileName, deckOpenLocation);
-}
-
-/**
- * @brief Opens a recently used deck file.
- * @param fileName Path to the deck file.
- */
-void AbstractTabDeckEditor::actOpenRecent(const QString &fileName)
-{
-    auto deckOpenLocation = confirmOpen();
-    if (deckOpenLocation == CANCELLED)
-        return;
-
-    openDeckFromFile(fileName, deckOpenLocation);
-}
-
-/**
- * @brief Actually opens a deck from file.
- * @param fileName Path to the deck file.
- * @param deckOpenLocation Where to open the deck (same or new tab).
- */
-void AbstractTabDeckEditor::openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation)
-{
-    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(fileName);
-
-    std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(fileName, fmt, true);
-    if (deckOpt) {
-        if (deckOpenLocation == NEW_TAB) {
-            emit openDeckEditor(deckOpt.value());
-        } else {
-            deckMenu->setSaveStatus(false);
-            openDeck(deckOpt.value());
-        }
-    } else {
-        QMessageBox::critical(this, tr("Error"), tr("Could not open deck at %1").arg(fileName));
-    }
-    deckMenu->setSaveStatus(true);
-}
-
-/**
- * @brief Saves the current deck.
- * If remote deck, sends upload command.
- * @return True if save succeeded, false otherwise.
- */
-bool AbstractTabDeckEditor::actSaveDeck()
-{
-    const auto loadedDeck = deckStateManager->toLoadedDeck();
-    if (loadedDeck.lastLoadInfo.remoteDeckId != LoadedDeck::LoadInfo::NON_REMOTE_ID) {
-        QString deckString = loadedDeck.deckList.writeToString_Native();
-        if (deckString.length() > MAX_FILE_LENGTH) {
-            QMessageBox::critical(this, tr("Error"), tr("Could not save remote deck"));
-            return false;
-        }
-
-        Command_DeckUpload cmd;
-        cmd.set_deck_id(static_cast<google::protobuf::uint32>(loadedDeck.lastLoadInfo.remoteDeckId));
-        cmd.set_deck_list(deckString.toStdString());
-
-        PendingCommand *pend = AbstractClient::prepareSessionCommand(cmd);
-        connect(pend, &PendingCommand::finished, this, &AbstractTabDeckEditor::saveDeckRemoteFinished);
-        tabSupervisor->getClient()->sendCommand(pend);
-
-        return true;
-    }
-    if (loadedDeck.lastLoadInfo.fileName.isEmpty())
-        return actSaveDeckAs();
-
-    if (DeckLoader::saveToFile(loadedDeck)) {
-        deckStateManager->setModified(false);
-        return true;
-    }
-
-    QMessageBox::critical(
-        this, tr("Error"),
-        tr("The deck could not be saved.\nPlease check that the directory is writable and try again."));
-    return false;
-}
-
-/**
- * @brief Saves the deck to a user-selected file.
- * @return True if save succeeded.
- */
-bool AbstractTabDeckEditor::actSaveDeckAs()
-{
-    DeckList deckList = deckStateManager->getDeckList();
-
-    QFileDialog dialog(this, tr("Save deck"));
-    dialog.setDirectory(SettingsCache::instance().getDeckPath());
-    dialog.setAcceptMode(QFileDialog::AcceptSave);
-    dialog.setDefaultSuffix("cod");
-    dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS);
-    dialog.selectFile(deckList.getName().trimmed());
-
-    if (!dialog.exec())
-        return false;
-
-    QString fileName = dialog.selectedFiles().at(0);
-    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(fileName);
-
-    std::optional<LoadedDeck::LoadInfo> infoOpt = DeckLoader::saveToFile(deckList, fileName, fmt);
-    if (!infoOpt) {
-        QMessageBox::critical(
-            this, tr("Error"),
-            tr("The deck could not be saved.\nPlease check that the directory is writable and try again."));
-        return false;
-    }
-
-    deckStateManager->setLastLoadInfo(infoOpt.value());
-
-    deckStateManager->setModified(false);
-    SettingsCache::instance().recents().updateRecentlyOpenedDeckPaths(fileName);
-    return true;
-}
-
-/**
- * @brief Callback for remote deck save completion.
- * @param response Server response.
- */
-void AbstractTabDeckEditor::saveDeckRemoteFinished(const Response &response)
-{
-    if (response.response_code() != Response::RespOk)
-        QMessageBox::critical(this, tr("Error"), tr("The deck could not be saved."));
-    else
-        deckStateManager->setModified(false);
-}
-
-/**
- * @brief Loads a deck from clipboard.
- * Displays confirmation if the tab is modified.
- */
-void AbstractTabDeckEditor::actLoadDeckFromClipboard()
-{
-    auto deckOpenLocation = confirmOpen();
-    if (deckOpenLocation == CANCELLED)
-        return;
-
-    DlgLoadDeckFromClipboard dlg(this);
-    if (!dlg.exec())
-        return;
-
-    if (deckOpenLocation == NEW_TAB) {
-        emit openDeckEditor({.deckList = dlg.getDeckList()});
-    } else {
-        setDeck({.deckList = dlg.getDeckList()});
-        deckStateManager->setModified(true);
-    }
-
-    deckMenu->setSaveStatus(true);
-}
-
-/**
- * @brief Opens the deck editor to edit clipboard contents.
- * @param annotated If true, edits with annotations.
- */
-void AbstractTabDeckEditor::editDeckInClipboard(bool annotated)
-{
-    LoadedDeck loadedDeck = deckStateManager->toLoadedDeck();
-    DlgEditDeckInClipboard dlg(loadedDeck.deckList, annotated, this);
-    if (!dlg.exec())
-        return;
-
-    setDeck({dlg.getDeckList(), loadedDeck.lastLoadInfo});
-    deckStateManager->setModified(true);
-    deckMenu->setSaveStatus(true);
-}
-
-/** @brief Slot for editing deck in clipboard with annotations. */
-void AbstractTabDeckEditor::actEditDeckInClipboard()
-{
-    editDeckInClipboard(true);
-}
-
-/** @brief Slot for editing deck in clipboard without annotations. */
-void AbstractTabDeckEditor::actEditDeckInClipboardRaw()
-{
-    editDeckInClipboard(false);
-}
-
-/** @brief Saves deck to clipboard with set info and annotation. */
-void AbstractTabDeckEditor::actSaveDeckToClipboard()
-{
-    DeckLoader::saveToClipboard(deckStateManager->getDeckList(), true, true);
-}
-
-/** @brief Saves deck to clipboard with annotation, without set info. */
-void AbstractTabDeckEditor::actSaveDeckToClipboardNoSetInfo()
-{
-    DeckLoader::saveToClipboard(deckStateManager->getDeckList(), true, false);
-}
-
-/** @brief Saves deck to clipboard without annotations, with set info. */
-void AbstractTabDeckEditor::actSaveDeckToClipboardRaw()
-{
-    DeckLoader::saveToClipboard(deckStateManager->getDeckList(), false, true);
-}
-
-/** @brief Saves deck to clipboard without annotations or set info. */
-void AbstractTabDeckEditor::actSaveDeckToClipboardRawNoSetInfo()
-{
-    DeckLoader::saveToClipboard(deckStateManager->getDeckList(), false, false);
-}
-
-/** @brief Prints the deck using a QPrintPreviewDialog. */
-void AbstractTabDeckEditor::actPrintDeck()
-{
-    auto *dlg = new QPrintPreviewDialog(this);
-    connect(dlg, &QPrintPreviewDialog::paintRequested, this,
-            [this](QPrinter *printer) { DeckLoader::printDeckList(printer, deckStateManager->getDeckList()); });
-    dlg->exec();
-}
-
-/**
- * @brief Loads a deck from a website.
- */
-void AbstractTabDeckEditor::actLoadDeckFromWebsite()
-{
-    auto deckOpenLocation = confirmOpen();
-    if (deckOpenLocation == CANCELLED)
-        return;
-
-    DlgLoadDeckFromWebsite dlg(this);
-    if (!dlg.exec())
-        return;
-
-    if (deckOpenLocation == NEW_TAB) {
-        emit openDeckEditor({.deckList = dlg.getDeck()});
-    } else {
-        setDeck({.deckList = dlg.getDeck()});
-        deckStateManager->setModified(true);
-    }
-
-    deckMenu->setSaveStatus(true);
-}
-
-/**
- * @brief Exports the deck to a decklist website.
- * @param website Website to export to.
- */
-void AbstractTabDeckEditor::exportToDecklistWebsite(DeckLoader::DecklistWebsite website)
-{
-    QString decklistUrlString = DeckLoader::exportDeckToDecklist(deckStateManager->getDeckList(), website);
-    // Check to make sure the string isn't empty.
-    if (decklistUrlString.isEmpty()) {
-        // Show an error if the deck is empty, and return.
-        QMessageBox::critical(this, tr("Error"), tr("There are no cards in your deck to be exported"));
-        return;
-    }
-
-    // Encode the string recieved from the model to make sure all characters are encoded.
-    // first we put it into a qurl object
-    QUrl decklistUrl = QUrl(decklistUrlString);
-    // we get the correctly encoded url.
-    decklistUrlString = decklistUrl.toEncoded();
-    // We open the url in the user's default browser
-    QDesktopServices::openUrl(decklistUrlString);
-}
-
-/** @brief Exports deck to www.decklist.org. */
-void AbstractTabDeckEditor::actExportDeckDecklist()
-{
-    exportToDecklistWebsite(DeckLoader::DecklistOrg);
-}
-
-/** @brief Exports deck to www.decklist.xyz. */
-void AbstractTabDeckEditor::actExportDeckDecklistXyz()
-{
-    exportToDecklistWebsite(DeckLoader::DecklistXyz);
-}
-
-/** @brief Analyzes the deck using DeckStats. */
-void AbstractTabDeckEditor::actAnalyzeDeckDeckstats()
-{
-    auto *interface = new DeckStatsInterface(*cardDatabaseDockWidget->getDatabase(), this);
-    interface->analyzeDeck(deckStateManager->getDeckList());
-}
-
-/** @brief Analyzes the deck using TappedOut. */
-void AbstractTabDeckEditor::actAnalyzeDeckTappedout()
-{
-    auto *interface = new TappedOutInterface(*cardDatabaseDockWidget->getDatabase(), this);
-    interface->analyzeDeck(deckStateManager->getDeckList());
-}
-
-/** @brief Applies a new filter tree to the database display. */
-void AbstractTabDeckEditor::filterTreeChanged(FilterTree *filterTree)
-{
-    cardDatabaseDockWidget->setFilterTree(filterTree);
-}
-
-/**
- * @brief Handles the close event of the tab.
- * @param event Close event.
- */
-void AbstractTabDeckEditor::closeEvent(QCloseEvent *event)
-{
-    emit deckEditorClosing(this);
-    event->accept();
-}
-
-/** @brief Shows a confirmation dialog before closing. */
-bool AbstractTabDeckEditor::confirmClose()
-{
-    if (deckStateManager->isModified()) {
-        tabSupervisor->setCurrentWidget(this);
-        int ret = createSaveConfirmationWindow()->exec();
-        if (ret == QMessageBox::Save)
-            return actSaveDeck();
-        else if (ret == QMessageBox::Cancel)
-            return false;
-    }
-    return true;
-}
-
-/** @brief Handles close requests from outside (tab manager). */
-bool AbstractTabDeckEditor::closeRequest()
-{
-    if (!confirmClose())
-        return false;
-    return close();
-}
diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
deleted file mode 100644
index 477c3f973..000000000
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/**
- * @file abstract_tab_deck_editor.h
- * @brief Defines the AbstractTabDeckEditor class, which provides a base for
- * deck editor tabs in the application.
- *
- */
-
-#ifndef TAB_GENERIC_DECK_EDITOR_H
-#define TAB_GENERIC_DECK_EDITOR_H
-
-#include "../interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h"
-#include "../interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h"
-#include "../interface/widgets/deck_editor/deck_editor_database_display_widget.h"
-#include "../interface/widgets/deck_editor/deck_editor_deck_dock_widget.h"
-#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
-#include "../interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h"
-#include "../interface/widgets/menus/deck_editor_menu.h"
-#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
-#include "tab.h"
-
-#include <libcockatrice/deck_list/deck_list_history_manager.h>
-
-class DeckStateManager;
-class CardDatabaseModel;
-class CardDatabaseDisplayModel;
-
-class CardInfoFrameWidget;
-class DeckLoader;
-class DeckEditorMenu;
-class DeckEditorCardInfoDockWidget;
-class DeckEditorCardDatabaseDockWidget;
-class DeckEditorDeckDockWidget;
-class DeckEditorFilterDockWidget;
-class DeckEditorPrintingSelectorDockWidget;
-class DeckPreviewDeckTagsDisplayWidget;
-class Response;
-class FilterTree;
-class FilterTreeModel;
-class FilterBuilder;
-
-class QTreeView;
-class QTextEdit;
-class QLabel;
-class QComboBox;
-class QGroupBox;
-class QMessageBox;
-class QHBoxLayout;
-class QVBoxLayout;
-class QPushButton;
-class QDockWidget;
-class QMenu;
-class QAction;
-
-/**
- * @class AbstractTabDeckEditor
- * @ingroup DeckEditorTabs
- * @brief AbstractTabDeckEditor is the base class for all deck editor tabs.
- *
- * **Description:**
- * AbstractTabDeckEditor is the base class for all deck editor tabs. It provides core functionality such as deck model
- * management, card addition/removal, and integration with dock widgets and tab supervisors.
- *
- * **Purpose:**
- *
- * - Acts as the foundation for deck editor tabs (TabDeckEditor and TabDeckEditorVisual).
- * - Provides basic deck operations like adding, removing, swapping, and decrementing cards.
- * - Integrates with DeckListModel and CardDatabaseModel to access deck and card data.
- * - Handles saving, loading, and layout persistence at the tab level.
- *
- * **Dock Widgets (typically managed in derived classes):**
- *
- * - DeckEditorCardInfoDockWidget — Displays detailed card info.
- * - DeckEditorDeckDockWidget— Displays mainboard/sideboard cards and zones.
- * - DeckEditorFilterDockWidget— Provides filtering options for card searches.
- * - DeckEditorPrintingSelectorDockWidget— Selector for different card printings.
- * - DeckEditorDatabaseDisplayWidget— Shows card database for adding cards to deck.
- *
- * **Key Methods:**
- *
- * - actAddCard(const ExactCard &card) — Adds a card to the deck.
- * - actDecrementCard(const ExactCard &card) — Removes a single instance of a card from the deck.
- * - 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.
- * - onDeckModified() — Called when the deck model is changed.
- *
- * Provides UI docks for the deck, database, card info, printing selector,
- * and filters. Supports loading, saving, editing, exporting decks, and
- * interactions with external services such as DeckStats, TappedOut, and
- * remote deck uploads.
- */
-class AbstractTabDeckEditor : public Tab
-{
-    Q_OBJECT
-
-    friend class DeckEditorMenu;
-
-public:
-    /**
-     * @brief Constructs an AbstractTabDeckEditor.
-     * @param _tabSupervisor Pointer to the TabSupervisor managing this tab.
-     */
-    explicit AbstractTabDeckEditor(TabSupervisor *_tabSupervisor);
-
-    /** @brief Creates the menus for this tab. Pure virtual. */
-    virtual void createMenus() = 0;
-
-    /** @brief Returns the display text for the tab. */
-    [[nodiscard]] virtual QString getTabText() const override = 0;
-
-    /** @brief Confirms whether the tab can be safely closed. */
-    bool confirmClose();
-
-    /** @brief Retranslates the UI text. Pure virtual. */
-    virtual void retranslateUi() override = 0;
-
-    /** @brief Opens a deck in this tab.
-     *  @param deck The deck to open
-     */
-    void openDeck(const LoadedDeck &deck);
-
-    DeckEditorDeckDockWidget *getDeckDockWidget() const
-    {
-        return deckDockWidget;
-    }
-
-    // UI Elements
-    DeckStateManager *deckStateManager;
-    DeckEditorMenu *deckMenu;                                         ///< Menu for deck operations
-    DeckEditorCardDatabaseDockWidget *cardDatabaseDockWidget;         ///< Database dock
-    DeckEditorCardInfoDockWidget *cardInfoDockWidget;                 ///< Card info dock
-    DeckEditorDeckDockWidget *deckDockWidget;                         ///< Deck dock
-    DeckEditorFilterDockWidget *filterDockWidget;                     ///< Filter dock
-    DeckEditorPrintingSelectorDockWidget *printingSelectorDockWidget; ///< Printing selector dock
-
-public slots:
-    /** @brief Called when the deck changes. */
-    virtual void onDeckChanged();
-
-    /** @brief Called when the deck is modified. */
-    virtual void onDeckModified();
-
-    /** @brief Updates the card info panel.
-     *  @param card The card to display.
-     */
-    void updateCard(const ExactCard &card);
-
-    /** @brief Adds a card to the main deck or sideboard based on Ctrl key. */
-    void actAddCard(const ExactCard &card);
-
-    /** @brief Adds a card to the sideboard explicitly. */
-    void actAddCardToSideboard(const ExactCard &card);
-
-    /** @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);
-
-    /** @brief Called when the filter tree changes. */
-    void filterTreeChanged(FilterTree *filterTree);
-
-    /** @brief Requests closing the tab. */
-    bool closeRequest() override;
-
-    /** @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. */
-    void openDeckEditor(const LoadedDeck &deck);
-
-    /** @brief Emitted before the tab is closed. */
-    void deckEditorClosing(AbstractTabDeckEditor *tab);
-
-protected slots:
-    /** @brief Starts a new deck in this tab. */
-    virtual void actNewDeck();
-
-    /** @brief Cleans the current deck and resets the modified state. */
-    void cleanDeckAndResetModified();
-
-    /** @brief Loads a deck from file. */
-    virtual void actLoadDeck();
-
-    /** @brief Saves the current deck. */
-    bool actSaveDeck();
-
-    /** @brief Saves the current deck under a new name. */
-    virtual bool actSaveDeckAs();
-
-    /** @brief Loads a deck from the clipboard. */
-    virtual void actLoadDeckFromClipboard();
-
-    /** @brief Opens a deck editor for clipboard contents. */
-    void actEditDeckInClipboard();
-
-    /** @brief Opens a raw clipboard deck editor. */
-    void actEditDeckInClipboardRaw();
-
-    /** @brief Saves deck to clipboard with full info. */
-    void actSaveDeckToClipboard();
-
-    /** @brief Saves deck to clipboard without set info. */
-    void actSaveDeckToClipboardNoSetInfo();
-
-    /** @brief Saves deck to clipboard in raw format. */
-    void actSaveDeckToClipboardRaw();
-
-    /** @brief Saves deck to clipboard in raw format without set info. */
-    void actSaveDeckToClipboardRawNoSetInfo();
-
-    /** @brief Prints the deck using a preview dialog. */
-    void actPrintDeck();
-
-    /** @brief Loads a deck from an online website. */
-    void actLoadDeckFromWebsite();
-
-    /** @brief Exports the deck to decklist.org. */
-    void actExportDeckDecklist();
-
-    /** @brief Exports the deck to decklist.xyz. */
-    void actExportDeckDecklistXyz();
-
-    /** @brief Analyzes the deck using deckstats.net. */
-    void actAnalyzeDeckDeckstats();
-
-    /** @brief Analyzes the deck using tappedout.net. */
-    void actAnalyzeDeckTappedout();
-
-    /** @brief Callback when a remote deck save finishes. */
-    void saveDeckRemoteFinished(const Response &r);
-
-    // UI Layout Management
-    virtual void loadLayout() = 0;
-    virtual void restartLayout() = 0;
-    virtual void refreshShortcuts() = 0;
-
-    /** @brief Handles dock close events. */
-    void closeEvent(QCloseEvent *event) override;
-
-private:
-    /** @brief Sets the deck for this tab.
-     *  @param _deck The deck object.
-     */
-    virtual void setDeck(const LoadedDeck &_deck);
-
-    /** @brief Helper for editing decks from the clipboard. */
-    void editDeckInClipboard(bool annotated);
-
-    /** @brief Helper for exporting decks to websites.
-     *  @param website Target website.
-     */
-    void exportToDecklistWebsite(DeckLoader::DecklistWebsite website);
-
-protected:
-    /** @brief Enum describing deck open locations */
-    enum DeckOpenLocation
-    {
-        CANCELLED, ///< Operation cancelled
-        SAME_TAB,  ///< Open deck in the same tab
-        NEW_TAB    ///< Open deck in a new tab
-    };
-
-    /**
-     * @brief The actions associated with managing a QDockWidget
-     */
-    struct DockActions
-    {
-        QMenu *menu;        ///< The menu containing the actions
-        QAction *aVisible;  ///< The menu action that toggles visibility
-        QAction *aFloating; ///< The menu action that toggles floating
-        QSize defaultSize;  ///< The default size of the dock
-    };
-
-    /**
-     * @brief registers a QDockWidget as a managed dock widget. Creates the associated actions and menu, adds them to
-     * the viewMenu, and connects those actions to the tab's slots.
-     */
-    void registerDockWidget(QMenu *_viewMenu, QDockWidget *widget, const QSize &defaultSize);
-
-    /** @brief Confirms deck open action based on settings and modified state.
-     *  @param openInSameTabIfBlank Whether to reuse same tab if blank.
-     *  @return Selected DeckOpenLocation.
-     */
-    DeckOpenLocation confirmOpen(bool openInSameTabIfBlank = true);
-
-    /** @brief Creates a save confirmation message box.
-     *  @return Pointer to a QMessageBox.
-     */
-    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);
-
-    // UI Menu Elements
-    QMenu *viewMenu;
-
-    QAction *aResetLayout;
-
-    QMap<QDockWidget *, DockActions> dockToActions;
-};
-
-#endif // TAB_GENERIC_DECK_EDITOR_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
deleted file mode 100644
index 40882db04..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "archidekt_deck_listing_api_response.h"
-
-#include <QDebug>
-#include <QJsonArray>
-
-void ArchidektDeckListingApiResponse::fromJson(const QJsonObject &json)
-{
-    count = json.value("count").toInt();
-    next = QUrl(json.value("next").toString());
-
-    QJsonArray containerJson = json.value("results").toArray();
-
-    for (const QJsonValue &deckListingValue : containerJson) {
-        ArchidektApiResponseDeckListingContainer listingResult;
-        listingResult.fromJson(deckListingValue.toObject());
-        results.append(listingResult);
-    }
-}
-
-void ArchidektDeckListingApiResponse::debugPrint() const
-{
-    qDebug() << "Count:" << count;
-    qDebug() << "Next:" << next;
-
-    qDebug() << "Results:";
-    for (const auto &deckListing : results) {
-        deckListing.debugPrint();
-    }
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.h
deleted file mode 100644
index 723c65ce2..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_DECK_LISTING_API_RESPONSE_H
-#define COCKATRICE_ARCHIDEKT_DECK_LISTING_API_RESPONSE_H
-
-#include "deck_listings/archidekt_api_response_deck_listing_container.h"
-
-#include <QJsonObject>
-#include <QString>
-#include <QUrl>
-
-class ArchidektDeckListingApiResponse
-{
-
-public:
-    int count;
-    QUrl next;
-    QVector<ArchidektApiResponseDeckListingContainer> results;
-
-    void fromJson(const QJsonObject &json);
-    void debugPrint() const;
-};
-
-#endif // COCKATRICE_DECK_LISTING_API_RESPONSE_H
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
deleted file mode 100644
index ac1b66e14..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h
+++ /dev/null
@@ -1,227 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_FORMATS_H
-#define COCKATRICE_ARCHIDEKT_FORMATS_H
-#include <QHash>
-#include <QString>
-
-namespace ArchidektFormats
-{
-enum class DeckFormat
-{
-    Standard = 0,
-    Modern = 1,
-    Commander = 2,
-    Legacy = 3,
-    Vintage = 4,
-    Pauper = 5,
-    Custom = 6,
-    Frontier = 7,
-    FutureStandard = 8,
-    PennyDreadful = 9,
-    Commander1v1 = 10,
-    DualCommander = 11,
-    Brawl = 12,
-
-    // Values outside Archidekt range
-    Alchemy = 1000,
-    Historic = 1001,
-    Gladiator = 1002,
-    Oathbreaker = 1003,
-    OldSchool = 1004,
-    PauperCommander = 1005,
-    Pioneer = 1006,
-    PreDH = 1007,
-    Premodern = 1008,
-    StandardBrawl = 1009,
-    Timeless = 1010,
-    Unknown = 1011
-};
-
-inline static QString formatToApiName(DeckFormat format)
-{
-    switch (format) {
-        case DeckFormat::Standard:
-            return "Standard";
-        case DeckFormat::Modern:
-            return "Modern";
-        case DeckFormat::Commander:
-            return "Commander";
-        case DeckFormat::Legacy:
-            return "Legacy";
-        case DeckFormat::Vintage:
-            return "Vintage";
-        case DeckFormat::Pauper:
-            return "Pauper";
-        case DeckFormat::Custom:
-            return "Custom";
-        case DeckFormat::Frontier:
-            return "Frontier";
-        case DeckFormat::FutureStandard:
-            return "Future Std";
-        case DeckFormat::PennyDreadful:
-            return "Penny Dreadful";
-        case DeckFormat::Commander1v1:
-            return "1v1 Commander";
-        case DeckFormat::DualCommander:
-            return "Dual Commander";
-        case DeckFormat::Brawl:
-            return "Brawl";
-
-        case DeckFormat::Alchemy:
-            return "Alchemy";
-        case DeckFormat::Historic:
-            return "Historic";
-        case DeckFormat::Gladiator:
-            return "Gladiator";
-        case DeckFormat::Oathbreaker:
-            return "Oathbreaker";
-        case DeckFormat::OldSchool:
-            return "Old School";
-        case DeckFormat::PauperCommander:
-            return "Pauper Commander";
-        case DeckFormat::Pioneer:
-            return "Pioneer";
-        case DeckFormat::PreDH:
-            return "PreDH";
-        case DeckFormat::Premodern:
-            return "Premodern";
-        case DeckFormat::StandardBrawl:
-            return "Standard Brawl";
-        case DeckFormat::Timeless:
-            return "Timeless";
-
-        default:
-            return "Unknown";
-    }
-}
-
-inline static DeckFormat apiNameToFormat(const QString &name)
-{
-    const QString n = name.trimmed();
-
-    if (n.compare("Standard", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Standard;
-    if (n.compare("Modern", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Modern;
-    if (n.compare("Commander", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Commander;
-    if (n.compare("Legacy", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Legacy;
-    if (n.compare("Vintage", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Vintage;
-    if (n.compare("Pauper", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Pauper;
-    if (n.compare("Custom", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Custom;
-    if (n.compare("Frontier", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Frontier;
-    if (n.compare("Future Std", Qt::CaseInsensitive) == 0)
-        return DeckFormat::FutureStandard;
-    if (n.compare("Penny Dreadful", Qt::CaseInsensitive) == 0)
-        return DeckFormat::PennyDreadful;
-    if (n.compare("1v1 Commander", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Commander1v1;
-    if (n.compare("Dual Commander", Qt::CaseInsensitive) == 0)
-        return DeckFormat::DualCommander;
-    if (n.compare("Brawl", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Brawl;
-
-    if (n.compare("Alchemy", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Alchemy;
-    if (n.compare("Historic", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Historic;
-    if (n.compare("Gladiator", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Gladiator;
-    if (n.compare("Oathbreaker", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Oathbreaker;
-    if (n.compare("Old School", Qt::CaseInsensitive) == 0)
-        return DeckFormat::OldSchool;
-    if (n.compare("Pauper Commander", Qt::CaseInsensitive) == 0)
-        return DeckFormat::PauperCommander;
-    if (n.compare("Pioneer", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Pioneer;
-    if (n.compare("PreDH", Qt::CaseInsensitive) == 0)
-        return DeckFormat::PreDH;
-    if (n.compare("Premodern", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Premodern;
-    if (n.compare("Standard Brawl", Qt::CaseInsensitive) == 0)
-        return DeckFormat::StandardBrawl;
-    if (n.compare("Timeless", Qt::CaseInsensitive) == 0)
-        return DeckFormat::Timeless;
-
-    return DeckFormat::Unknown;
-}
-
-inline static QString formatToCockatriceName(DeckFormat format)
-{
-    switch (format) {
-        case DeckFormat::Standard:
-            return "standard";
-        case DeckFormat::Modern:
-            return "modern";
-        case DeckFormat::Commander:
-            return "commander";
-        case DeckFormat::Legacy:
-            return "legacy";
-        case DeckFormat::Vintage:
-            return "vintage";
-        case DeckFormat::Pauper:
-            return "pauper";
-        case DeckFormat::Brawl:
-            return "brawl";
-        case DeckFormat::PennyDreadful:
-            return "penny";
-        case DeckFormat::FutureStandard:
-            return "future";
-        case DeckFormat::Commander1v1:
-            return "duel";
-        case DeckFormat::DualCommander:
-            return "duel";
-        case DeckFormat::Alchemy:
-            return "alchemy";
-        case DeckFormat::Historic:
-            return "historic";
-        case DeckFormat::Gladiator:
-            return "gladiator";
-        case DeckFormat::Oathbreaker:
-            return "oathbreaker";
-        case DeckFormat::OldSchool:
-            return "oldschool";
-        case DeckFormat::PauperCommander:
-            return "paupercommander";
-        case DeckFormat::Pioneer:
-            return "pioneer";
-        case DeckFormat::PreDH:
-            return "predh";
-        case DeckFormat::Premodern:
-            return "premodern";
-        case DeckFormat::StandardBrawl:
-            return "standardbrawl";
-        case DeckFormat::Timeless:
-            return "timeless";
-
-        default:
-            return {};
-    }
-}
-
-inline static DeckFormat cockatriceNameToFormat(const QString &apiName)
-{
-    static const QHash<QString, DeckFormat> map = {
-        {"standard", DeckFormat::Standard},     {"modern", DeckFormat::Modern},
-        {"commander", DeckFormat::Commander},   {"legacy", DeckFormat::Legacy},
-        {"vintage", DeckFormat::Vintage},       {"pauper", DeckFormat::Pauper},
-        {"brawl", DeckFormat::Brawl},           {"penny", DeckFormat::PennyDreadful},
-        {"future", DeckFormat::FutureStandard}, {"duel", DeckFormat::Commander1v1},
-        {"alchemy", DeckFormat::Alchemy},       {"historic", DeckFormat::Historic},
-        {"gladiator", DeckFormat::Gladiator},   {"oathbreaker", DeckFormat::Oathbreaker},
-        {"oldschool", DeckFormat::OldSchool},   {"paupercommander", DeckFormat::PauperCommander},
-        {"pioneer", DeckFormat::Pioneer},       {"predh", DeckFormat::PreDH},
-        {"premodern", DeckFormat::Premodern},   {"standardbrawl", DeckFormat::StandardBrawl},
-        {"timeless", DeckFormat::Timeless}};
-
-    return map.value(apiName.toLower(), DeckFormat::Unknown);
-}
-
-} // namespace ArchidektFormats
-
-#endif // COCKATRICE_ARCHIDEKT_FORMATS_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
deleted file mode 100644
index 5b879f8ae..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "archidekt_api_response_card.h"
-
-void ArchidektApiResponseCard::fromJson(const QJsonObject &json)
-{
-    id = json.value("id").toInt();
-    artist = json.value("artist").toString();
-    tcgProductId = json.value("tcgProductId").toInt();
-    ckFoilId = json.value("ckFoilId").toInt();
-    ckNormalId = json.value("ckNormalId").toInt();
-    cmEd = json.value("cmEd").toString();
-    scgSku = json.value("scgSku").toString();
-    scgFoilSku = json.value("scgFoilSku").toString();
-    collectorNumber = json.value("collectorNumber").toString();
-    multiverseId = json.value("multiverseId").toInt();
-    mtgoFoilId = json.value("mtgoFoilId").toInt();
-    mtgoNormalId = json.value("mtgoNormalId").toInt();
-    uid = json.value("uid").toString();
-    displayName = json.value("displayName").toString();
-    releasedAt = json.value("releasedAt").toString();
-
-    edition.fromJson(json.value("edition").toObject());
-
-    flavor = json.value("flavor").toString();
-    //! \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 but not really important
-    //! \todo globalCategories = {""};
-}
-
-void ArchidektApiResponseCard::debugPrint() const
-{
-    qDebug() << "Id:" << id;
-    qDebug() << "id:" << artist;
-    qDebug() << "artist:" << tcgProductId;
-    qDebug() << "tcgProductId:" << ckFoilId;
-    qDebug() << "ckFoilId:" << ckNormalId;
-    qDebug() << "ckNormalId:" << cmEd;
-    qDebug() << "cmEd:" << scgSku;
-    qDebug() << "scgSku:" << scgFoilSku;
-    qDebug() << "scgFoilSku:" << collectorNumber;
-    qDebug() << "collectorNumber:" << multiverseId;
-    qDebug() << "multiverseId:" << mtgoFoilId;
-    qDebug() << "mtgoFoilId:" << mtgoNormalId;
-    qDebug() << "mtgoNormalId:" << uid;
-    qDebug() << "uid:" << displayName;
-    qDebug() << "displayName:" << releasedAt;
-    qDebug() << "releasedAt:" << flavor;
-    qDebug() << "flavor:" << games;
-    qDebug() << "games:" << options;
-    qDebug() << "options:" << scryfallImageHash;
-    qDebug() << "scryfallImageHash:" << owned;
-    qDebug() << "owned:" << pinnedStatus;
-    qDebug() << "pinnedStatus:" << rarity;
-    qDebug() << "rarity:" << globalCategories;
-}
\ No newline at end of file
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
deleted file mode 100644
index 265498228..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_CARD_H
-#define COCKATRICE_ARCHIDEKT_API_RESPONSE_CARD_H
-
-#include "archidekt_api_response_edition.h"
-
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QVector>
-
-class ArchidektApiResponseCard
-{
-public:
-    // Constructor
-    ArchidektApiResponseCard() = default;
-
-    // Parse deck-related data from JSON
-    void fromJson(const QJsonObject &json);
-
-    // Debug method for logging
-    void debugPrint() const;
-
-    QJsonObject getOracleCard() const
-    {
-        return oracleCard;
-    };
-
-    QString getCollectorNumber() const
-    {
-        return collectorNumber;
-    }
-
-    ArchidektApiResponseEdition getEdition() const
-    {
-        return edition;
-    }
-
-private:
-    int id;
-    QString artist;
-    int tcgProductId;
-    int ckFoilId;
-    int ckNormalId;
-    QString cmEd;
-    QString scgSku;
-    QString scgFoilSku;
-    QString collectorNumber;
-    int multiverseId;
-    int mtgoFoilId;
-    int mtgoNormalId;
-    QString uid;
-    QString displayName;
-    QString releasedAt;
-    ArchidektApiResponseEdition edition;
-    QString flavor;
-    QStringList games;
-    QStringList options;
-    QString scryfallImageHash;
-    QJsonObject oracleCard;
-    int owned;
-    int pinnedStatus;
-    // ArchidektApiResponsePrices prices;
-    QString rarity;
-    QStringList globalCategories;
-};
-
-#endif // COCKATRICE_ARCHIDEKT_API_RESPONSE_CARD_H
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
deleted file mode 100644
index f51d0f3e7..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "archidekt_api_response_card_entry.h"
-
-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);
-    }
-
-    companion = json.value("companion").toBool();
-    flippedDefault = json.value("flippedDefault").toBool();
-    label = json.value("label").toString();
-    modifier = json.value("modifier").toString();
-    quantity = json.value("quantity").toInt();
-    customCmc = json.value("customCmc").toInt();
-    // removedCategories = {""};
-    createdAt = json.value("createdAt").toString();
-    updatedAt = json.value("updatedAt").toString();
-    deletedAt = json.value("deletedAt").toString();
-    notes = json.value("notes").toString();
-    card.fromJson(json.value("card").toObject());
-}
-
-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() << "Companion:" << companion;
-    qDebug() << "FlippedDefault:" << flippedDefault;
-    qDebug() << "Label:" << label;
-    qDebug() << "Modifier:" << modifier;
-    qDebug() << "Quantity:" << quantity;
-    qDebug() << "CustomCmc:" << customCmc;
-    qDebug() << "RemovedCategories:" << removedCategories;
-    qDebug() << "CreatedAt:" << createdAt;
-    qDebug() << "UpdatedAt:" << updatedAt;
-    qDebug() << "DeletedAt:" << deletedAt;
-    qDebug() << "Notes:" << notes;
-    card.debugPrint();
-}
\ No newline at end of file
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
deleted file mode 100644
index f3961dc6f..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_CARD_ENTRY_H
-#define COCKATRICE_ARCHIDEKT_API_RESPONSE_CARD_ENTRY_H
-
-#include "archidekt_api_response_card.h"
-
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QVector>
-
-struct Category
-{
-    int id;
-    QString name;
-    bool isPremier;
-    bool includedInDeck;
-    bool includedInPrice;
-};
-
-class ArchidektApiResponseCardEntry
-{
-public:
-    // Constructor
-    ArchidektApiResponseCardEntry() = default;
-
-    // Parse deck-related data from JSON
-    void fromJson(const QJsonObject &json);
-
-    // Debug method for logging
-    void debugPrint() const;
-
-    ArchidektApiResponseCard getCard() const
-    {
-        return card;
-    };
-
-    QList<Category> getCategories() const
-    {
-        return categories;
-    }
-
-    int getQuantity() const
-    {
-        return quantity;
-    }
-
-private:
-    int id;
-    QList<Category> categories;
-    bool companion;
-    bool flippedDefault;
-    QString label;
-    QString modifier;
-    int quantity;
-    int customCmc;
-    QStringList removedCategories;
-    QString createdAt;
-    QString updatedAt;
-    QString deletedAt;
-    QString notes;
-    ArchidektApiResponseCard card;
-};
-
-#endif // COCKATRICE_ARCHIDEKT_API_RESPONSE_CARD_ENTRY_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
deleted file mode 100644
index 122617a22..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "archidekt_api_response_edition.h"
-
-void ArchidektApiResponseEdition::fromJson(const QJsonObject &json)
-{
-    editionCode = json.value("editioncode").toString();
-    editionName = json.value("editionname").toString();
-    editionDate = json.value("editiondate").toString();
-    editionType = json.value("editiontype").toString();
-    mtgoCode = json.value("mtgocode").toString();
-}
-
-void ArchidektApiResponseEdition::debugPrint() const
-{
-    qDebug() << "Edition Code: " << editionCode;
-    qDebug() << "Edition Name: " << editionName;
-    qDebug() << "Edition Date: " << editionDate;
-    qDebug() << "Edition Type: " << editionType;
-    qDebug() << "Mtgo Code: " << mtgoCode;
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.h
deleted file mode 100644
index b898cd816..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_EDITION_H
-#define COCKATRICE_ARCHIDEKT_API_RESPONSE_EDITION_H
-
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QVector>
-
-class ArchidektApiResponseEdition
-{
-public:
-    // Constructor
-    ArchidektApiResponseEdition() = default;
-
-    // Parse deck-related data from JSON
-    void fromJson(const QJsonObject &json);
-
-    // Debug method for logging
-    void debugPrint() const;
-
-    [[nodiscard]] QString getEditionCode() const
-    {
-        return editionCode;
-    }
-    [[nodiscard]] QString getEditionName() const
-    {
-        return editionName;
-    }
-    [[nodiscard]] QString getEditionDate() const
-    {
-        return editionDate;
-    }
-    [[nodiscard]] QString getEditionType() const
-    {
-        return editionType;
-    }
-    [[nodiscard]] QString getMtgoCode() const
-    {
-        return mtgoCode;
-    }
-
-private:
-    QString editionCode;
-    QString editionName;
-    QString editionDate;
-    QString editionType;
-    QString mtgoCode;
-};
-
-#endif // COCKATRICE_ARCHIDEKT_API_RESPONSE_EDITION_H
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
deleted file mode 100644
index 98d8c6c8c..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "archidekt_api_response_deck.h"
-
-#include "../card/archidekt_api_response_card_entry.h"
-
-void ArchidektApiResponseDeck::fromJson(const QJsonObject &json)
-{
-    id = json.value("id").toInt();
-    name = json.value("name").toString();
-    size = json.value("size").toInt();
-    updatedAt = json.value("updatedAt").toString();
-    createdAt = json.value("createdAt").toString();
-    deckFormat = json.value("deckFormat").toInt();
-    edhBracket = json.value("edhBracket").toInt();
-    featured = json.value("featured").toString();
-    customFeatured = json.value("customFeatured").toString();
-    viewCount = json.value("viewCount").toInt();
-    privateDeck = json.value("private").toBool();
-    unlisted = json.value("unlisted").toBool();
-    theoryCrafted = json.value("theoryCrafted").toBool();
-    points = json.value("points").toInt();
-    userInput = json.value("userInput").toInt();
-    owner.fromJson(json.value("owner").toObject());
-    commentRoot = json.value("commentRoot").toInt();
-    editors = json.value("editors").toString();
-    parentFolderId = json.value("parentFolderId").toInt();
-    bookmarked = json.value("bookmarked").toBool();
-
-    auto categoriesJson = json.value("categories").toArray();
-    for (auto category : categoriesJson) {
-        ArchidektApiResponseDeckCategory categoryEntry;
-        categoryEntry.fromJson(category.toObject());
-        categories.append(categoryEntry);
-    }
-
-    // deckTags = {""};
-    playgroupDeckUrl = json.value("playgroupDeckUrl").toString();
-    cardPackage = json.value("cardPackage").toString();
-
-    auto cardsObject = json.value("cards").toArray();
-
-    for (auto card : cardsObject) {
-        ArchidektApiResponseCardEntry entry;
-        entry.fromJson(card.toObject());
-        cards.append(entry);
-    }
-
-    // TODO but not really important
-    // customCards = {""};
-}
-
-void ArchidektApiResponseDeck::debugPrint() const
-{
-    qDebug() << "Id:" << id;
-    qDebug() << "Name:" << name;
-    qDebug() << "Size:" << size;
-    qDebug() << "UpdatedAt:" << updatedAt;
-    qDebug() << "CreatedAt:" << createdAt;
-    qDebug() << "DeckFormat:" << deckFormat;
-    qDebug() << "EdhBracket:" << edhBracket;
-    qDebug() << "Featured:" << featured;
-    qDebug() << "CustomFeatured:" << customFeatured;
-    qDebug() << "ViewCount:" << viewCount;
-    qDebug() << "Private:" << privateDeck;
-    qDebug() << "Unlisted:" << unlisted;
-    qDebug() << "TheoryCrafted:" << theoryCrafted;
-    qDebug() << "Points:" << points;
-    qDebug() << "UserInput:" << userInput;
-    owner.debugPrint();
-    qDebug() << "CommentRoot:" << commentRoot;
-    qDebug() << "Editors:" << editors;
-    qDebug() << "ParentFolderId:" << parentFolderId;
-    qDebug() << "Bookmarked:" << bookmarked;
-    qDebug() << "DeckTags:" << deckTags;
-    qDebug() << "PlaygroupDeckUrl:" << playgroupDeckUrl;
-    qDebug() << "CardPackage:" << cardPackage;
-    for (auto card : cards) {
-        card.debugPrint();
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index fce437751..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_H
-#define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_H
-
-#include "../card/archidekt_api_response_card.h"
-#include "../card/archidekt_api_response_card_entry.h"
-#include "../deck_listings/archidekt_api_response_deck_owner.h"
-#include "archidekt_api_response_deck_category.h"
-
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QVector>
-
-class ArchidektApiResponseDeck
-{
-public:
-    // Constructor
-    ArchidektApiResponseDeck() = default;
-
-    // Parse deck-related data from JSON
-    void fromJson(const QJsonObject &json);
-
-    // Debug method for logging
-    void debugPrint() const;
-
-    QVector<ArchidektApiResponseCardEntry> getCards() const
-    {
-        return cards;
-    };
-
-    QVector<ArchidektApiResponseDeckCategory> getCategories() const
-    {
-        return categories;
-    }
-
-    QString getDeckName() const
-    {
-        return name;
-    };
-
-    int getDeckFormat() const
-    {
-        return deckFormat;
-    }
-
-private:
-    int id;
-    QString name;
-    int size;
-    QString updatedAt;
-    QString createdAt;
-    int deckFormat;
-    int edhBracket;
-    QString featured;
-    QString customFeatured;
-    int viewCount;
-    bool privateDeck;
-    bool unlisted;
-    bool theoryCrafted;
-    int points;
-    int userInput;
-    ArchidektApiResponseDeckOwner owner;
-    int commentRoot;
-    QString editors;
-    int parentFolderId;
-    bool bookmarked;
-    QVector<ArchidektApiResponseDeckCategory> categories;
-    QStringList deckTags;
-    QString playgroupDeckUrl;
-    QString cardPackage;
-    QVector<ArchidektApiResponseCardEntry> cards;
-    QStringList customCards;
-};
-
-#endif // COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
deleted file mode 100644
index 990293bc6..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "archidekt_api_response_deck_category.h"
-
-void ArchidektApiResponseDeckCategory::fromJson(const QJsonObject &json)
-{
-    id = json.value("id").toInt();
-    name = json.value("name").toString();
-    isPremier = json.value("isPremier").toBool();
-    includedInDeck = json.value("includedInDeck").toBool();
-    includedInPrice = json.value("includedInPrice").toBool();
-}
-
-void ArchidektApiResponseDeckCategory::debugPrint() const
-{
-    qDebug() << "Id:" << id;
-    qDebug() << "Name:" << name;
-    qDebug() << "isPremier:" << isPremier;
-    qDebug() << "IncludedInDeck:" << includedInDeck;
-    qDebug() << "IncludedInPrice:" << includedInPrice;
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.h
deleted file mode 100644
index 5e218b6a4..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_CATEGORY_H
-#define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_CATEGORY_H
-
-#include "../card/archidekt_api_response_card.h"
-#include "../card/archidekt_api_response_card_entry.h"
-#include "../deck_listings/archidekt_api_response_deck_owner.h"
-
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QVector>
-
-class ArchidektApiResponseDeckCategory
-{
-public:
-    // Constructor
-    ArchidektApiResponseDeckCategory() = default;
-
-    // Parse deck-related data from JSON
-    void fromJson(const QJsonObject &json);
-
-    // Debug method for logging
-    void debugPrint() const;
-
-    [[nodiscard]] int getId() const
-    {
-        return id;
-    }
-    [[nodiscard]] QString getName() const
-    {
-        return name;
-    }
-    [[nodiscard]] bool getIsPremier() const
-    {
-        return isPremier;
-    }
-    [[nodiscard]] bool getIncludedInDeck() const
-    {
-        return includedInDeck;
-    }
-    [[nodiscard]] bool getIncludedInPrice() const
-    {
-        return includedInPrice;
-    }
-
-private:
-    int id;
-    QString name;
-    bool isPremier;
-    bool includedInDeck;
-    bool includedInPrice;
-};
-
-#endif // COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_CATEGORY_H
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
deleted file mode 100644
index 16ea60487..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "archidekt_api_response_deck_listing_container.h"
-
-#include "archidekt_api_response_deck_owner.h"
-
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonObject>
-
-void ArchidektApiResponseDeckListingContainer::fromJson(const QJsonObject &json)
-{
-    id = json.value("id").toInt();
-    name = json.value("name").toString();
-    size = json.value("size").toInt();
-    updatedAt = json.value("updatedAt").toString();
-    createdAt = json.value("createdAt").toString();
-    deckFormat = json.value("deckFormat").toInt();
-    edhBracket = json.value("edhBracket").toInt();
-    featured = json.value("featured").toString();
-    customFeatured = json.value("customFeatured").toString();
-    viewCount = json.value("viewCount").toInt();
-    privateDeck = json.value("private").toBool();
-    unlisted = json.value("unlisted").toBool();
-    theoryCrafted = json.value("theoryCrafted").toBool();
-    game = json.value("game").toString();
-    hasDescription = json.value("hasDescription").toBool();
-    // TODO
-    // tags = {""};
-    parentFolderId = json.value("parentFolderId").toInt();
-    owner.fromJson(json.value("owner").toObject());
-
-    auto colorsJson = json.value("colors").toObject();
-
-    for (auto color : colorsJson.keys()) {
-        colors[color] = colorsJson[color].toInt();
-    }
-
-    cardPackage = json.value("cardPackage").toString();
-    contest = json.value("contest").toString();
-}
-
-void ArchidektApiResponseDeckListingContainer::debugPrint() const
-{
-    qDebug() << "Id:" << id;
-    qDebug() << "Name:" << name;
-    qDebug() << "Size:" << size;
-    qDebug() << "UpdatedAt:" << updatedAt;
-    qDebug() << "CreatedAt:" << createdAt;
-    qDebug() << "DeckFormat:" << deckFormat;
-    qDebug() << "EdhBracket:" << edhBracket;
-    qDebug() << "Featured:" << featured;
-    qDebug() << "CustomFeatured:" << customFeatured;
-    qDebug() << "ViewCount:" << viewCount;
-    qDebug() << "Private:" << privateDeck;
-    qDebug() << "Unlisted:" << unlisted;
-    qDebug() << "TheoryCrafted:" << theoryCrafted;
-    qDebug() << "Game:" << game;
-    qDebug() << "HasDescription:" << hasDescription;
-    qDebug() << "Tags:" << tags;
-    qDebug() << "ParentFolderId:" << parentFolderId;
-    owner.debugPrint();
-    qDebug() << "Colors:" << colors;
-    qDebug() << "CardPackage" << cardPackage;
-    qDebug() << "Contest:" << contest;
-}
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.h
deleted file mode 100644
index 8924bb3f5..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.h
+++ /dev/null
@@ -1,133 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_DECK_LISTING_API_RESPONSE_CONTAINER_H
-#define COCKATRICE_ARCHIDEKT_DECK_LISTING_API_RESPONSE_CONTAINER_H
-
-#include "archidekt_api_response_deck_owner.h"
-
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QVector>
-
-class ArchidektApiResponseDeckListingContainer
-{
-public:
-    // Constructor
-    ArchidektApiResponseDeckListingContainer() = default;
-
-    // Parse deck-related data from JSON
-    void fromJson(const QJsonObject &json);
-
-    // Debug method for logging
-    void debugPrint() const;
-
-    [[nodiscard]] int getId() const
-    {
-        return id;
-    }
-    [[nodiscard]] QString getName() const
-    {
-        return name;
-    }
-    [[nodiscard]] int getSize() const
-    {
-        return size;
-    }
-    [[nodiscard]] QString getUpdatedAt() const
-    {
-        return updatedAt;
-    }
-    [[nodiscard]] QString getCreatedAt() const
-    {
-        return createdAt;
-    }
-    [[nodiscard]] int getDeckFormat() const
-    {
-        return deckFormat;
-    }
-    [[nodiscard]] int getEDHBracket() const
-    {
-        return edhBracket;
-    }
-    [[nodiscard]] QString getFeatured() const
-    {
-        return featured;
-    }
-    [[nodiscard]] QString getCustomFeatured() const
-    {
-        return customFeatured;
-    }
-    [[nodiscard]] int getViewCount() const
-    {
-        return viewCount;
-    }
-    [[nodiscard]] bool getPrivateDeck() const
-    {
-        return privateDeck;
-    }
-    [[nodiscard]] bool getUnlisted() const
-    {
-        return unlisted;
-    }
-    [[nodiscard]] bool getTheoryCrafted() const
-    {
-        return theoryCrafted;
-    }
-    [[nodiscard]] QString getGame() const
-    {
-        return game;
-    }
-    [[nodiscard]] bool getHasDescription() const
-    {
-        return hasDescription;
-    }
-    [[nodiscard]] QStringList getTags() const
-    {
-        return tags;
-    }
-    [[nodiscard]] int getParentFolderId() const
-    {
-        return parentFolderId;
-    }
-    [[nodiscard]] ArchidektApiResponseDeckOwner getOwner() const
-    {
-        return owner;
-    }
-    [[nodiscard]] QMap<QString, int> getColors() const
-    {
-        return colors;
-    }
-    [[nodiscard]] QString getCardPackage() const
-    {
-        return cardPackage;
-    }
-    [[nodiscard]] QString getContest() const
-    {
-        return contest;
-    }
-
-private:
-    int id;
-    QString name;
-    int size;
-    QString updatedAt;
-    QString createdAt;
-    int deckFormat;
-    int edhBracket;
-    QString featured;
-    QString customFeatured;
-    int viewCount;
-    bool privateDeck;
-    bool unlisted;
-    bool theoryCrafted;
-    QString game;
-    bool hasDescription;
-    QStringList tags;
-    int parentFolderId;
-    ArchidektApiResponseDeckOwner owner;
-    QMap<QString, int> colors;
-    QString cardPackage;
-    QString contest;
-};
-
-#endif // COCKATRICE_ARCHIDEKT_DECK_LISTING_API_RESPONSE_CONTAINER_H
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
deleted file mode 100644
index 2ba926f8b..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "archidekt_api_response_deck_owner.h"
-
-void ArchidektApiResponseDeckOwner::fromJson(const QJsonObject &json)
-{
-    id = json.value("id").toInt();
-    userName = json.value("username").toString();
-    avatar = QUrl(json.value("avatar").toString());
-    moderator = json.value("moderator").toBool();
-    pledgeLevel = json.value("pledgeLevel").toInt();
-    // TODO but not really important
-    // roles = {""};
-}
-
-void ArchidektApiResponseDeckOwner::debugPrint() const
-{
-    qDebug() << "Id:" << id;
-    qDebug() << "UserName:" << userName;
-    qDebug() << "Avatar:" << avatar;
-    qDebug() << "Moderator:" << moderator;
-    qDebug() << "PledgeLevel:" << pledgeLevel;
-    qDebug() << "Roles:" << roles;
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h
deleted file mode 100644
index df3f48fd2..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_OWNER_H
-#define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_OWNER_H
-
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QString>
-#include <QVector>
-
-class ArchidektApiResponseDeckOwner
-{
-public:
-    // Constructor
-    ArchidektApiResponseDeckOwner() = default;
-
-    // Parse deck-related data from JSON
-    void fromJson(const QJsonObject &json);
-
-    // Debug method for logging
-    void debugPrint() const;
-
-    [[nodiscard]] QString getName() const
-    {
-        return userName;
-    }
-
-private:
-    int id;
-    QString userName;
-    QUrl avatar;
-    bool moderator;
-    int pledgeLevel;
-    QStringList roles;
-};
-
-#endif // COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_OWNER_H
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
deleted file mode 100644
index 66b68d823..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-#include "archidekt_api_response_deck_display_widget.h"
-
-#include "../../../../../deck_loader/card_node_function.h"
-#include "../../../../../deck_loader/deck_loader.h"
-#include "../../../../cards/card_size_widget.h"
-#include "../../../../cards/deck_card_zone_display_widget.h"
-#include "../../../../visual_deck_editor/visual_deck_display_options_widget.h"
-#include "../api_response/archidekt_formats.h"
-#include "../api_response/deck/archidekt_api_response_deck.h"
-
-#include <QSortFilterProxyModel>
-#include <libcockatrice/card/import/card_name_normalizer.h>
-
-ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWidget *parent,
-                                                                             ArchidektApiResponseDeck _response,
-                                                                             CardSizeWidget *_cardSizeSlider)
-    : QWidget(parent), response(_response), cardSizeSlider(_cardSizeSlider)
-{
-    layout = new QVBoxLayout(this);
-    setLayout(layout);
-
-    navigationContainer = new QWidget(this);
-    navigationContainerLayout = new QHBoxLayout(navigationContainer);
-
-    homeButton = new QPushButton(navigationContainer);
-    navigationContainerLayout->addWidget(homeButton);
-
-    connect(homeButton, &QPushButton::clicked, this, &ArchidektApiResponseDeckDisplayWidget::requestSearch);
-
-    openInEditorButton = new QPushButton(navigationContainer);
-    navigationContainerLayout->addWidget(openInEditorButton);
-
-    connect(openInEditorButton, &QPushButton::clicked, this,
-            &ArchidektApiResponseDeckDisplayWidget::actOpenInDeckEditor);
-
-    layout->addWidget(navigationContainer);
-
-    displayOptionsWidget = new VisualDeckDisplayOptionsWidget(this);
-    layout->addWidget(displayOptionsWidget);
-
-    connect(displayOptionsWidget, &VisualDeckDisplayOptionsWidget::groupCriteriaChanged, this,
-            &ArchidektApiResponseDeckDisplayWidget::onGroupCriteriaChange);
-
-    scrollArea = new QScrollArea(this);
-    scrollArea->setWidgetResizable(true);
-    scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-
-    layout->addWidget(scrollArea);
-
-    container = new QWidget(scrollArea);
-
-    scrollArea->setWidget(container);
-
-    containerLayout = new QVBoxLayout(container);
-    container->setLayout(containerLayout);
-
-    zoneContainer = new QWidget(container);
-    containerLayout->addWidget(zoneContainer);
-    zoneContainerLayout = new QVBoxLayout(zoneContainer);
-    zoneContainer->setLayout(zoneContainerLayout);
-
-    QString tempDeck;
-    QTextStream deckStream(&tempDeck);
-
-    QString mainboardText;
-    QString sideboardText;
-
-    QTextStream mainStream(&mainboardText);
-    QTextStream sideStream(&sideboardText);
-
-    for (const auto &card : response.getCards()) {
-        QString fullName = card.getCard().getOracleCard().value("name").toString();
-        // We don't really care about the second card, the card database already has it as a relation
-        QString cleanName = fullName.split("//").first().trimmed();
-
-        QString line = QString("%1 %2 (%3) %4\n")
-                           .arg(card.getQuantity())
-                           .arg(cleanName)
-                           .arg(card.getCard().getEdition().getEditionCode().toUpper())
-                           .arg(card.getCard().getCollectorNumber());
-
-        bool isCommander = false;
-        bool isSideboardCategory = false;
-        bool includedInDeck = false;
-
-        for (const auto &cat : card.getCategories()) {
-
-            if (cat.name.compare("Commander", Qt::CaseInsensitive) == 0) {
-                isCommander = true;
-            }
-
-            if (cat.name.compare("Sideboard", Qt::CaseInsensitive) == 0 ||
-                cat.name.compare("Maybeboard", Qt::CaseInsensitive) == 0) {
-                isSideboardCategory = true;
-            }
-
-            if (cat.includedInDeck) {
-                includedInDeck = true;
-            }
-        }
-
-        QString target;
-
-        if (isCommander || isSideboardCategory) {
-            sideStream << line;
-        } else if (includedInDeck) {
-            mainStream << line;
-        } else {
-            sideStream << line;
-        }
-    }
-
-    // Combine with blank line separator
-    tempDeck = mainboardText;
-
-    if (!sideboardText.isEmpty()) {
-        tempDeck += "\n";
-        tempDeck += sideboardText;
-    }
-
-    model = new DeckListModel(this);
-    connect(model, &DeckListModel::modelReset, this, &ArchidektApiResponseDeckDisplayWidget::decklistModelReset);
-
-    auto decklist = QSharedPointer<DeckList>(new DeckList);
-    decklist->loadFromStream_Plain(deckStream, false, CardNameNormalizer());
-    model->setDeckList(decklist);
-
-    model->forEachCard(CardNodeFunction::ResolveProviderId());
-
-    retranslateUi();
-}
-
-void ArchidektApiResponseDeckDisplayWidget::retranslateUi()
-{
-    homeButton->setText(tr("Back to results"));
-    openInEditorButton->setText(tr("Open Deck in Deck Editor"));
-}
-
-void ArchidektApiResponseDeckDisplayWidget::onGroupCriteriaChange(const QString &activeGroupCriteria)
-{
-    model->setActiveGroupCriteria(DeckListModelGroupCriteria::fromString(activeGroupCriteria));
-    model->sort(DeckListModelColumns::CARD_NAME, Qt::AscendingOrder);
-}
-
-void ArchidektApiResponseDeckDisplayWidget::actOpenInDeckEditor()
-{
-    DeckList deckList(*model->getDeckList());
-    deckList.setName(response.getDeckName());
-    deckList.setGameFormat(
-        ArchidektFormats::formatToCockatriceName(ArchidektFormats::DeckFormat(response.getDeckFormat() - 1)));
-
-    LoadedDeck loadedDeck = {deckList, {}};
-
-    emit openInDeckEditor(loadedDeck);
-}
-
-void ArchidektApiResponseDeckDisplayWidget::clearAllDisplayWidgets()
-{
-    for (auto idx : indexToWidgetMap.keys()) {
-        auto displayWidget = indexToWidgetMap.value(idx);
-        zoneContainerLayout->removeWidget(displayWidget);
-        indexToWidgetMap.remove(idx);
-        delete displayWidget;
-    }
-}
-
-void ArchidektApiResponseDeckDisplayWidget::decklistModelReset()
-{
-    clearAllDisplayWidgets();
-    constructZoneWidgetsFromDeckListModel();
-}
-
-void ArchidektApiResponseDeckDisplayWidget::constructZoneWidgetsFromDeckListModel()
-{
-    qDebug() << model->rowCount(model->getRoot());
-    QSortFilterProxyModel proxy;
-    proxy.setSourceModel(model);
-    proxy.setSortRole(Qt::EditRole);
-    proxy.sort(DeckListModelColumns::CARD_NAME, Qt::AscendingOrder);
-
-    for (int i = 0; i < proxy.rowCount(); ++i) {
-        QModelIndex proxyIndex = proxy.index(i, 0);
-        QModelIndex sourceIndex = proxy.mapToSource(proxyIndex);
-
-        // Make a persistent index from the *source* model
-        QPersistentModelIndex persistent(sourceIndex);
-
-        if (indexToWidgetMap.contains(persistent)) {
-            continue;
-        }
-
-        QString zoneName =
-            persistent.sibling(persistent.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
-
-        DeckCardZoneDisplayWidget *zoneDisplayWidget =
-            new DeckCardZoneDisplayWidget(zoneContainer, model, nullptr, persistent, zoneName, "maintype", {"name"},
-                                          DisplayType::Overlap, 20, 10, cardSizeSlider);
-
-        connect(displayOptionsWidget, &VisualDeckDisplayOptionsWidget::sortCriteriaChanged, zoneDisplayWidget,
-                &DeckCardZoneDisplayWidget::onActiveSortCriteriaChanged);
-        connect(displayOptionsWidget, &VisualDeckDisplayOptionsWidget::groupCriteriaChanged, zoneDisplayWidget,
-                &DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged);
-        connect(displayOptionsWidget, &VisualDeckDisplayOptionsWidget::displayTypeChanged, zoneDisplayWidget,
-                &DeckCardZoneDisplayWidget::refreshDisplayType);
-        zoneContainerLayout->addWidget(zoneDisplayWidget);
-
-        indexToWidgetMap.insert(persistent, zoneDisplayWidget);
-    }
-}
-
-void ArchidektApiResponseDeckDisplayWidget::resizeEvent(QResizeEvent *event)
-{
-    QWidget::resizeEvent(event);
-    layout->invalidate();
-    layout->activate();
-    layout->update();
-}
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.h
deleted file mode 100644
index aaf272718..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_DISPLAY_WIDGET_H
-#define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_DISPLAY_WIDGET_H
-
-#include "../../../../../deck_loader/deck_loader.h"
-#include "../../../../cards/card_size_widget.h"
-#include "../../../../general/layout_containers/flow_widget.h"
-#include "../../../../visual_deck_editor/visual_deck_display_options_widget.h"
-#include "../api_response/deck/archidekt_api_response_deck.h"
-#include "deck_list_model.h"
-
-#include <QPushButton>
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QWidget>
-
-/**
- * @class ArchidektApiResponseDeckDisplayWidget
- * @brief Displays a full deck fetched from an Archidekt API response.
- *
- * This widget visualizes all cards in a deck retrieved from the Archidekt API.
- * It supports:
- *  - Interactive display options via a VisualDeckDisplayOptionsWidget.
- *  - Scrollable display of deck zones/cards with DeckCardZoneDisplayWidget.
- *  - Integration with a CardSizeWidget slider for card scaling.
- *  - Opening the deck in a deck editor.
- *
- * The widget internally constructs a DeckListModel from the Archidekt API response,
- * then builds zone widgets for each group of cards according to the active group
- * criteria. It also responds dynamically to model resets or sorting/grouping changes.
- *
- * ### Signals
- * - `requestNavigation(QString url)` — triggered when navigation to a deck URL is requested.
- * - `openInDeckEditor(const LoadedDeck &deck)` — emitted when the user chooses to open the deck
- *   in the deck editor.
- *
- * ### Features
- * - Automatically generates DeckCardZoneDisplayWidget instances for each card group.
- * - Provides a scrollable layout for decks of arbitrary size.
- * - Updates layouts dynamically when resized or when display/group/sort criteria change.
- */
-class ArchidektApiResponseDeckDisplayWidget : public QWidget
-{
-    Q_OBJECT
-
-signals:
-    /**
-     * @brief Emitted when navigation to a deck URL is requested.
-     * @param url URL of the deck on Archidekt.
-     */
-    void requestNavigation(QString url);
-    void requestSearch();
-
-    /**
-     * @brief Emitted when the deck should be opened in the deck editor.
-     * @param deck LoadedDeck containing the deck data.
-     */
-    void openInDeckEditor(const LoadedDeck &deck);
-
-public:
-    /**
-     * @brief Constructs a display widget for an Archidekt deck.
-     * @param parent Parent widget.
-     * @param response API deck data container.
-     * @param cardSizeSlider Slider controlling card scaling.
-     */
-    explicit ArchidektApiResponseDeckDisplayWidget(QWidget *parent,
-                                                   ArchidektApiResponseDeck response,
-                                                   CardSizeWidget *cardSizeSlider);
-
-    /**
-     * @brief Updates all UI text for retranslation/localization.
-     *
-     * Called when the application language changes.
-     */
-    void retranslateUi();
-
-    /**
-     * @brief Opens the deck in the deck editor.
-     */
-    void actOpenInDeckEditor();
-
-    /**
-     * @brief Clears all dynamically generated card zone display widgets.
-     */
-    void clearAllDisplayWidgets();
-
-    /**
-     * @brief Handles model reset by clearing and reconstructing display widgets.
-     */
-    void decklistModelReset();
-
-    /**
-     * @brief Builds DeckCardZoneDisplayWidget instances from the current DeckListModel.
-     */
-    void constructZoneWidgetsFromDeckListModel();
-
-private slots:
-    /**
-     * @brief Slot triggered when the active group criteria change.
-     * @param activeGroupCriteria Name of the new grouping criteria.
-     */
-    void onGroupCriteriaChange(const QString &activeGroupCriteria);
-
-private:
-    ArchidektApiResponseDeck response; ///< API deck data container
-    CardSizeWidget *cardSizeSlider;    ///< Slider for adjusting card sizes
-    QVBoxLayout *layout;               ///< Main vertical layout
-    QWidget *navigationContainer;
-    QHBoxLayout *navigationContainerLayout;
-    QPushButton *homeButton;
-    QPushButton *openInEditorButton;                          ///< Button to open deck in editor
-    VisualDeckDisplayOptionsWidget *displayOptionsWidget;     ///< Controls grouping/sorting/display
-    QScrollArea *scrollArea;                                  ///< Scrollable area for deck zones
-    QWidget *zoneContainer;                                   ///< Container for deck zones
-    QVBoxLayout *zoneContainerLayout;                         ///< Layout for deck zones
-    QWidget *container;                                       ///< Outer container for scroll area
-    QHash<QPersistentModelIndex, QWidget *> indexToWidgetMap; ///< Maps model indices to widgets
-    QVBoxLayout *containerLayout;                             ///< Layout for container
-    DeckListModel *model;                                     ///< Deck list model
-protected slots:
-    /**
-     * @brief Updates layout and display on resize.
-     * @param event Resize event.
-     */
-    void resizeEvent(QResizeEvent *event) override;
-};
-
-#endif // COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_DISPLAY_WIDGET_H
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
deleted file mode 100644
index c26220869..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-#include "archidekt_api_response_deck_entry_display_widget.h"
-
-#include "../../../../../card_picture_loader/card_picture_loader.h"
-#include "../../../../cards/card_info_picture_with_text_overlay_widget.h"
-#include "../../../../general/display/background_plate_widget.h"
-#include "../../../../general/display/charts/bars/color_bar.h"
-#include "archidekt_deck_preview_image_display_widget.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QPixmap>
-#include <QWidget>
-#include <version_string.h>
-
-#define ARCHIDEKT_DEFAULT_IMAGE "https://storage.googleapis.com/topdekt-user/images/archidekt_deck_card_shadow.jpg"
-
-static QString timeAgo(const QString &timestamp)
-{
-    QDateTime dt = QDateTime::fromString(timestamp, Qt::ISODate);
-
-    if (!dt.isValid())
-        return timestamp; // fallback if parsing fails
-
-    qint64 secs = dt.secsTo(QDateTime::currentDateTimeUtc());
-
-    if (secs < 60)
-        return QString("%1 seconds ago").arg(secs);
-    if (secs < 3600)
-        return QString("%1 minutes ago").arg(secs / 60);
-    if (secs < 86400)
-        return QString("%1 hours ago").arg(secs / 3600);
-    if (secs < 30 * 86400)
-        return QString("%1 days ago").arg(secs / 86400);
-    if (secs < 365 * 86400)
-        return QString("%1 months ago").arg(secs / (30 * 86400));
-
-    return QString("%1 years ago").arg(secs / (365 * 86400));
-}
-
-ArchidektApiResponseDeckEntryDisplayWidget::ArchidektApiResponseDeckEntryDisplayWidget(
-    QWidget *parent,
-    ArchidektApiResponseDeckListingContainer _response,
-    QNetworkAccessManager *_imageNetworkManager)
-    : QWidget(parent), response(_response), imageNetworkManager(_imageNetworkManager)
-{
-    layout = new QVBoxLayout(this);
-    setLayout(layout);
-
-    this->setMaximumWidth(400);
-    this->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
-
-    auto headerLayout = new QVBoxLayout();
-
-    previewWidget = new ArchidektDeckPreviewImageDisplayWidget(this);
-
-    previewWidget->setMaximumWidth(400);
-    previewWidget->setMinimumHeight(300); // consistent height
-
-    // Set deck name (ellided)
-    QFontMetrics fm(previewWidget->topLeftLabel->font());
-    QString elided = fm.elidedText(response.getName(), Qt::ElideRight, 280);
-    previewWidget->topLeftLabel->setLabelText(elided);
-    previewWidget->topLeftLabel->setToolTip(response.getName());
-
-    // Set count
-    previewWidget->topRightLabel->setLabelText(QString::number(response.getSize()));
-
-    // EDH bracket (skip if 0)
-    if (response.getEDHBracket() != 0) {
-        previewWidget->bottomLeftLabel->setLabelText(QString("EDH: %1").arg(response.getEDHBracket()));
-    } else {
-        previewWidget->bottomLeftLabel->hide();
-    }
-
-    // Views
-    previewWidget->bottomRightLabel->setLabelText(QString("Views: %1").arg(response.getViewCount()));
-
-    // Use preview->imageLabel for image loading
-    picture = previewWidget->imageLabel;
-
-    imageUrl = response.getFeatured().isEmpty() ? QUrl(ARCHIDEKT_DEFAULT_IMAGE) : QUrl(response.getFeatured());
-
-    QNetworkRequest req(imageUrl);
-    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    QNetworkReply *reply = imageNetworkManager->get(req);
-
-    // tag the reply with "this" so we know it belongs to us later
-    reply->setProperty("deckWidget", QVariant::fromValue<void *>(this));
-    reply->setProperty("requestedUrl", imageUrl);
-
-    connect(imageNetworkManager, &QNetworkAccessManager::finished, this,
-            &ArchidektApiResponseDeckEntryDisplayWidget::onPreviewImageLoadFinished);
-
-    headerLayout->addWidget(previewWidget);
-
-    auto colors = response.getColors();
-
-    ColorBar *colorBar = new ColorBar(colors, this);
-    colorBar->setMinPercentThreshold(3);
-    colorBar->setFixedHeight(22);
-
-    headerLayout->addWidget(colorBar);
-
-    // Create a shared plate for the labels
-    backgroundPlateWidget = new BackgroundPlateWidget(this);
-    backgroundPlateWidget->setFixedHeight(120); // Adjust height to fit all labels
-
-    QVBoxLayout *plateLayout = new QVBoxLayout(backgroundPlateWidget);
-
-    // Add labels to the plate layout
-    QLabel *ownerLabel = new QLabel(QString("Owner: %1").arg(response.getOwner().getName()));
-    plateLayout->addWidget(ownerLabel);
-
-    QLabel *createdAtLabel = new QLabel(QString("Created: %1").arg(timeAgo(response.getCreatedAt())));
-    plateLayout->addWidget(createdAtLabel);
-
-    QLabel *updatedAtLabel = new QLabel(QString("Updated: %1").arg(timeAgo(response.getUpdatedAt())));
-    plateLayout->addWidget(updatedAtLabel);
-
-    // Add the shared plate to the header layout
-    headerLayout->addWidget(backgroundPlateWidget);
-
-    layout->addLayout(headerLayout);
-}
-
-void ArchidektApiResponseDeckEntryDisplayWidget::mousePressEvent(QMouseEvent *event)
-{
-    QWidget::mousePressEvent(event);
-    actRequestNavigationToDeck();
-}
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-void ArchidektApiResponseDeckEntryDisplayWidget::enterEvent(QEnterEvent *event)
-#else
-void ArchidektApiResponseDeckEntryDisplayWidget::enterEvent(QEvent *event)
-#endif
-{
-    QWidget::enterEvent(event);
-    backgroundPlateWidget->setFocused(true);
-}
-
-void ArchidektApiResponseDeckEntryDisplayWidget::leaveEvent(QEvent *event)
-{
-    QWidget::leaveEvent(event);
-    backgroundPlateWidget->setFocused(false);
-}
-
-void ArchidektApiResponseDeckEntryDisplayWidget::setScaleFactor(int scale)
-{
-    scaleFactor = scale;
-    updateScaledPreview();
-}
-
-void ArchidektApiResponseDeckEntryDisplayWidget::onPreviewImageLoadFinished(QNetworkReply *reply)
-{
-    // Check if this is our reply
-    void *owner = reply->property("deckWidget").value<void *>();
-    if (owner != this) {
-        return; // not our reply
-    }
-
-    // Check that the requested URL matches what we asked
-    QUrl requestedUrl = reply->property("requestedUrl").toUrl();
-    if (requestedUrl != imageUrl) {
-        reply->deleteLater();
-        return;
-    }
-
-    QPixmap loaded;
-
-    if (reply->error() != QNetworkReply::NoError || !loaded.loadFromData(reply->readAll())) {
-        CardPictureLoader::getCardBackLoadingFailedPixmap(loaded, QSize(400, 400));
-    }
-
-    originalPixmap = loaded;
-
-    // Always scale preview widget to this ratio
-    previewWidget->setAspectRatio(DESIGN_RATIO);
-    previewWidget->setPreviewWidth(400);
-
-    // Initial scaling
-    updateScaledPreview();
-
-    reply->deleteLater();
-}
-
-void ArchidektApiResponseDeckEntryDisplayWidget::updateScaledPreview()
-{
-    if (originalPixmap.isNull()) {
-        return;
-    }
-
-    int baseWidth = 400;
-    int newWidth = baseWidth * scaleFactor / 100;
-    int newHeight = static_cast<int>(newWidth * DESIGN_RATIO);
-
-    previewWidget->setFixedSize(newWidth, newHeight);
-
-    // Scale image to fill the preview area (crop edges)
-    QPixmap scaled =
-        originalPixmap.scaled(newWidth, newHeight, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-
-    // Crop to exact target size
-    QRect cropRect((scaled.width() - newWidth) / 2, (scaled.height() - newHeight) / 2, newWidth, newHeight);
-    QPixmap cropped = scaled.copy(cropRect);
-
-    picture->setPixmap(cropped);
-    picture->setFixedSize(newWidth, newHeight);
-
-    // Update the elided deck name based on new width
-    int textMaxWidth = int(newWidth * 0.7); // allow 70% of width for text
-    QFontMetrics fm(previewWidget->topLeftLabel->font());
-    QString elided = fm.elidedText(response.getName(), Qt::ElideRight, textMaxWidth);
-    previewWidget->topLeftLabel->setLabelText(elided);
-    previewWidget->topLeftLabel->setToolTip(response.getName());
-
-    setFixedWidth(newWidth);
-
-    layout->invalidate();
-    layout->activate();
-    updateGeometry();
-}
-
-void ArchidektApiResponseDeckEntryDisplayWidget::resizeEvent(QResizeEvent *event)
-{
-    QWidget::resizeEvent(event);
-    layout->invalidate();
-    layout->activate();
-    layout->update();
-}
-
-void ArchidektApiResponseDeckEntryDisplayWidget::actRequestNavigationToDeck()
-{
-    emit requestNavigation(QString("https://archidekt.com/api/decks/%1/").arg(response.getId()));
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h
deleted file mode 100644
index 365a99c9c..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h
+++ /dev/null
@@ -1,121 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_ENTRY_DISPLAY_WIDGET_H
-#define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_ENTRY_DISPLAY_WIDGET_H
-
-#include "../../../../cards/card_info_picture_with_text_overlay_widget.h"
-#include "../api_response/deck_listings/archidekt_api_response_deck_listing_container.h"
-#include "archidekt_deck_preview_image_display_widget.h"
-
-#include <QLabel>
-#include <QNetworkAccessManager>
-#include <QResizeEvent>
-#include <QVBoxLayout>
-#include <QWidget>
-
-class BackgroundPlateWidget;
-
-/**
- * @class ArchidektApiResponseDeckEntryDisplayWidget
- * @brief Displays a single Archidekt deck listing as a preview card with metadata.
- *
- * This widget renders a deck entry received from an Archidekt API response. It includes:
- *  - A scaled deck preview image loaded asynchronously via QNetworkAccessManager.
- *  - Elided deck name in the top-left corner.
- *  - Deck size, EDH bracket, and view count labels.
- *  - A color distribution bar summarizing deck colors.
- *  - Metadata labels including owner, creation date, and last update date.
- *
- * The widget dynamically scales the preview image and labels according to a linked
- * CardSizeWidget slider. Hovering over the widget highlights the background plate,
- * and clicking emits a `requestNavigation` signal pointing to the deck URL.
- *
- * ### Features
- * - Asynchronous image loading with fallback to a default placeholder image.
- * - Maintains a fixed aspect ratio for the preview image (150:267).
- * - Updates text elision dynamically when resized or scaled.
- * - Integrates with FlowWidget containers for scrollable deck galleries.
- *
- * ### Signals
- * - `requestNavigation(QString url)` — emitted when the widget is clicked to request
- *   navigation to the deck's Archidekt page.
- *
- * ### Slots
- * - `actRequestNavigationToDeck()` — triggers navigation.
- * - `setScaleFactor(int scale)` — adjusts preview image scaling.
- */
-class ArchidektApiResponseDeckEntryDisplayWidget : public QWidget
-{
-    Q_OBJECT
-
-signals:
-    /**
-     * @brief Emitted when the user requests navigation.
-     * @param url Full URL to the Archidekt page.
-     */
-    void requestNavigation(QString url);
-
-public:
-    /**
-     * @brief Constructs a deck entry display widget.
-     * @param parent Parent widget.
-     * @param response API container holding deck listing data.
-     * @param imageNetworkManager Shared network manager for fetching preview images.
-     */
-    explicit ArchidektApiResponseDeckEntryDisplayWidget(QWidget *parent,
-                                                        ArchidektApiResponseDeckListingContainer response,
-                                                        QNetworkAccessManager *imageNetworkManager);
-
-    /**
-     * @brief Handles finished network replies for preview images.
-     * @param reply QNetworkReply containing image data.
-     *
-     * Validates that the reply corresponds to this widget and updates the preview image.
-     */
-    void onPreviewImageLoadFinished(QNetworkReply *reply);
-
-    /**
-     * @brief Updates the scaled preview image and adjusts layout accordingly.
-     */
-    void updateScaledPreview();
-
-    /**
-     * @brief Ensures layout responds correctly on resize events.
-     * @param event Resize event.
-     */
-    void resizeEvent(QResizeEvent *event) override;
-
-public slots:
-    /**
-     * @brief Emits `requestNavigation` for the deck's URL.
-     */
-    void actRequestNavigationToDeck();
-
-    /**
-     * @brief Sets a scaling factor (percentage) for the preview image.
-     * @param scale Scale percentage (100 = normal size).
-     */
-    void setScaleFactor(int scale);
-
-protected:
-    void mousePressEvent(QMouseEvent *event) override;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    void enterEvent(QEnterEvent *event) override; ///< Qt6 hover enter
-#else
-    void enterEvent(QEvent *event) override; ///< Qt5 hover enter
-#endif
-    void leaveEvent(QEvent *event) override;
-
-private:
-    QVBoxLayout *layout;                                   ///< Main vertical layout
-    ArchidektApiResponseDeckListingContainer response;     ///< Deck data
-    QUrl imageUrl;                                         ///< URL of the deck's preview image
-    QNetworkAccessManager *imageNetworkManager;            ///< Shared network manager
-    ArchidektDeckPreviewImageDisplayWidget *previewWidget; ///< Widget showing the deck preview
-    QLabel *picture;                                       ///< QLabel displaying the scaled pixmap
-    QPixmap originalPixmap;                                ///< Original image for scaling (avoids degradation)
-    int scaleFactor = 100;                                 ///< Current scaling percentage
-    BackgroundPlateWidget *backgroundPlateWidget;          ///< Plate for metadata labels
-    static constexpr float DESIGN_RATIO = 150.0f / 267.0f; ///< Design aspect ratio
-};
-
-#endif // COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_ENTRY_DISPLAY_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
deleted file mode 100644
index 4d3dfd660..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "archidekt_api_response_deck_listings_display_widget.h"
-
-#include "../../../../cards/card_info_picture_with_text_overlay_widget.h"
-#include "archidekt_api_response_deck_entry_display_widget.h"
-
-ArchidektApiResponseDeckListingsDisplayWidget::ArchidektApiResponseDeckListingsDisplayWidget(
-    QWidget *parent,
-    ArchidektDeckListingApiResponse response,
-    CardSizeWidget *_cardSizeSlider)
-    : QWidget(parent), cardSizeSlider(_cardSizeSlider)
-{
-    layout = new QHBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    setLayout(layout);
-
-    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
-
-    imageNetworkManager = new QNetworkAccessManager(this);
-    imageNetworkManager->setTransferTimeout(); // Use Qt's default timeout
-    imageNetworkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
-
-    // Add widgets for deck listings
-    auto deckListings = response.results;
-    for (const auto &deckListing : deckListings) {
-        auto cardListDisplayWidget =
-            new ArchidektApiResponseDeckEntryDisplayWidget(this, deckListing, imageNetworkManager);
-        cardListDisplayWidget->setScaleFactor(cardSizeSlider->getSlider()->value());
-        connect(cardListDisplayWidget, &ArchidektApiResponseDeckEntryDisplayWidget::requestNavigation, this,
-                &ArchidektApiResponseDeckListingsDisplayWidget::requestNavigation);
-        connect(cardSizeSlider->getSlider(), &QSlider::valueChanged, cardListDisplayWidget,
-                &ArchidektApiResponseDeckEntryDisplayWidget::setScaleFactor);
-        flowWidget->addWidget(cardListDisplayWidget);
-    }
-
-    layout->addWidget(flowWidget);
-}
-
-void ArchidektApiResponseDeckListingsDisplayWidget::append(const ArchidektDeckListingApiResponse &data)
-{
-    for (const auto &deckListing : data.results) {
-        auto cardListDisplayWidget =
-            new ArchidektApiResponseDeckEntryDisplayWidget(this, deckListing, imageNetworkManager);
-        cardListDisplayWidget->setScaleFactor(cardSizeSlider->getSlider()->value());
-        connect(cardListDisplayWidget, &ArchidektApiResponseDeckEntryDisplayWidget::requestNavigation, this,
-                &ArchidektApiResponseDeckListingsDisplayWidget::requestNavigation);
-        connect(cardSizeSlider->getSlider(), &QSlider::valueChanged, cardListDisplayWidget,
-                &ArchidektApiResponseDeckEntryDisplayWidget::setScaleFactor);
-        flowWidget->addWidget(cardListDisplayWidget);
-    }
-}
-
-void ArchidektApiResponseDeckListingsDisplayWidget::resizeEvent(QResizeEvent *event)
-{
-    QWidget::resizeEvent(event);
-    layout->invalidate();
-    layout->activate();
-    layout->update();
-}
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
deleted file mode 100644
index 479de5fc8..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_LISTINGS_DISPLAY_WIDGET_H
-#define COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_LISTINGS_DISPLAY_WIDGET_H
-
-#include "../../../../cards/card_size_widget.h"
-#include "../../../../general/layout_containers/flow_widget.h"
-#include "../api_response/archidekt_deck_listing_api_response.h"
-
-#include <QNetworkAccessManager>
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QWidget>
-
-/**
- * @class ArchidektApiResponseDeckListingsDisplayWidget
- * @brief Displays a scrollable horizontal list of Archidekt deck listings with dynamic card sizing.
- *
- * This widget serves as a container for multiple
- * ArchidektApiResponseDeckEntryDisplayWidget instances, each representing one deck listing
- * returned from an Archidekt API call.
- *
- * ### Responsibilities
- * - Creates a **FlowWidget** that arranges deck entries horizontally with wrapping.
- * - Creates a shared **QNetworkAccessManager** for entry widgets to fetch card thumbnails.
- * - Connects a **CardSizeWidget** slider to all deck entries to dynamically rescale their preview cards.
- * - Propagates deck-navigation requests (`requestNavigation`) from children to the parent.
- *
- * ### Layout
- * The widget uses a single `QHBoxLayout` containing the `FlowWidget`.
- * The FlowWidget automatically manages child flow and scrollbar behavior (horizontal = off,
- * vertical = auto), providing an efficient scrollable gallery of deck entries.
- *
- * ### API Integration
- * The constructor consumes an `ArchidektDeckListingApiResponse`, iterates through its
- * `results`, and instantiates a child entry widget for each deck.
- *
- * ### Signals
- * - `requestNavigation(QString url)` — emitted whenever a child entry widget requests
- *   navigation to a deck or related Archidekt page.
- *
- * ### Performance Notes
- * - All entry widgets share a single QNetworkAccessManager instance to reuse connections
- *   and avoid redundant session creation.
- * - `resizeEvent()` forces layout invalidation to ensure the flow layout responds properly
- *   to container resizing.
- */
-class ArchidektApiResponseDeckListingsDisplayWidget : public QWidget
-{
-    Q_OBJECT
-
-signals:
-    /**
-     * @brief Emitted when a child deck entry requests that the UI navigate to a particular URL.
-     * @param url The destination URL (typically an Archidekt deck page).
-     */
-    void requestNavigation(QString url);
-
-public:
-    /**
-     * @brief Constructs a widget that displays multiple deck listing previews.
-     *
-     * @param parent Parent widget.
-     * @param response The Archidekt API response containing deck listings.
-     * @param cardSizeSlider A slider widget used to dynamically resize card previews.
-     *
-     * Each deck in `response.results` becomes its own
-     * ArchidektApiResponseDeckEntryDisplayWidget, added to the FlowWidget.
-     */
-    explicit ArchidektApiResponseDeckListingsDisplayWidget(QWidget *parent,
-                                                           ArchidektDeckListingApiResponse response,
-                                                           CardSizeWidget *cardSizeSlider);
-    void append(const ArchidektDeckListingApiResponse &data);
-
-    /**
-     * @brief Ensures FlowWidget layout properly recomputes on resize.
-     *
-     * Forces the layout to invalidate and activate itself so that the
-     * FlowWidget recalculates wrapping and child placement.
-     *
-     * @param event Resize event.
-     */
-    void resizeEvent(QResizeEvent *event) override;
-
-private:
-    /// Slider controlling the scale of card thumbnails in all deck entry widgets.
-    CardSizeWidget *cardSizeSlider;
-
-    /// Main horizontal layout containing the FlowWidget.
-    QHBoxLayout *layout;
-
-    /// Container providing scrollable multi-row flow layout of deck entries.
-    FlowWidget *flowWidget;
-
-    /// Shared network manager used to download card images for all child entry widgets.
-    QNetworkAccessManager *imageNetworkManager;
-};
-
-#endif // COCKATRICE_ARCHIDEKT_API_RESPONSE_DECK_LISTINGS_DISPLAY_WIDGET_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
deleted file mode 100644
index ced08491e..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#include "archidekt_deck_preview_image_display_widget.h"
-
-#include <QFontMetrics>
-#include <QPainter>
-
-ArchidektDeckPreviewImageDisplayWidget::ArchidektDeckPreviewImageDisplayWidget(QWidget *parent) : QWidget(parent)
-{
-    imageLabel = new QLabel(this);
-    imageLabel->setAlignment(Qt::AlignCenter);
-
-    topLeftLabel = new ShadowBackgroundLabel(this, "");
-    topRightLabel = new ShadowBackgroundLabel(this, "");
-    bottomLeftLabel = new ShadowBackgroundLabel(this, "");
-    bottomRightLabel = new ShadowBackgroundLabel(this, "");
-
-    QFont f;
-    f.setBold(true);
-    f.setPointSize(16);
-    topLeftLabel->setFont(f);
-    topRightLabel->setFont(f);
-    bottomLeftLabel->setFont(f);
-    bottomRightLabel->setFont(f);
-
-    // Raise so labels appear above image
-    topLeftLabel->raise();
-    topRightLabel->raise();
-    bottomLeftLabel->raise();
-    bottomRightLabel->raise();
-}
-
-void ArchidektDeckPreviewImageDisplayWidget::setAspectRatio(float ratio)
-{
-    aspectRatio = ratio;
-}
-
-void ArchidektDeckPreviewImageDisplayWidget::setPreviewWidth(int width)
-{
-    int height = int(width * aspectRatio);
-
-    setFixedSize(width, height);
-    updateGeometry();
-    update();
-}
-
-void ArchidektDeckPreviewImageDisplayWidget::resizeEvent(QResizeEvent *event)
-{
-    QWidget::resizeEvent(event);
-
-    // Full size for the image
-    imageLabel->setGeometry(rect());
-
-    topLeftLabel->adjustSize();
-    topRightLabel->adjustSize();
-    bottomLeftLabel->adjustSize();
-    bottomRightLabel->adjustSize();
-
-    // Padding settings
-    const int horizontalPadding = 8;
-    const int topPadding = 6;
-    const int bottomPadding = 6;
-
-    // Left-aligned, top-aligned (Deck Name)
-    topLeftLabel->move(horizontalPadding, topPadding);
-
-    // Right-aligned, top-aligned (Card Count)
-    topRightLabel->move(width() - topRightLabel->width() - horizontalPadding, topPadding);
-
-    // Bottom-left, bottom-aligned (EDH bracket)
-    bottomLeftLabel->move(horizontalPadding, height() - bottomLeftLabel->height() - bottomPadding);
-
-    // Bottom-right, bottom-aligned (views)
-    bottomRightLabel->move(width() - bottomRightLabel->width() - horizontalPadding,
-                           height() - bottomRightLabel->height() - bottomPadding);
-
-    // Ensure labels stay above image
-    topLeftLabel->raise();
-    topRightLabel->raise();
-    bottomLeftLabel->raise();
-    bottomRightLabel->raise();
-}
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h
deleted file mode 100644
index 053823c45..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef COCKATRICE_ARCHIDEKT_DECK_PREVIEW_IMAGE_DISPLAY_WIDGET_H
-#define COCKATRICE_ARCHIDEKT_DECK_PREVIEW_IMAGE_DISPLAY_WIDGET_H
-
-#include "../../../../general/display/shadow_background_label.h"
-
-#include <QLabel>
-#include <QWidget>
-
-/**
- * @class ArchidektDeckPreviewImageDisplayWidget
- * @brief Widget for displaying a deck preview image with overlaid metadata labels.
- *
- * This widget shows a deck's preview image along with several overlay labels:
- *  - Top-left: Deck name.
- *  - Top-right: Card count.
- *  - Bottom-left: EDH bracket (if applicable).
- *  - Bottom-right: View count.
- *
- * Labels automatically scale and position themselves relative to the widget's size.
- * The image can be scaled while maintaining a specified aspect ratio.
- *
- * ### Features
- * - Adjustable preview width and aspect ratio.
- * - Labels automatically repositioned on resize.
- * - Supports overlaying multiple pieces of metadata with shadowed labels for readability.
- */
-class ArchidektDeckPreviewImageDisplayWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    /**
-     * @brief Constructs the deck preview display widget.
-     * @param parent Optional parent widget.
-     */
-    explicit ArchidektDeckPreviewImageDisplayWidget(QWidget *parent = nullptr);
-
-    /**
-     * @brief Sets the aspect ratio for the preview image (height / width).
-     * @param ratio Aspect ratio to maintain.
-     */
-    void setAspectRatio(float ratio);
-
-    /**
-     * @brief Sets the width of the preview image; height is adjusted according to the aspect ratio.
-     * @param width Desired width in pixels.
-     */
-    void setPreviewWidth(int width);
-
-    QLabel *imageLabel;                      ///< QLabel to display the deck image
-    ShadowBackgroundLabel *topLeftLabel;     ///< Overlay label at top-left (deck name)
-    ShadowBackgroundLabel *topRightLabel;    ///< Overlay label at top-right (card count)
-    ShadowBackgroundLabel *bottomLeftLabel;  ///< Overlay label at bottom-left (EDH bracket)
-    ShadowBackgroundLabel *bottomRightLabel; ///< Overlay label at bottom-right (views)
-
-protected:
-    /**
-     * @brief Handles resize events to reposition the image and overlay labels.
-     * @param event Resize event.
-     */
-    void resizeEvent(QResizeEvent *event) override;
-
-private:
-    float aspectRatio = 1.0f; ///< Aspect ratio to maintain for the preview image
-};
-
-#endif // COCKATRICE_ARCHIDEKT_DECK_PREVIEW_IMAGE_DISPLAY_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
deleted file mode 100644
index 352d55c79..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
+++ /dev/null
@@ -1,669 +0,0 @@
-#include "tab_archidekt.h"
-
-#include "../../../../../client/settings/cache_settings.h"
-#include "../../../cards/additional_info/mana_symbol_widget.h"
-#include "../../tab_supervisor.h"
-#include "api_response/archidekt_deck_listing_api_response.h"
-#include "display/archidekt_api_response_deck_display_widget.h"
-#include "display/archidekt_api_response_deck_listings_display_widget.h"
-
-#include <QCompleter>
-#include <QDebug>
-#include <QFormLayout>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QPushButton>
-#include <QRegularExpression>
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QScrollBar>
-#include <QUrlQuery>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/database/card/card_completer_proxy_model.h>
-#include <libcockatrice/models/database/card/card_search_model.h>
-#include <version_string.h>
-
-TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor)
-    : Tab(_tabSupervisor), currentPage(1), isLoadingMore(false), isListMode(true)
-{
-    // Initialize network
-    networkManager = new QNetworkAccessManager(this);
-    networkManager->setTransferTimeout();
-    networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
-    connect(networkManager, &QNetworkAccessManager::finished, this, &TabArchidekt::processApiJson);
-
-    // Initialize debounce timer
-    searchDebounceTimer = new QTimer(this);
-    searchDebounceTimer->setSingleShot(true);
-    searchDebounceTimer->setInterval(300);
-    connect(searchDebounceTimer, &QTimer::timeout, this, &TabArchidekt::doSearchImmediate);
-
-    initializeUi();
-    setupFilterWidgets();
-    connectSignals();
-    retranslateUi();
-
-    getTopDecks();
-}
-
-void TabArchidekt::initializeUi()
-{
-    // Main container
-    container = new QWidget(this);
-    mainLayout = new QVBoxLayout(container);
-    mainLayout->setContentsMargins(0, 0, 0, 0);
-    mainLayout->setSpacing(0);
-
-    // Primary toolbar (most important filters)
-    primaryToolbar = new QWidget(container);
-    primaryToolbar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    primaryToolbarLayout = new QHBoxLayout(primaryToolbar);
-    primaryToolbarLayout->setContentsMargins(6, 6, 6, 6);
-    primaryToolbarLayout->setSpacing(6);
-
-    // Sort controls
-    sortByLabel = new QLabel(primaryToolbar);
-    orderByCombo = new QComboBox(primaryToolbar);
-    orderByCombo->addItems({"name", "updatedAt", "createdAt", "viewCount", "size", "edhBracket"});
-    orderByCombo->setCurrentText("updatedAt");
-    orderByCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-
-    orderDirButton = new QPushButton(tr("Desc."), primaryToolbar);
-    orderDirButton->setCheckable(true);
-    orderDirButton->setChecked(true);
-    orderDirButton->setFixedWidth(60);
-
-    // Color filter (inline)
-    QWidget *colorWidget = new QWidget(primaryToolbar);
-    QHBoxLayout *colorLayout = new QHBoxLayout(colorWidget);
-    colorLayout->setContentsMargins(0, 0, 0, 0);
-    colorLayout->setSpacing(2);
-
-    QString colorIdentity = "WUBRG";
-    for (const QChar &color : colorIdentity) {
-        auto *manaSymbol = new ManaSymbolWidget(colorWidget, color, false, true);
-        manaSymbol->setFixedSize(28, 28);
-        colorSymbols.append(manaSymbol);
-        colorLayout->addWidget(manaSymbol);
-
-        connect(manaSymbol, &ManaSymbolWidget::colorToggled, this, [this](QChar c, bool active) {
-            if (active)
-                activeColors.insert(c);
-            else
-                activeColors.remove(c);
-            doSearch();
-        });
-    }
-
-    logicalAndCheck = new QCheckBox(tr("AND"), primaryToolbar);
-    logicalAndCheck->setToolTip(tr("Require ALL selected colors"));
-
-    // Common search fields
-    nameField = new QLineEdit(primaryToolbar);
-    nameField->setPlaceholderText(tr("Deck name..."));
-    nameField->setMinimumWidth(150);
-
-    ownerField = new QLineEdit(primaryToolbar);
-    ownerField->setPlaceholderText(tr("Owner..."));
-    ownerField->setMinimumWidth(120);
-
-    // Filter by label
-    filterByLabel = new QLabel(primaryToolbar);
-
-    // Package toggle
-    packagesCheck = new QCheckBox(tr("Packages"), primaryToolbar);
-
-    // Search button
-    searchButton = new QPushButton(tr("Search"), primaryToolbar);
-    searchButton->setDefault(true);
-
-    // Advanced filters toggle button
-    advancedFiltersButton = new QPushButton(tr("Advanced Filters"), primaryToolbar);
-    advancedFiltersButton->setCheckable(true);
-    advancedFiltersButton->setChecked(false);
-
-    // Settings
-    settingsButton = new SettingsButtonWidget(primaryToolbar);
-    cardSizeSlider = new CardSizeWidget(primaryToolbar, nullptr, SettingsCache::instance().getArchidektPreviewSize());
-    settingsButton->addSettingsWidget(cardSizeSlider);
-
-    // Assemble primary toolbar
-    primaryToolbarLayout->addWidget(sortByLabel);
-    primaryToolbarLayout->addWidget(orderByCombo);
-    primaryToolbarLayout->addWidget(orderDirButton);
-
-    // Add separator/spacing
-    primaryToolbarLayout->addSpacing(12);
-
-    primaryToolbarLayout->addWidget(filterByLabel);
-    primaryToolbarLayout->addWidget(colorWidget);
-    primaryToolbarLayout->addWidget(logicalAndCheck);
-    primaryToolbarLayout->addWidget(nameField, 1);
-    primaryToolbarLayout->addWidget(ownerField, 1);
-    primaryToolbarLayout->addWidget(packagesCheck);
-    primaryToolbarLayout->addWidget(searchButton, 1);
-    primaryToolbarLayout->addWidget(advancedFiltersButton);
-    primaryToolbarLayout->addWidget(settingsButton);
-
-    // Secondary toolbar (advanced filters - initially hidden)
-    secondaryToolbar = new QWidget(container);
-    secondaryToolbar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    secondaryToolbar->setVisible(false); // Start hidden
-    secondaryToolbarLayout = new QHBoxLayout(secondaryToolbar);
-    secondaryToolbarLayout->setContentsMargins(6, 3, 6, 6);
-    secondaryToolbarLayout->setSpacing(6);
-
-    // Scrollable results area
-    scrollArea = new QScrollArea(container);
-    scrollArea->setWidgetResizable(true);
-    scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-
-    resultsContainer = new QWidget();
-    resultsLayout = new QVBoxLayout(resultsContainer);
-    resultsLayout->setContentsMargins(0, 0, 0, 0);
-    resultsLayout->setSpacing(0);
-
-    scrollArea->setWidget(resultsContainer);
-
-    scrollArea->viewport()->installEventFilter(this);
-
-    mainLayout->addWidget(primaryToolbar);
-    mainLayout->addWidget(secondaryToolbar);
-    mainLayout->addWidget(scrollArea);
-
-    setCentralWidget(container);
-}
-
-bool TabArchidekt::eventFilter(QObject *obj, QEvent *event)
-{
-    if (obj == scrollArea->viewport() && event->type() == QEvent::Wheel) {
-        auto *wheelEvent = static_cast<QWheelEvent *>(event);
-
-        if (wheelEvent->angleDelta().y() < 0 && !isLoadingMore && isListMode) {
-            loadNextPage();
-            wheelEvent->accept();
-            return false; // allow scrolling
-        }
-    }
-
-    // Always pass the event to the parent to handle normal scrolling
-    return QWidget::eventFilter(obj, event);
-}
-
-void TabArchidekt::setupFilterWidgets()
-{
-    // Advanced filters (in secondary toolbar)
-
-    // EDH Bracket
-    auto *bracketLabel = new QLabel(tr("Bracket:"), secondaryToolbar);
-    edhBracketCombo = new QComboBox(secondaryToolbar);
-    edhBracketCombo->addItem(tr("Any"));
-    edhBracketCombo->addItems({"1", "2", "3", "4", "5"});
-    edhBracketCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-
-    // Format filter (collapsible)
-    formatButton = new SettingsButtonWidget(secondaryToolbar);
-    formatButton->setButtonText(tr("Formats"));
-    formatButton->setButtonIcon(QPixmap("theme:icons/scale_balanced"));
-
-    QWidget *formatContainer = new QWidget(secondaryToolbar);
-    QGridLayout *formatLayout = new QGridLayout(formatContainer);
-    formatLayout->setContentsMargins(4, 4, 4, 4);
-
-    QStringList formatNames = {"Standard",      "Modern",         "Commander", "Legacy",     "Vintage",
-                               "Pauper",        "Custom",         "Frontier",  "Future Std", "Penny Dreadful",
-                               "1v1 Commander", "Dual Commander", "Brawl"};
-
-    int row = 0, col = 0;
-    for (const QString &formatName : formatNames) {
-        auto *formatCheckBox = new QCheckBox(formatName, formatContainer);
-        formatChecks << formatCheckBox;
-        formatLayout->addWidget(formatCheckBox, row, col);
-        connect(formatCheckBox, &QCheckBox::clicked, this, &TabArchidekt::doSearch);
-
-        col++;
-        if (col >= 3) {
-            col = 0;
-            row++;
-        }
-    }
-
-    formatButton->addSettingsWidget(formatContainer);
-
-    cardsField = new QLineEdit(secondaryToolbar);
-    cardsField->setPlaceholderText(tr("Contains card..."));
-    cardsField->setMinimumWidth(140);
-
-    commandersField = new QLineEdit(secondaryToolbar);
-    commandersField->setPlaceholderText(tr("Commander..."));
-    commandersField->setMinimumWidth(140);
-
-    deckTagNameField = new QLineEdit(secondaryToolbar);
-    deckTagNameField->setPlaceholderText(tr("Tag..."));
-    deckTagNameField->setMinimumWidth(100);
-
-    // Deck size filter (collapsible)
-    deckSizeButton = new SettingsButtonWidget(secondaryToolbar);
-    deckSizeButton->setButtonText(tr("Deck Size"));
-
-    QWidget *sizeContainer = new QWidget(secondaryToolbar);
-    QHBoxLayout *sizeLayout = new QHBoxLayout(sizeContainer);
-    sizeLayout->setContentsMargins(4, 4, 4, 4);
-
-    minDeckSizeSpin = new QSpinBox(sizeContainer);
-    minDeckSizeSpin->setSpecialValueText(tr("Any"));
-    minDeckSizeSpin->setRange(0, 200);
-    minDeckSizeSpin->setValue(0);
-
-    minDeckSizeLogicCombo = new QComboBox(sizeContainer);
-    minDeckSizeLogicCombo->addItems({"Exact", "≥", "≤"});
-    minDeckSizeLogicCombo->setCurrentIndex(1);
-
-    sizeLayout->addWidget(new QLabel(tr("Cards:"), sizeContainer));
-    sizeLayout->addWidget(minDeckSizeSpin);
-    sizeLayout->addWidget(minDeckSizeLogicCombo);
-
-    deckSizeButton->addSettingsWidget(sizeContainer);
-
-    // Setup card name autocomplete
-    auto cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
-    auto displayModel = new CardDatabaseDisplayModel(this);
-    displayModel->setSourceModel(cardDatabaseModel);
-    auto *searchModel = new CardSearchModel(displayModel, this);
-
-    auto *proxyModel = new CardCompleterProxyModel(this);
-    proxyModel->setSourceModel(searchModel);
-    proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
-    proxyModel->setFilterRole(Qt::DisplayRole);
-
-    auto *completer = new QCompleter(proxyModel, this);
-    completer->setCompletionRole(Qt::DisplayRole);
-    completer->setCompletionMode(QCompleter::PopupCompletion);
-    completer->setCaseSensitivity(Qt::CaseInsensitive);
-    completer->setFilterMode(Qt::MatchContains);
-    completer->setMaxVisibleItems(10);
-
-    cardsField->setCompleter(completer);
-    commandersField->setCompleter(completer);
-
-    // Keep autocomplete working for both fields
-    connect(cardsField, &QLineEdit::textChanged, this, [=](const QString &text) {
-        searchModel->updateSearchResults(text);
-        QString pattern = ".*" + QRegularExpression::escape(text) + ".*";
-        proxyModel->setFilterRegularExpression(QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption));
-        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())
-            completer->complete();
-    });
-
-    // Assemble secondary toolbar
-    secondaryToolbarLayout->addWidget(bracketLabel);
-    secondaryToolbarLayout->addWidget(edhBracketCombo);
-    secondaryToolbarLayout->addWidget(formatButton);
-    secondaryToolbarLayout->addWidget(cardsField);
-    secondaryToolbarLayout->addWidget(commandersField);
-    secondaryToolbarLayout->addWidget(deckTagNameField);
-    secondaryToolbarLayout->addWidget(deckSizeButton);
-    secondaryToolbarLayout->addStretch();
-}
-
-void TabArchidekt::connectSignals()
-{
-    // Advanced filters toggle
-    connect(advancedFiltersButton, &QPushButton::clicked, this,
-            [this](bool checked) { secondaryToolbar->setVisible(checked); });
-
-    // These trigger immediate search (no debounce needed)
-    connect(orderByCombo, &QComboBox::currentTextChanged, this, &TabArchidekt::doSearch);
-    connect(orderDirButton, &QPushButton::clicked, [this](bool checked) {
-        orderDirButton->setText(checked ? tr("Desc.") : tr("Asc."));
-        doSearch();
-    });
-
-    connect(cardSizeSlider, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
-            &SettingsCache::setArchidektPreviewCardSize);
-
-    // Search button triggers immediate search
-    connect(searchButton, &QPushButton::clicked, this, &TabArchidekt::doSearchImmediate);
-
-    // These trigger search (but not text fields)
-    connect(logicalAndCheck, &QCheckBox::clicked, this, &TabArchidekt::doSearch);
-    connect(packagesCheck, &QCheckBox::clicked, [this]() {
-        updatePackageModeState(packagesCheck->isChecked());
-        doSearch();
-    });
-
-    // Format filters trigger search
-    connect(edhBracketCombo, &QComboBox::currentTextChanged, this, &TabArchidekt::doSearch);
-    connect(minDeckSizeSpin, qOverload<int>(&QSpinBox::valueChanged), this, &TabArchidekt::doSearch);
-    connect(minDeckSizeLogicCombo, &QComboBox::currentTextChanged, this, &TabArchidekt::doSearch);
-
-    // Allow Enter key in text fields to trigger search
-    connect(nameField, &QLineEdit::returnPressed, this, &TabArchidekt::doSearchImmediate);
-    connect(ownerField, &QLineEdit::returnPressed, this, &TabArchidekt::doSearchImmediate);
-    connect(cardsField, &QLineEdit::returnPressed, this, &TabArchidekt::doSearchImmediate);
-    connect(commandersField, &QLineEdit::returnPressed, this, &TabArchidekt::doSearchImmediate);
-    connect(deckTagNameField, &QLineEdit::returnPressed, this, &TabArchidekt::doSearchImmediate);
-
-    // Format checkboxes trigger search
-    for (auto *formatCheck : formatChecks) {
-        connect(formatCheck, &QCheckBox::clicked, this, &TabArchidekt::doSearch);
-    }
-}
-
-void TabArchidekt::updatePackageModeState(bool isPackageMode)
-{
-    // Disable format-specific and commander-specific filters in package mode
-    for (auto *cb : formatChecks) {
-        cb->setEnabled(!isPackageMode);
-    }
-
-    edhBracketCombo->setEnabled(!isPackageMode);
-    if (isPackageMode) {
-        edhBracketCombo->setCurrentIndex(0);
-    }
-
-    commandersField->setEnabled(!isPackageMode);
-    deckTagNameField->setEnabled(!isPackageMode);
-}
-
-void TabArchidekt::retranslateUi()
-{
-    sortByLabel->setText(tr("Sort by:"));
-    orderDirButton->setText(orderDirButton->isChecked() ? tr("Desc.") : tr("Asc."));
-
-    filterByLabel->setText(tr("Filter by:"));
-
-    logicalAndCheck->setText(tr("AND"));
-    logicalAndCheck->setToolTip(tr("Require ALL selected colors"));
-
-    nameField->setPlaceholderText(tr("Deck name..."));
-    ownerField->setPlaceholderText(tr("Owner..."));
-    packagesCheck->setText(tr("Packages"));
-    advancedFiltersButton->setText(tr("Advanced Filters"));
-
-    cardsField->setPlaceholderText(tr("Contains card..."));
-    commandersField->setPlaceholderText(tr("Commander..."));
-    deckTagNameField->setPlaceholderText(tr("Tag..."));
-
-    formatButton->setButtonText(tr("Formats"));
-    deckSizeButton->setButtonText(tr("Deck Size"));
-
-    searchButton->setText(tr("Search"));
-
-    settingsButton->setToolTip(tr("Display Settings"));
-}
-
-QString TabArchidekt::buildSearchUrl()
-{
-    QUrlQuery query;
-
-    // orderBy (field + direction)
-    QString field = orderByCombo->currentText();
-    if (!field.isEmpty()) {
-        bool desc = orderDirButton->isChecked();
-        QString final = desc ? "-" + field : field;
-        query.addQueryItem("orderBy", final);
-    }
-
-    // Colors
-    QStringList selectedColors;
-    for (QChar c : activeColors) {
-        selectedColors.append(c);
-    }
-    if (!selectedColors.isEmpty()) {
-        query.addQueryItem("colors", selectedColors.join(","));
-    }
-
-    // logicalAnd
-    if (logicalAndCheck->isChecked()) {
-        query.addQueryItem("logicalAnd", "true");
-    }
-
-    // Formats (disabled in package mode)
-    if (!packagesCheck->isChecked()) {
-        QStringList formatIds;
-        for (int i = 0; i < formatChecks.size(); ++i) {
-            if (formatChecks[i]->isChecked()) {
-                formatIds << QString::number(i + 1);
-            }
-        }
-
-        if (!formatIds.isEmpty()) {
-            query.addQueryItem("deckFormat", formatIds.join(","));
-        }
-
-        // edhBracket
-        if (edhBracketCombo->currentIndex() > 0) {
-            query.addQueryItem("edhBracket", edhBracketCombo->currentText());
-        }
-    }
-
-    // Package mode
-    if (packagesCheck->isChecked()) {
-        query.addQueryItem("packages", "true");
-    }
-
-    // Name
-    if (!nameField->text().isEmpty()) {
-        query.addQueryItem("name", nameField->text());
-    }
-
-    // Owner
-    if (!ownerField->text().isEmpty()) {
-        query.addQueryItem("ownerUsername", ownerField->text());
-    }
-
-    // Cards
-    if (!cardsField->text().isEmpty()) {
-        query.addQueryItem("cards", cardsField->text());
-    }
-
-    // Commander (disabled in package mode)
-    if (!packagesCheck->isChecked() && !commandersField->text().isEmpty()) {
-        query.addQueryItem("commanderName", commandersField->text());
-    }
-
-    // Deck tag (disabled in package mode)
-    if (!packagesCheck->isChecked() && !deckTagNameField->text().isEmpty()) {
-        query.addQueryItem("deckTagName", deckTagNameField->text());
-    }
-
-    // Page number (for infinite scroll)
-    query.addQueryItem("page", QString::number(currentPage));
-
-    // Min deck size
-    if (minDeckSizeSpin->value() != 0) {
-        query.addQueryItem("size", QString::number(minDeckSizeSpin->value()));
-
-        QString logic = "GTE";
-        QString selected = minDeckSizeLogicCombo->currentText();
-        if (selected == "≥")
-            logic = "GTE";
-        else if (selected == "≤")
-            logic = "LTE";
-        else
-            logic = "";
-
-        if (!logic.isEmpty()) {
-            query.addQueryItem("sizeLogic", logic);
-        }
-    }
-
-    QUrl url("https://archidekt.com/api/decks/v3/");
-    url.setQuery(query);
-
-    return url.toString();
-}
-
-void TabArchidekt::doSearch()
-{
-    // Reset to first page on new search
-    currentPage = 1;
-    // We're searching, so we'll be in list mode
-    isListMode = true;
-    // Don't debounce - only called by explicit user actions now
-    doSearchImmediate();
-}
-
-void TabArchidekt::doSearchImmediate()
-{
-    QString url = buildSearchUrl();
-    QNetworkRequest req{QUrl(url)};
-    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    networkManager->get(req);
-}
-
-void TabArchidekt::loadNextPage()
-{
-    if (isLoadingMore) {
-        return;
-    }
-
-    isLoadingMore = true;
-    currentPage++;
-
-    QString url = buildSearchUrl();
-    QNetworkRequest req{QUrl(url)};
-    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    networkManager->get(req);
-}
-
-void TabArchidekt::actNavigatePage(QString url)
-{
-    QNetworkRequest request{QUrl(url)};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    networkManager->get(request);
-}
-
-void TabArchidekt::getTopDecks()
-{
-    currentPage = 1;
-    QNetworkRequest request{QUrl(buildSearchUrl())};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    networkManager->get(request);
-}
-
-void TabArchidekt::processApiJson(QNetworkReply *reply)
-{
-    if (reply->error() != QNetworkReply::NoError) {
-        isLoadingMore = false;
-        reply->deleteLater();
-        return;
-    }
-
-    QByteArray responseData = reply->readAll();
-    QJsonDocument jsonDoc = QJsonDocument::fromJson(responseData);
-
-    if (!jsonDoc.isObject()) {
-        isLoadingMore = false;
-        reply->deleteLater();
-        return;
-    }
-
-    QJsonObject jsonObj = jsonDoc.object();
-    QString responseUrl = reply->url().toString();
-
-    if (responseUrl.startsWith("https://archidekt.com/api/decks/v3/")) {
-        processTopDecksResponse(jsonObj);
-    } else if (responseUrl.startsWith("https://archidekt.com/api/decks/")) {
-        processDeckResponse(jsonObj);
-    } else {
-        prettyPrintJson(jsonObj, 4);
-    }
-
-    isLoadingMore = false;
-    reply->deleteLater();
-}
-
-void TabArchidekt::processTopDecksResponse(QJsonObject reply)
-{
-    ArchidektDeckListingApiResponse deckData;
-    deckData.fromJson(reply);
-
-    // New search → clear everything
-    if (currentPage == 1) {
-        QLayoutItem *item;
-        while ((item = resultsLayout->takeAt(0)) != nullptr) {
-            delete item->widget();
-            delete item;
-        }
-
-        listingsWidget = new ArchidektApiResponseDeckListingsDisplayWidget(resultsContainer, deckData, cardSizeSlider);
-
-        connect(listingsWidget, &ArchidektApiResponseDeckListingsDisplayWidget::requestNavigation, this,
-                &TabArchidekt::actNavigatePage);
-
-        resultsLayout->addWidget(listingsWidget);
-        return;
-    }
-
-    // Infinite scroll → append
-    if (listingsWidget) {
-        listingsWidget->append(deckData);
-    }
-}
-
-void TabArchidekt::processDeckResponse(QJsonObject reply)
-{
-    ArchidektApiResponseDeck deckData;
-    deckData.fromJson(reply);
-
-    // We're in single deck mode - disable infinite scroll
-    isListMode = false;
-
-    // Clear existing results for single deck view
-    QLayoutItem *item;
-    while ((item = resultsLayout->takeAt(0)) != nullptr) {
-        delete item->widget();
-        delete item;
-    }
-
-    auto display = new ArchidektApiResponseDeckDisplayWidget(resultsContainer, deckData, cardSizeSlider);
-    connect(display, &ArchidektApiResponseDeckDisplayWidget::requestNavigation, this, &TabArchidekt::actNavigatePage);
-    connect(display, &ArchidektApiResponseDeckDisplayWidget::requestSearch, this, &TabArchidekt::doSearchImmediate);
-    connect(display, &ArchidektApiResponseDeckDisplayWidget::openInDeckEditor, tabSupervisor,
-            &TabSupervisor::openDeckInNewTab);
-    resultsLayout->addWidget(display);
-}
-
-void TabArchidekt::prettyPrintJson(const QJsonValue &value, int indentLevel)
-{
-    const QString indent(indentLevel * 2, ' ');
-
-    if (value.isObject()) {
-        QJsonObject obj = value.toObject();
-        for (auto it = obj.begin(); it != obj.end(); ++it) {
-            qInfo().noquote() << indent + it.key() + ":";
-            prettyPrintJson(it.value(), indentLevel + 1);
-        }
-    } else if (value.isArray()) {
-        QJsonArray array = value.toArray();
-        for (int i = 0; i < array.size(); ++i) {
-            qInfo().noquote() << indent + QString("[%1]:").arg(i);
-            prettyPrintJson(array[i], indentLevel + 1);
-        }
-    } else if (value.isString()) {
-        qInfo().noquote() << indent + "\"" + value.toString() + "\"";
-    } else if (value.isDouble()) {
-        qInfo().noquote() << indent + QString::number(value.toDouble());
-    } else if (value.isBool()) {
-        qInfo().noquote() << indent + (value.toBool() ? "true" : "false");
-    } else if (value.isNull()) {
-        qInfo().noquote() << indent + "null";
-    }
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
deleted file mode 100644
index e837e672b..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
+++ /dev/null
@@ -1,294 +0,0 @@
-#ifndef COCKATRICE_TAB_ARCHIDEKT_H
-#define COCKATRICE_TAB_ARCHIDEKT_H
-
-#include "../../interface/widgets/cards/card_size_widget.h"
-#include "../../interface/widgets/quick_settings/settings_button_widget.h"
-#include "../../tab.h"
-#include "display/archidekt_api_response_deck_listings_display_widget.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QNetworkAccessManager>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QSet>
-#include <QSpinBox>
-#include <QString>
-#include <QTimer>
-#include <QVBoxLayout>
-#include <QWidget>
-#include <libcockatrice/card/database/card_database.h>
-
-/** Base API link for Archidekt deck search */
-inline QString archidektApiLink = "https://archidekt.com/api/decks/v3/?name=";
-
-class ManaSymbolWidget;
-
-/**
- * @brief Tab for browsing, searching, and filtering Archidekt decks.
- *
- * This class provides a comprehensive interface for querying decks from the Archidekt API.
- * Users can filter decks by name, owner, included cards, commanders, deck tags, colors, EDH bracket,
- * and formats. It supports infinite scroll pagination for seamless browsing.
- */
-class TabArchidekt : public Tab
-{
-    Q_OBJECT
-public:
-    /**
-     * @brief Construct a new TabArchidekt object
-     * @param _tabSupervisor Parent tab supervisor responsible for tab management and callbacks
-     *
-     * Initializes the network manager, creates all UI components, sets up layouts,
-     * connects signals and slots, and triggers an initial fetch of top decks.
-     */
-    explicit TabArchidekt(TabSupervisor *_tabSupervisor);
-
-    /**
-     * @brief Update all UI text to reflect the current language or translation
-     *
-     * This function re-applies translations to all labels, buttons, and placeholders.
-     * It should be called after a language change.
-     */
-    void retranslateUi() override;
-
-    /**
-     * @brief Construct the search URL from all current filters
-     * @return QString Fully constructed URL including all query parameters
-     *
-     * The search URL is dynamically built using the state of all filter widgets.
-     * Parameters included:
-     * - Deck name
-     * - Owner
-     * - Included cards
-     * - Commander cards
-     * - Deck tag
-     * - Colors and logical AND requirement
-     * - Formats
-     * - EDH bracket
-     * - Packages toggle
-     * - Sorting field and direction
-     * - Minimum amount of cards in the deck
-     * - Current page (for infinite scroll)
-     */
-    QString buildSearchUrl();
-
-    /**
-     * @brief Retrieve the tab display text
-     * @return QString Human-readable title for the tab
-     *
-     * If a card is pre-selected (cardToQuery), its name is appended to the tab title.
-     */
-    QString getTabText() const override
-    {
-        auto cardName = cardToQuery.isNull() ? QString() : cardToQuery->getName();
-        return tr("Archidekt: ") + cardName;
-    }
-
-    /**
-     * @brief Get the card size slider widget
-     * @return CardSizeWidget* Pointer to the card size adjustment slider
-     *
-     * Allows external code to read or manipulate the current card size or hook up the sliders signals.
-     */
-    CardSizeWidget *getCardSizeSlider()
-    {
-        return cardSizeSlider;
-    }
-
-public slots:
-    /**
-     * @brief Trigger a debounced search using the current filters
-     *
-     * Resets to page 1 and starts the debounce timer. The actual search will execute
-     * after 300ms of inactivity.
-     */
-    void doSearch();
-
-    /**
-     * @brief Immediately trigger a search using the current filters
-     *
-     * Sends a network request to the Archidekt API using the URL generated by buildSearchUrl().
-     * Updates the results display asynchronously.
-     */
-    void doSearchImmediate();
-
-    /**
-     * @brief Load the next page of results for infinite scroll
-     *
-     * Increments the current page and fetches additional results, which are appended
-     * to the existing results display.
-     */
-    void loadNextPage();
-
-    /**
-     * @brief Process a network reply containing JSON data
-     * @param reply QNetworkReply object with the API response
-     *
-     * Determines whether the response corresponds to a deck listing or a single deck,
-     * and dispatches it to the appropriate handler.
-     */
-    void processApiJson(QNetworkReply *reply);
-
-    /**
-     * @brief Handle a JSON response containing multiple decks
-     * @param reply QJsonObject containing deck listings
-     *
-     * If this is page 1, clears previous results. Appends new results to the display.
-     */
-    void processTopDecksResponse(QJsonObject reply);
-
-    /**
-     * @brief Handle a JSON response for a single deck
-     * @param reply QJsonObject containing deck data
-     *
-     * Clears the results area and displays the single deck details.
-     */
-    void processDeckResponse(QJsonObject reply);
-
-    /**
-     * @brief Pretty-print a QJsonValue for debugging
-     * @param value The JSON value to print
-     * @param indentLevel The indentation depth (number of levels)
-     */
-    void prettyPrintJson(const QJsonValue &value, int indentLevel);
-
-    /**
-     * @brief Navigate to a specified page URL
-     * @param url The URL to request
-     *
-     * Typically called when a deck card is clicked in the listing.
-     */
-    void actNavigatePage(QString url);
-
-    /**
-     * @brief Fetch top decks from the Archidekt API
-     *
-     * Called on initialization to populate the initial results display.
-     */
-    void getTopDecks();
-
-protected:
-    /**
-     * @brief Event filter to catch wheel events for infinite scroll
-     * @param obj The object that received the event
-     * @param event The event to filter
-     * @return bool Whether the event was handled
-     */
-    bool eventFilter(QObject *obj, QEvent *event) override;
-
-private:
-    /**
-     * @brief Initialize the main UI layout and toolbars
-     *
-     * Creates the container, main layout, primary toolbar (sort, colors, name, owner, packages),
-     * secondary toolbar (advanced filters), and scrollable results area.
-     */
-    void initializeUi();
-
-    /**
-     * @brief Set up all filter widgets
-     *
-     * Creates filter widgets for:
-     * - Card search with autocomplete
-     * - Commander search with autocomplete
-     * - Deck tags
-     * - Format selection (collapsible)
-     * - Deck size filter (collapsible)
-     */
-    void setupFilterWidgets();
-
-    /**
-     * @brief Connect all signals and slots for UI interactions
-     *
-     * Links all widget signals to their appropriate handlers, including
-     * search triggers, filter changes, package mode toggling, and infinite scroll.
-     */
-    void connectSignals();
-
-    /**
-     * @brief Update UI state when package mode is toggled
-     * @param isPackageMode Whether package mode is currently enabled
-     *
-     * Disables format-specific and commander-specific filters when searching
-     * for card packages instead of full decks.
-     */
-    void updatePackageModeState(bool isPackageMode);
-
-    // ---------------------------------------------------------------------
-    // Network & Timing
-    // ---------------------------------------------------------------------
-
-    QNetworkAccessManager *networkManager; ///< Network manager for handling API requests
-    QTimer *searchDebounceTimer;           ///< Timer to debounce search requests
-    int currentPage;                       ///< Current page number for infinite scroll
-    bool isLoadingMore;                    ///< Flag to prevent multiple simultaneous page loads
-    bool isListMode;
-    ArchidektApiResponseDeckListingsDisplayWidget *listingsWidget = nullptr;
-
-    // ---------------------------------------------------------------------
-    // Layout Containers
-    // ---------------------------------------------------------------------
-
-    QWidget *container;      ///< Root container for the entire tab
-    QVBoxLayout *mainLayout; ///< Outer vertical layout containing toolbars and results
-
-    QWidget *primaryToolbar;           ///< Primary toolbar with most important filters
-    QHBoxLayout *primaryToolbarLayout; ///< Layout for primary toolbar
-
-    QWidget *secondaryToolbar;           ///< Secondary toolbar with advanced filters
-    QHBoxLayout *secondaryToolbarLayout; ///< Layout for secondary toolbar
-
-    QScrollArea *scrollArea;    ///< Scrollable area for results (enables infinite scroll)
-    QWidget *resultsContainer;  ///< Container widget inside scroll area
-    QVBoxLayout *resultsLayout; ///< Layout for results (decks appended here)
-
-    // ---------------------------------------------------------------------
-    // Primary Toolbar Controls (Most Important)
-    // ---------------------------------------------------------------------
-
-    QLabel *sortByLabel;         ///< Label for sort controls
-    QComboBox *orderByCombo;     ///< Dropdown for selecting the sort field
-    QPushButton *orderDirButton; ///< Toggle button for ascending/descending sort
-
-    QLabel *filterByLabel;                  ///< Label for filter controls
-    QList<ManaSymbolWidget *> colorSymbols; ///< Mana symbol toggle buttons
-    QSet<QChar> activeColors;               ///< Set of currently active mana colors
-    QCheckBox *logicalAndCheck;             ///< Require ALL selected colors instead of ANY
-
-    QLineEdit *nameField;               ///< Input for deck name filter
-    QLineEdit *ownerField;              ///< Input for owner name filter
-    QCheckBox *packagesCheck;           ///< Toggle for searching card packages instead of full decks
-    QPushButton *searchButton;          ///< Button to trigger search
-    QPushButton *advancedFiltersButton; ///< Button to show/hide advanced filters
-
-    SettingsButtonWidget *settingsButton; ///< Container for card size settings
-    CardSizeWidget *cardSizeSlider;       ///< Slider to adjust card size in results
-
-    // ---------------------------------------------------------------------
-    // Secondary Toolbar Controls (Advanced Filters)
-    // ---------------------------------------------------------------------
-
-    QLineEdit *cardsField;       ///< Input for cards included in the deck
-    QLineEdit *commandersField;  ///< Input for commander cards
-    QLineEdit *deckTagNameField; ///< Input for deck tag filtering
-
-    SettingsButtonWidget *formatButton; ///< Collapsible button for format filters
-    QVector<QCheckBox *> formatChecks;  ///< Individual checkboxes for each format
-    QComboBox *edhBracketCombo;         ///< Dropdown for EDH bracket selection
-
-    SettingsButtonWidget *deckSizeButton; ///< Collapsible button for deck size filter
-    QSpinBox *minDeckSizeSpin;            ///< Spinner to select minimum deck size
-    QComboBox *minDeckSizeLogicCombo;     ///< Combo box for size comparison logic
-
-    // ---------------------------------------------------------------------
-    // Optional Context
-    // ---------------------------------------------------------------------
-
-    CardInfoPtr cardToQuery; ///< Optional pre-selected card for initial filtering
-};
-
-#endif // COCKATRICE_TAB_ARCHIDEKT_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
deleted file mode 100644
index c3ab23e41..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-#include "edhrec_commander_api_response_bracket_navigation_widget.h"
-
-#include <QSet>
-
-EdhrecCommanderApiResponseBracketNavigationWidget::EdhrecCommanderApiResponseBracketNavigationWidget(
-    QWidget *parent,
-    const QString &baseUrl)
-    : QWidget(parent)
-{
-    layout = new QGridLayout(this);
-    setLayout(layout);
-
-    gameChangerLabel = new QLabel(this);
-
-    layout->addWidget(gameChangerLabel, 1, 0, 1, 2);
-
-    for (int i = 0; i < gameChangerOptions.length(); i++) {
-        QString option = gameChangerOptions.at(i);
-        QString label = option.isEmpty() ? "All" : option.at(0).toUpper() + option.mid(1);
-        QPushButton *optionButton = new QPushButton(label, this);
-        optionButton->setMinimumHeight(84);
-        optionButton->setStyleSheet("font-size: 24px");
-        gameChangerButtons[option] = optionButton;
-        layout->addWidget(optionButton, 2, i);
-        connect(optionButton, &QPushButton::clicked, this, [=, this]() {
-            selectedGameChanger = option;
-            updateOptionButtonSelection(gameChangerButtons, option);
-            emit requestNavigation();
-        });
-    }
-
-    updateOptionButtonSelection(gameChangerButtons, "");
-
-    retranslateUi();
-    applyOptionsFromUrl(baseUrl);
-}
-
-void EdhrecCommanderApiResponseBracketNavigationWidget::retranslateUi()
-{
-    gameChangerLabel->setText(tr("Game Changers"));
-}
-
-void EdhrecCommanderApiResponseBracketNavigationWidget::applyOptionsFromUrl(const QString &url)
-{
-    QString cleanedUrl = url;
-
-    // Remove base and file extension
-    if (cleanedUrl.startsWith("https://json.edhrec.com/pages/")) {
-        cleanedUrl = cleanedUrl.mid(QString("https://json.edhrec.com/pages/").length());
-    }
-    if (cleanedUrl.endsWith(".json")) {
-        cleanedUrl.chop(5);
-    }
-
-    // Expecting something like: "commanders/the-ur-dragon/core/expensive"
-    QStringList parts = cleanedUrl.split('/', Qt::SkipEmptyParts);
-
-    if (parts.size() < 2) {
-        return;
-    }
-
-    QString commanderName = parts[1];
-    QString gameChangerOpt;
-
-    // Define valid sets
-    QSet<QString> validGameChangers = {"exhibition", "core", "upgraded", "optimized", "cedh"};
-
-    // Check remaining parts after commander
-    for (int i = 2; i < parts.size(); ++i) {
-        QString part = parts[i].toLower();
-        if (validGameChangers.contains(part)) {
-            gameChangerOpt = part;
-        }
-    }
-
-    // Validate and apply
-    if (!gameChangerButtons.contains(gameChangerOpt)) {
-        gameChangerOpt.clear();
-    }
-
-    selectedGameChanger = gameChangerOpt;
-
-    updateOptionButtonSelection(gameChangerButtons, selectedGameChanger);
-}
-
-void EdhrecCommanderApiResponseBracketNavigationWidget::updateOptionButtonSelection(
-    QMap<QString, QPushButton *> &buttons,
-    const QString &selectedKey)
-{
-    for (auto it = buttons.begin(); it != buttons.end(); ++it) {
-        it.value()->setStyleSheet(it.key() == selectedKey
-                                      ? "background-color: lightblue; font-weight: bold; font-size: 24px;"
-                                      : "font-size: 24px");
-    }
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
deleted file mode 100644
index 713ef2791..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H
-#define COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H
-
-#include <QGridLayout>
-#include <QLabel>
-#include <QMap>
-#include <QPushButton>
-#include <QWidget>
-
-class EdhrecCommanderApiResponseBracketNavigationWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit EdhrecCommanderApiResponseBracketNavigationWidget(QWidget *parent, const QString &baseUrl);
-    void retranslateUi();
-    void applyOptionsFromUrl(const QString &url);
-    QString getSelectedGameChanger() const
-    {
-        return selectedGameChanger;
-    }
-
-signals:
-    void requestNavigation();
-
-private:
-    QGridLayout *layout;
-    QLabel *gameChangerLabel;
-
-    QStringList gameChangerOptions = {"", "exhibition", "core", "upgraded", "optimized", "cedh"};
-    QString selectedGameChanger;
-
-    QMap<QString, QPushButton *> gameChangerButtons;
-
-    void updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons, const QString &selectedKey);
-};
-
-#endif // COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
deleted file mode 100644
index 1845c020d..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include "edhrec_commander_api_response_budget_navigation_widget.h"
-
-#include <QSet>
-
-EdhrecCommanderApiResponseBudgetNavigationWidget::EdhrecCommanderApiResponseBudgetNavigationWidget(
-    QWidget *parent,
-    const QString &baseUrl)
-    : QWidget(parent)
-{
-    layout = new QGridLayout(this);
-    setLayout(layout);
-
-    budgetLabel = new QLabel(this);
-
-    layout->addWidget(budgetLabel, 3, 0, 1, 2);
-
-    for (int i = 0; i < budgetOptions.length(); i++) {
-        QString option = budgetOptions.at(i);
-        QString label = option.isEmpty() ? "Any" : option.at(0).toUpper() + option.mid(1);
-        QPushButton *btn = new QPushButton(label, this);
-        btn->setMinimumHeight(84);
-        btn->setStyleSheet("font-size: 24px");
-        budgetButtons[option] = btn;
-        layout->addWidget(btn, 4, i);
-        connect(btn, &QPushButton::clicked, this, [=, this]() {
-            selectedBudget = option;
-            updateOptionButtonSelection(budgetButtons, option);
-            emit requestNavigation();
-        });
-    }
-
-    updateOptionButtonSelection(budgetButtons, "");
-
-    retranslateUi();
-    applyOptionsFromUrl(baseUrl);
-}
-
-void EdhrecCommanderApiResponseBudgetNavigationWidget::retranslateUi()
-{
-    budgetLabel->setText(tr("Budget"));
-}
-
-void EdhrecCommanderApiResponseBudgetNavigationWidget::applyOptionsFromUrl(const QString &url)
-{
-    QString cleanedUrl = url;
-
-    // Remove base and file extension
-    if (cleanedUrl.startsWith("https://json.edhrec.com/pages/")) {
-        cleanedUrl = cleanedUrl.mid(QString("https://json.edhrec.com/pages/").length());
-    }
-    if (cleanedUrl.endsWith(".json")) {
-        cleanedUrl.chop(5);
-    }
-
-    // Expecting something like: "commanders/the-ur-dragon/core/expensive"
-    QStringList parts = cleanedUrl.split('/', Qt::SkipEmptyParts);
-
-    if (parts.size() < 2) {
-        return;
-    }
-
-    QString commanderName = parts[1];
-    QString gameChangerOpt, budgetOpt;
-
-    // Define valid sets
-    QSet<QString> validGameChangers = {"exhibition", "core", "upgraded", "optimized", "cedh"};
-    QSet<QString> validBudgets = {"budget", "expensive"};
-
-    // Check remaining parts after commander
-    for (int i = 2; i < parts.size(); ++i) {
-        QString part = parts[i].toLower();
-        if (validGameChangers.contains(part)) {
-            gameChangerOpt = part;
-        } else if (validBudgets.contains(part)) {
-            budgetOpt = part;
-        }
-    }
-
-    if (!budgetButtons.contains(budgetOpt)) {
-        budgetOpt.clear();
-    }
-
-    selectedBudget = budgetOpt;
-
-    updateOptionButtonSelection(budgetButtons, selectedBudget);
-}
-
-void EdhrecCommanderApiResponseBudgetNavigationWidget::updateOptionButtonSelection(
-    QMap<QString, QPushButton *> &buttons,
-    const QString &selectedKey)
-{
-    for (auto it = buttons.begin(); it != buttons.end(); ++it) {
-        it.value()->setStyleSheet(it.key() == selectedKey
-                                      ? "background-color: lightblue; font-weight: bold; font-size: 24px;"
-                                      : "font-size: 24px");
-    }
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
deleted file mode 100644
index 666edba16..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H
-#define COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H
-
-#include <QGridLayout>
-#include <QLabel>
-#include <QMap>
-#include <QPushButton>
-#include <QWidget>
-
-class EdhrecCommanderApiResponseBudgetNavigationWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit EdhrecCommanderApiResponseBudgetNavigationWidget(QWidget *parent, const QString &baseUrl);
-    void retranslateUi();
-    void applyOptionsFromUrl(const QString &url);
-    QString getSelectedBudget() const
-    {
-        return selectedBudget;
-    }
-
-signals:
-    void requestNavigation();
-
-private:
-    QGridLayout *layout;
-    QLabel *budgetLabel;
-
-    QStringList budgetOptions = {"", "budget", "expensive"};
-    QString selectedBudget;
-
-    QMap<QString, QPushButton *> budgetButtons;
-
-    void updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons, const QString &selectedKey);
-};
-
-#endif // COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
deleted file mode 100644
index c42d2ed90..000000000
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "edhrec_commander_api_response_navigation_widget.h"
-
-#include "../../tab_edhrec_main.h"
-
-EdhrecCommanderApiResponseNavigationWidget::EdhrecCommanderApiResponseNavigationWidget(
-    QWidget *parent,
-    const EdhrecCommanderApiResponseCommanderDetails &_commanderDetails,
-    QString baseUrl)
-    : QWidget(parent), commanderDetails(_commanderDetails)
-{
-    layout = new QGridLayout(this);
-    setLayout(layout);
-
-    bracketNavigationWidget = new EdhrecCommanderApiResponseBracketNavigationWidget(this, baseUrl);
-
-    connect(bracketNavigationWidget, &EdhrecCommanderApiResponseBracketNavigationWidget::requestNavigation, this,
-            &EdhrecCommanderApiResponseNavigationWidget::actRequestCommanderNavigation);
-
-    budgetNavigationWidget = new EdhrecCommanderApiResponseBudgetNavigationWidget(this, baseUrl);
-
-    connect(budgetNavigationWidget, &EdhrecCommanderApiResponseBudgetNavigationWidget::requestNavigation, this,
-            &EdhrecCommanderApiResponseNavigationWidget::actRequestCommanderNavigation);
-
-    comboPushButton = new QPushButton(this);
-    comboPushButton->setMinimumHeight(84);
-    comboPushButton->setStyleSheet("font-size: 24px");
-    averageDeckPushButton = new QPushButton(this);
-    averageDeckPushButton->setMinimumHeight(84);
-    averageDeckPushButton->setStyleSheet("font-size: 24px");
-
-    layout->addWidget(comboPushButton, 0, 0, 1, 1);
-    layout->addWidget(averageDeckPushButton, 0, 1, 1, 1);
-
-    layout->addWidget(bracketNavigationWidget, 1, 0, 1, 2);
-    layout->addWidget(budgetNavigationWidget, 2, 0, 1, 2);
-
-    QWidget *currentParent = parentWidget();
-    TabEdhRecMain *parentTab = nullptr;
-
-    while (currentParent) {
-        if ((parentTab = qobject_cast<TabEdhRecMain *>(currentParent))) {
-            break;
-        }
-        currentParent = currentParent->parentWidget();
-    }
-
-    if (parentTab) {
-        connect(comboPushButton, &QPushButton::clicked, this,
-                &EdhrecCommanderApiResponseNavigationWidget::actRequestComboNavigation);
-        connect(averageDeckPushButton, &QPushButton::clicked, this,
-                &EdhrecCommanderApiResponseNavigationWidget::actRequestAverageDeckNavigation);
-        connect(this, &EdhrecCommanderApiResponseNavigationWidget::requestUrl, parentTab,
-                &TabEdhRecMain::actNavigatePage);
-    }
-
-    retranslateUi();
-}
-
-void EdhrecCommanderApiResponseNavigationWidget::retranslateUi()
-{
-    comboPushButton->setText(tr("Combos"));
-    averageDeckPushButton->setText(tr("Average Deck"));
-}
-
-QString EdhrecCommanderApiResponseNavigationWidget::addNavigationOptionsToUrl(QString baseUrl)
-{
-    if (!bracketNavigationWidget->getSelectedGameChanger().isEmpty()) {
-        baseUrl += "/" + bracketNavigationWidget->getSelectedGameChanger();
-    }
-    if (!budgetNavigationWidget->getSelectedBudget().isEmpty()) {
-        baseUrl += "/" + budgetNavigationWidget->getSelectedBudget();
-    }
-    return baseUrl;
-}
-
-void EdhrecCommanderApiResponseNavigationWidget::actRequestCommanderNavigation()
-{
-    emit requestUrl(addNavigationOptionsToUrl("/commanders/" + commanderDetails.getSanitized()));
-}
-
-void EdhrecCommanderApiResponseNavigationWidget::actRequestComboNavigation()
-{
-    emit requestUrl("/combos/" + commanderDetails.getSanitized());
-}
-
-void EdhrecCommanderApiResponseNavigationWidget::actRequestAverageDeckNavigation()
-{
-    emit requestUrl(addNavigationOptionsToUrl("/average-decks/" + commanderDetails.getSanitized()));
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
deleted file mode 100644
index 59ee6bdeb..000000000
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-#include "tab_deck_editor.h"
-
-#include "../../../client/settings/cache_settings.h"
-#include "../deck_editor/deck_state_manager.h"
-#include "../filters/filter_builder.h"
-#include "../interface/pixel_map_generator.h"
-#include "../interface/widgets/cards/card_info_frame_widget.h"
-#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
-#include "../interface/widgets/menus/deck_editor_menu.h"
-#include "tab_supervisor.h"
-
-#include <QAction>
-#include <QCloseEvent>
-#include <QDebug>
-#include <QDir>
-#include <QDockWidget>
-#include <QHeaderView>
-#include <QMenuBar>
-#include <QProcessEnvironment>
-#include <QTimer>
-#include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
-
-/**
- * @brief Constructs a new TabDeckEditor object.
- * Sets up menus, translations, shortcuts, and loads the layout.
- * @param _tabSupervisor Pointer to parent TabSupervisor.
- */
-TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor)
-{
-    setObjectName("TabDeckEditor");
-
-    TabDeckEditor::createMenus();
-
-    installEventFilter(this);
-
-    TabDeckEditor::retranslateUi();
-    TabDeckEditor::refreshShortcuts();
-
-    TabDeckEditor::loadLayout();
-}
-
-/**
- * @brief Creates menus for deck editing and view customization.
- *
- * Adds DeckEditorMenu, view menus, and actions for dock visibility and floating.
- */
-void TabDeckEditor::createMenus()
-{
-    deckMenu = new DeckEditorMenu(this);
-    addTabMenu(deckMenu);
-
-    viewMenu = new QMenu(this);
-
-    registerDockWidget(viewMenu, cardDatabaseDockWidget, {500, 500});
-    registerDockWidget(viewMenu, cardInfoDockWidget, {250, 500});
-    registerDockWidget(viewMenu, deckDockWidget, {250, 360});
-    registerDockWidget(viewMenu, filterDockWidget, {250, 250});
-    registerDockWidget(viewMenu, printingSelectorDockWidget, {525, 250});
-
-    connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this,
-            [this](bool enabled) { dockToActions[printingSelectorDockWidget].menu->setEnabled(!enabled); });
-
-    viewMenu->addSeparator();
-
-    aResetLayout = viewMenu->addAction(QString());
-    connect(aResetLayout, &QAction::triggered, this, &TabDeckEditor::restartLayout);
-    viewMenu->addAction(aResetLayout);
-
-    deckMenu->setSaveStatus(false);
-    addTabMenu(viewMenu);
-}
-
-/**
- * @brief Returns the text to display in the tab.
- * Prepends "*" if the deck is modified.
- * @return Tab text including modified mark.
- */
-QString TabDeckEditor::getTabText() const
-{
-    QString result = tr("Deck: %1").arg(deckStateManager->getSimpleDeckName());
-    if (deckStateManager->isModified())
-        result.prepend("* ");
-    return result;
-}
-
-/** @brief Updates text of menus and actions for localization. */
-void TabDeckEditor::retranslateUi()
-{
-    deckMenu->retranslateUi();
-    cardDatabaseDockWidget->retranslateUi();
-    cardInfoDockWidget->retranslateUi();
-    deckDockWidget->retranslateUi();
-    filterDockWidget->retranslateUi();
-    printingSelectorDockWidget->retranslateUi();
-
-    viewMenu->setTitle(tr("&View"));
-
-    dockToActions[cardDatabaseDockWidget].menu->setTitle(tr("Card Database"));
-    dockToActions[cardInfoDockWidget].menu->setTitle(tr("Card Info"));
-    dockToActions[deckDockWidget].menu->setTitle(tr("Deck"));
-    dockToActions[filterDockWidget].menu->setTitle(tr("Filters"));
-    dockToActions[printingSelectorDockWidget].menu->setTitle(tr("Printing"));
-
-    for (auto &actions : dockToActions.values()) {
-        actions.aVisible->setText(tr("Visible"));
-        actions.aFloating->setText(tr("Floating"));
-    }
-
-    aResetLayout->setText(tr("Reset layout"));
-}
-
-/** @brief Refreshes shortcuts for deck editor menu actions. */
-void TabDeckEditor::refreshShortcuts()
-{
-    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
-    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.
- */
-void TabDeckEditor::loadLayout()
-{
-    LayoutsSettings &layouts = SettingsCache::instance().layouts();
-
-    auto layoutState = layouts.getDeckEditorLayoutState();
-    if (layoutState.isNull())
-        restartLayout();
-    else {
-        restoreState(layoutState);
-        restoreGeometry(layouts.getDeckEditorGeometry());
-    }
-}
-
-/**
- * @brief Resets all dock widgets to default layout.
- */
-void TabDeckEditor::restartLayout()
-{
-    // Show/hide and reset floating
-    for (auto dockWidget : dockToActions.keys()) {
-        dockWidget->setVisible(true);
-        dockWidget->setFloating(false);
-    }
-
-    addDockWidget(Qt::LeftDockWidgetArea, cardDatabaseDockWidget);
-    addDockWidget(Qt::RightDockWidgetArea, deckDockWidget);
-    addDockWidget(Qt::RightDockWidgetArea, cardInfoDockWidget);
-    addDockWidget(Qt::RightDockWidgetArea, filterDockWidget);
-    addDockWidget(Qt::RightDockWidgetArea, printingSelectorDockWidget);
-
-    splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Horizontal);
-    splitDockWidget(printingSelectorDockWidget, deckDockWidget, Qt::Horizontal);
-    splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Horizontal);
-    splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Vertical);
-}
-
-/**
- * @brief Handles close/hide events to update menu state and save layout.
- * @param o Object sending the event.
- * @param e Event.
- * @return Always returns false.
- */
-bool TabDeckEditor::eventFilter(QObject *o, QEvent *e)
-{
-    if (o == this && e->type() == QEvent::Hide) {
-        LayoutsSettings &layouts = SettingsCache::instance().layouts();
-        layouts.setDeckEditorLayoutState(saveState());
-        layouts.setDeckEditorGeometry(saveGeometry());
-    }
-    return false;
-}
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
deleted file mode 100644
index ab7a0bfc5..000000000
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef WINDOW_DECKEDITOR_H
-#define WINDOW_DECKEDITOR_H
-
-#include "../../key_signals.h"
-#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
-#include "abstract_tab_deck_editor.h"
-
-#include <libcockatrice/card/card_info.h>
-
-class CardDatabaseModel;
-class CardDatabaseDisplayModel;
-class DeckListModel;
-
-class QLabel;
-
-/**
- * @class TabDeckEditor
- * @ingroup DeckEditorTabs
- * @brief TabDeckEditor provides a fully-featured deck editor tab. It extends AbstractTabDeckEditor.
- *
- * **Description:**
- * TabDeckEditor is a fully-featured deck editor tab. It extends AbstractTabDeckEditor. It manages layout, dock
- * widgets, menus, and deck-specific actions for traditional (non-visual) editing.
- *
- * **Purpose:**
- *
- * - Provides a complete deck editing interface for mainboard, sideboard, and card database interactions.
- * - Handles dock widgets, keyboard shortcuts, layout persistence, and UI updates.
- * - Facilitates card addition, removal, and deck saving/loading through menu and UI interactions.
- *
- * **Dock Widgets:**
- *
- * - DeckEditorCardInfoDockWidget — Displays detailed card information.
- * - DeckEditorDeckDockWidget — Shows deck contents and zones.
- * - DeckEditorDatabaseDisplayWidget — Displays cards from the database in a table view for adding to the deck.
- * - DeckEditorFilterDockWidget — Provides filter/search capabilities for the database display.
- * - DeckEditorPrintingSelectorDockWidget — Allows selection of specific card printings.
- *
- * **Key Methods:**
- *
- * - loadLayout() — Loads saved layout or applies default layout positions and dock states.
- * - restartLayout() — Resets dock visibility, positions, and floating states to defaults.
- * - freeDocksSize() — Frees constraints on dock sizes to allow flexible resizing.
- * - refreshShortcuts() — Updates tab-specific shortcuts from settings.
- * - eventFilter(QObject *o, QEvent *e) — Handles dock close/hide events and saves layout state.
- * - dockVisibleTriggered() — Responds to menu actions toggling dock visibility.
- * - dockFloatingTriggered() — Responds to menu actions toggling dock floating state.
- * - dockTopLevelChanged(bool topLevel) — Updates menu states when a dock changes top-level/floating status.
- * - retranslateUi() — Updates all text/UI elements for localization.
- * - getTabText() const — Returns the tab title with a modified marker if applicable.
- * - createMenus() — Initializes menus for deck and view actions.
- * - showPrintingSelector() — Displays the printing selector dock for the current card.
- */
-class TabDeckEditor : public AbstractTabDeckEditor
-{
-    Q_OBJECT
-
-protected slots:
-    /** @brief Loads the saved layout or default layout. */
-    void loadLayout() override;
-
-    /** @brief Resets the layout to default positions and dock states. */
-    void restartLayout() override;
-
-    /** @brief Refreshes shortcuts for this tab from settings. */
-    void refreshShortcuts() override;
-
-    /** @brief Handles dock visibility, floating, and top-level changes. */
-    bool eventFilter(QObject *o, QEvent *e) override;
-
-public:
-    /**
-     * @brief Constructs a TabDeckEditor instance.
-     * @param _tabSupervisor Parent tab supervisor for managing tabs.
-     */
-    explicit TabDeckEditor(TabSupervisor *_tabSupervisor);
-
-    /** @brief Retranslates UI elements for localization. */
-    void retranslateUi() override;
-
-    /** @brief Returns the tab text, including modified mark if applicable. */
-    [[nodiscard]] QString getTabText() const override;
-
-    /** @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/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
deleted file mode 100644
index d03ac483b..000000000
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+++ /dev/null
@@ -1,331 +0,0 @@
-#include "tab_deck_editor_visual.h"
-
-#include "../../../../client/settings/cache_settings.h"
-#include "../../deck_editor/deck_state_manager.h"
-#include "../../filters/filter_builder.h"
-#include "../../interface/pixel_map_generator.h"
-#include "../../interface/widgets/cards/card_info_frame_widget.h"
-#include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
-#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
-#include "../tab_deck_editor.h"
-#include "../tab_supervisor.h"
-#include "tab_deck_editor_visual_tab_widget.h"
-
-#include <QAction>
-#include <QCloseEvent>
-#include <QCompleter>
-#include <QDir>
-#include <QDockWidget>
-#include <QHeaderView>
-#include <QLineEdit>
-#include <QMenu>
-#include <QProcessEnvironment>
-#include <QSplitter>
-#include <QTextStream>
-#include <QTimer>
-#include <QTreeView>
-#include <QVBoxLayout>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-
-/**
- * @brief Constructs the TabDeckEditorVisual instance.
- *
- * Sets up the central widget, tab container, menus, shortcuts,
- * and restores the saved layout.
- * @param _tabSupervisor Parent tab supervisor managing this tab.
- */
-TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor)
-{
-    setObjectName("TabDeckEditorVisual");
-
-    createCentralFrame();
-    createMenus();
-
-    installEventFilter(this);
-
-    retranslateUi();
-    connect(&SettingsCache::instance().shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
-    refreshShortcuts();
-
-    loadLayout();
-    cardDatabaseDockWidget->setHidden(true);
-}
-
-/** @brief Creates the central frame containing the tab container. */
-void TabDeckEditorVisual::createCentralFrame()
-{
-    centralWidget = new QWidget(this);
-    centralWidget->setObjectName("centralWidget");
-
-    centralFrame = new QVBoxLayout;
-    centralWidget->setLayout(centralFrame);
-
-    tabContainer = new TabDeckEditorVisualTabWidget(
-        centralWidget, this, deckStateManager->getModel(), cardDatabaseDockWidget->databaseDisplayWidget->databaseModel,
-        cardDatabaseDockWidget->databaseDisplayWidget->databaseDisplayModel);
-
-    connect(tabContainer, &TabDeckEditorVisualTabWidget::cardChanged, this,
-            &TabDeckEditorVisual::changeModelIndexAndCardInfo);
-    connect(tabContainer, &TabDeckEditorVisualTabWidget::cardChangedDatabaseDisplay, this,
-            &AbstractTabDeckEditor::updateCard);
-    connect(tabContainer, &TabDeckEditorVisualTabWidget::cardClicked, this,
-            &TabDeckEditorVisual::processMainboardCardClick);
-    connect(tabContainer, &TabDeckEditorVisualTabWidget::cardClickedDatabaseDisplay, this,
-            &TabDeckEditorVisual::processCardClickDatabaseDisplay);
-
-    centralFrame->addWidget(tabContainer);
-    setCentralWidget(centralWidget);
-    setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
-}
-
-/** @brief Updates the visual deck, analytics, and sample hand after a deck change. */
-void TabDeckEditorVisual::onDeckChanged()
-{
-    AbstractTabDeckEditor::onDeckModified();
-    tabContainer->visualDeckView->constructZoneWidgetsFromDeckListModel();
-    tabContainer->deckAnalytics->updateDisplays();
-    tabContainer->sampleHandWidget->setDeckModel(deckStateManager->getModel());
-}
-
-/** @brief Creates menus for deck editing and view options, including dock actions. */
-void TabDeckEditorVisual::createMenus()
-{
-    deckMenu = new DeckEditorMenu(this);
-    addTabMenu(deckMenu);
-
-    viewMenu = new QMenu(this);
-
-    registerDockWidget(viewMenu, cardInfoDockWidget, {250, 500});
-    registerDockWidget(viewMenu, deckDockWidget, {250, 360});
-    registerDockWidget(viewMenu, filterDockWidget, {250, 250});
-    registerDockWidget(viewMenu, printingSelectorDockWidget, {525, 250});
-
-    viewMenu->addSeparator();
-
-    aResetLayout = viewMenu->addAction(QString());
-    connect(aResetLayout, SIGNAL(triggered()), this, SLOT(restartLayout()));
-    viewMenu->addAction(aResetLayout);
-
-    deckMenu->setSaveStatus(false);
-    addTabMenu(viewMenu);
-}
-
-/** @brief Returns the tab text, prepending a mark if the deck has unsaved changes. */
-QString TabDeckEditorVisual::getTabText() const
-{
-    QString result = tr("Visual Deck: %1").arg(deckStateManager->getSimpleDeckName());
-    if (deckStateManager->isModified())
-        result.prepend("* ");
-    return result;
-}
-
-/** @brief Updates card info and highlights the corresponding card in the deck view. */
-void TabDeckEditorVisual::changeModelIndexAndCardInfo(const ExactCard &activeCard)
-{
-    updateCard(activeCard);
-    changeModelIndexToCard(activeCard);
-}
-
-/** @brief Selects the given card in the deck view, checking main and side zones. */
-void TabDeckEditorVisual::changeModelIndexToCard(const ExactCard &activeCard)
-{
-    QString cardName = activeCard.getName();
-    QModelIndex index = deckStateManager->getModel()->findCard(cardName, DECK_ZONE_MAIN);
-    if (!index.isValid()) {
-        index = deckStateManager->getModel()->findCard(cardName, DECK_ZONE_SIDE);
-    }
-    if (!deckDockWidget->getSelectionModel()->hasSelection()) {
-        deckDockWidget->getSelectionModel()->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
-    }
-}
-
-void TabDeckEditorVisual::processMainboardCardClick(QMouseEvent *event,
-                                                    CardInfoPictureWithTextOverlayWidget *instance,
-                                                    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()) {
-        return;
-    }
-
-    QItemSelectionModel *sel = deckDockWidget->getSelectionModel();
-
-    // Double click = swap
-    if (event->type() == QEvent::MouseButtonDblClick && event->button() == Qt::LeftButton &&
-        !event->modifiers().testFlag(Qt::AltModifier)) {
-        deckStateManager->swapCardAtIndex(idx);
-        idx = deckStateManager->getModel()->findCard(card.getName(), zoneName);
-        sel->setCurrentIndex(idx, QItemSelectionModel::ClearAndSelect);
-        return;
-    }
-
-    // Alt + Right-click = decrement
-    if (event->button() == Qt::RightButton && event->modifiers().testFlag(Qt::AltModifier)) {
-        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)) {
-        if (zoneName == DECK_ZONE_MAIN) {
-            actAddCard(card);
-        } else {
-            actAddCardToSideboard(card);
-        }
-        //  Keep selection intact.
-        return;
-    }
-
-    // Normal selection behavior
-    if (event->button() == Qt::LeftButton) {
-        Qt::KeyboardModifiers mods = event->modifiers();
-        QItemSelectionModel::SelectionFlags flags;
-
-        if (mods.testFlag(Qt::ControlModifier)) {
-            // CTRL + click = toggle selection
-            flags = QItemSelectionModel::Toggle;
-        } else if (mods.testFlag(Qt::ShiftModifier)) {
-            // SHIFT + click = select range
-            QModelIndex anchor = sel->currentIndex();
-            if (!anchor.isValid()) {
-                anchor = idx;
-            }
-
-            QItemSelection range(anchor, idx);
-            sel->select(range, QItemSelectionModel::SelectCurrent);
-            sel->setCurrentIndex(idx, QItemSelectionModel::NoUpdate);
-            return;
-        } else {
-            // Normal click = clear selection, select this, set current
-            deckDockWidget->deckView->setCurrentIndex(idx);
-            deckDockWidget->deckView->scrollTo(idx);
-            return;
-        }
-
-        sel->setCurrentIndex(idx, flags);
-    }
-}
-
-/** @brief Handles clicks on cards in the database display. */
-void TabDeckEditorVisual::processCardClickDatabaseDisplay(QMouseEvent *event,
-                                                          CardInfoPictureWithTextOverlayWidget *instance)
-{
-    if (event->button() == Qt::LeftButton) {
-        actAddCard(instance->getCard());
-    } else if (event->button() == Qt::RightButton) {
-        actDecrementCard(instance->getCard());
-    } else if (event->button() == Qt::MiddleButton) {
-        deckDockWidget->actRemoveCard();
-    }
-}
-
-/** @brief Performs "Save Deck As..." while temporarily disabling the search bar. */
-bool TabDeckEditorVisual::actSaveDeckAs()
-{
-    tabContainer->visualDeckView->searchBar->setEnabled(false);
-    auto result = AbstractTabDeckEditor::actSaveDeckAs();
-    tabContainer->visualDeckView->searchBar->setEnabled(true);
-    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()
-{
-    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
-    aResetLayout->setShortcuts(shortcuts.getShortcut("TabDeckEditorVisual/aResetLayout"));
-}
-
-/** @brief Loads the saved layout or resets to default if no layout exists. */
-void TabDeckEditorVisual::loadLayout()
-{
-    LayoutsSettings &layouts = SettingsCache::instance().layouts();
-    auto layoutState = layouts.getVisualDeckEditorLayoutState();
-    if (layoutState.isNull()) {
-        restartLayout();
-    } else {
-        restoreState(layoutState);
-        restoreGeometry(layouts.getVisualDeckEditorGeometry());
-    }
-}
-
-/** @brief Resets the layout to default positions and dock states. */
-void TabDeckEditorVisual::restartLayout()
-{
-    for (auto dockWidget : dockToActions.keys()) {
-        dockWidget->setFloating(false);
-    }
-
-    deckDockWidget->setVisible(true);
-    cardInfoDockWidget->setVisible(true);
-    filterDockWidget->setVisible(false);
-    printingSelectorDockWidget->setVisible(true);
-
-    setCentralWidget(centralWidget);
-    addDockWidget(Qt::RightDockWidgetArea, deckDockWidget);
-    addDockWidget(Qt::RightDockWidgetArea, cardInfoDockWidget);
-    addDockWidget(Qt::RightDockWidgetArea, filterDockWidget);
-    addDockWidget(Qt::RightDockWidgetArea, printingSelectorDockWidget);
-
-    splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Vertical);
-    splitDockWidget(cardInfoDockWidget, deckDockWidget, Qt::Horizontal);
-    splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Horizontal);
-
-    QTimer::singleShot(100, this, SLOT(freeDocksSize()));
-}
-
-/** @brief Retranslates UI elements for localization. */
-void TabDeckEditorVisual::retranslateUi()
-{
-    deckMenu->setTitle(tr("&Visual Deck Editor"));
-
-    cardInfoDockWidget->setWindowTitle(tr("Card Info"));
-    deckDockWidget->setWindowTitle(tr("Deck"));
-    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[printingSelectorDockWidget].menu->setTitle(tr("Printing"));
-
-    for (auto &actions : dockToActions.values()) {
-        actions.aVisible->setText(tr("Visible"));
-        actions.aFloating->setText(tr("Floating"));
-    }
-
-    aResetLayout->setText(tr("Reset layout"));
-}
-
-/**
- * @brief Handles dock visibility, floating, and layout saving events.
- *
- * Keeps dock state in sync with menu items and saves layout when hidden.
- */
-bool TabDeckEditorVisual::eventFilter(QObject *o, QEvent *e)
-{
-    if (o == this && e->type() == QEvent::Hide) {
-        LayoutsSettings &layouts = SettingsCache::instance().layouts();
-        layouts.setVisualDeckEditorLayoutState(saveState());
-        layouts.setVisualDeckEditorGeometry(saveGeometry());
-    }
-    return false;
-}
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
deleted file mode 100644
index 8a0677c9d..000000000
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h
+++ /dev/null
@@ -1,176 +0,0 @@
-#ifndef WINDOW_DECKEDITORVISUAL_H
-#define WINDOW_DECKEDITORVISUAL_H
-
-#include "../tab.h"
-#include "tab_deck_editor_visual_tab_widget.h"
-
-/**
- * @class TabDeckEditorVisual
- * @ingroup DeckEditorTabs
- * @brief TabDeckEditorVisual provides a fully-featured deck editor tab with an enhanced visual interface. It extends
- * AbstractTabDeckEditor.
- *
- * **Description:**
- * TabDeckEditorVisual is a fully-featured deck editor tab with an enhanced visual interface. It extends
- * AbstractTabDeckEditor and integrates multiple visual components such as a visual deck view, database display,
- * deck analytics, and sample hand preview.
- *
- * **Purpose:**
- *
- * - Provides an intuitive, visual interface for deck editing.
- * - Combines visual deck representation, card database browsing, and analytics into one tab.
- * - Supports card interactions via clicks, hover events, and drag-and-drop-like behavior (not yet).
- *
- * **Dock Widgets and Components:**
- *
- * - TabDeckEditorVisualTabWidget — Container for visual sub-tabs (further described in @ref
- *   code_client_tabs_deck_editor_visual_tab).
- *     - VisualDeckEditorWidget — Displays and interacts with the deck visually.
- *     - VisualDatabaseDisplayWidget — Allows adding cards from the database visually.
- *     - DeckAnalyticsWidget — Displays deck statistics and analytics.
- *     - VisualDeckEditorSampleHandWidget — Simulates a sample hand from the deck.
- * - DeckEditorCardInfoDockWidget — Shows detailed card info for hovered/selected cards.
- * - DeckEditorDeckDockWidget — Displays deck zones and cards in a tree-view.
- * - DeckEditorFilterDockWidget — Provides filtering options for card searches.
- * - DeckEditorPrintingSelectorDockWidget — Selects specific card printings.
- *
- * **Key Methods:**
- *
- * - createCentralFrame() — Sets up the central widget and visual sub-tabs.
- * - onDeckChanged() — Refreshes visual widgets when the deck is modified.
- * - changeModelIndexAndCardInfo(const ExactCard &card) — Updates deck model selection and card info.
- * - changeModelIndexToCard(const ExactCard &card) — Selects the card in the deck view.
- * - processMainboardCardClick(QMouseEvent *event, ...) — Handles clicks on mainboard cards.
- * - processCardClickDatabaseDisplay(QMouseEvent *event, ...) — Handles clicks on database cards.
- * - 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.
- * - refreshShortcuts() — Updates tab-specific shortcuts from settings.
- * - loadLayout() — Loads saved layout or applies default if none exists.
- * - restartLayout() — Resets dock positions, visibility, and floating states.
- * - retranslateUi() — Updates text/UI elements for localization.
- * - eventFilter(QObject *o, QEvent *e) — Syncs dock states with menu actions and saves layout.
- */
-class TabDeckEditorVisual : public AbstractTabDeckEditor
-{
-    Q_OBJECT
-
-protected slots:
-    /**
-     * @brief Load the editor layout from settings.
-     */
-    void loadLayout() override;
-
-    /**
-     * @brief Reset and restart the layout to default.
-     */
-    void restartLayout() override;
-
-    /**
-     * @brief Refresh keyboard shortcuts for this tab.
-     */
-    void refreshShortcuts() override;
-
-    /**
-     * @brief Synchronize dock state with menu items.
-     * @param o The object sending the event.
-     * @param e The event being filtered.
-     * @return true if the event is handled, false otherwise.
-     */
-    bool eventFilter(QObject *o, QEvent *e) override;
-
-protected:
-    TabDeckEditorVisualTabWidget *tabContainer; ///< Tab container holding different visual widgets.
-
-    QVBoxLayout *centralFrame;           ///< Layout for central widgets.
-    QVBoxLayout *searchAndDatabaseFrame; ///< Layout for search and database display.
-    QHBoxLayout *searchLayout;           ///< Layout for search bar.
-    QDockWidget *searchAndDatabaseDock;  ///< Dock widget for search/database display.
-    QWidget *centralWidget;              ///< Central widget of the editor.
-
-public:
-    /**
-     * @brief Constructs a visual deck editor tab.
-     * @param _tabSupervisor Pointer to the tab supervisor managing this tab.
-     */
-    explicit TabDeckEditorVisual(TabSupervisor *_tabSupervisor);
-
-    /**
-     * @brief Retranslate UI strings (for i18n support).
-     */
-    void retranslateUi() override;
-
-    /**
-     * @brief Get the display text for the tab.
-     * @return Tab text with optional modification indicator.
-     */
-    [[nodiscard]] QString getTabText() const override;
-
-    /**
-     * @brief Update the currently selected card in the deck and UI.
-     * @param activeCard Card to display.
-     */
-    void changeModelIndexAndCardInfo(const ExactCard &activeCard);
-
-    /**
-     * @brief Change the deck view selection to a specific card.
-     * @param activeCard Card to select in the deck view.
-     */
-    void changeModelIndexToCard(const ExactCard &activeCard);
-
-    /**
-     * @brief Create the deck analytics dock widget.
-     */
-    void createDeckAnalyticsDock();
-
-    /**
-     * @brief Setup menus for this visual deck editor.
-     */
-    void createMenus() override;
-
-    /**
-     * @brief Create search and database display frame.
-     */
-    void createSearchAndDatabaseFrame();
-
-    /**
-     * @brief Create central frame for visual widgets.
-     */
-    void createCentralFrame();
-
-public slots:
-    /**
-     * @brief Refresh UI when the deck changes.
-     */
-    void onDeckChanged() override;
-
-    /**
-     * @brief Show the printing selector dock for the currently active card.
-     */
-    void showPrintingSelector() override;
-
-    /**
-     * @brief Handle card clicks in the mainboard visual deck.
-     * @param event Mouse event triggering the action.
-     * @param instance Widget representing the clicked card.
-     * @param zoneName Deck zone of the card.
-     */
-    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 instance Widget representing the clicked card.
-     */
-    void processCardClickDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
-
-    /**
-     * @brief Save the deck under a new name.
-     * @return true if successful, false otherwise.
-     */
-    bool actSaveDeckAs() override;
-};
-
-#endif
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
deleted file mode 100644
index 9468df425..000000000
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
+++ /dev/null
@@ -1,137 +0,0 @@
-#ifndef TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
-#define TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
-
-#include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
-#include "../../interface/widgets/printing_selector/printing_selector.h"
-#include "../../interface/widgets/visual_database_display/visual_database_display_widget.h"
-#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h"
-#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
-#include "../abstract_tab_deck_editor.h"
-
-#include <QTabWidget>
-#include <QVBoxLayout>
-#include <QWidget>
-
-/**
- * @class TabDeckEditorVisualTabWidget
- * @ingroup DeckEditorWidgets
- * @brief Tab container for the visual deck editor.
- *
- * **Description:**
- * TabDeckEditorVisualTabWidget is a QTabWidget container for visual deck editing sub-tabs. It organizes the visual
- * deck, database display, deck analytics, and sample hand preview into separate tabs.
- *
- * **Purpose:**
- * - Provides a tabbed interface for multiple visual components of the deck editor.
- * - Handles forwarding of card events (hover, click, selection) to TabDeckEditorVisual.
- * - Manages dynamic tab addition, removal, and title updates.
- *
- * **Contained Sub-Tabs and Widgets:**
- * - VisualDeckEditorWidget — Visual deck interface with card interactions.
- * - VisualDatabaseDisplayWidget — Displays card database visually and supports interactions.
- * - DeckAnalyticsWidget — Shows deck statistics and metrics.
- * - VisualDeckEditorSampleHandWidget — Simulates and displays sample hands.
- *
- * **Key Methods:**
- * - addNewTab(QWidget *widget, const QString &title) — Adds a new tab to the container.
- * - removeCurrentTab() — Removes the currently selected tab.
- * - setTabTitle(int index, const QString &title) — Sets the title of a specific tab.
- * - getCurrentTab() const — Returns the currently active tab widget.
- * - getTabCount() const — Returns the number of tabs.
- * - handleTabClose(int index) — Handles tab close requests and deletes the widget.
- * - onCardChanged(const ExactCard &activeCard) — Emits card change signal from visual deck.
- * - onCardChangedDatabaseDisplay(const ExactCard &activeCard) — Emits card change signal from database display.
- * - onCardClickedDeckEditor(QMouseEvent *event, ...) — Emits click events from deck editor visual tab.
- * - onCardClickedDatabaseDisplay(QMouseEvent *event, ...) — Emits click events from database display tab.
- */
-class TabDeckEditorVisualTabWidget : public QTabWidget
-{
-    Q_OBJECT
-
-public:
-    /**
-     * @brief Construct the tab widget with required models.
-     * @param parent Parent widget.
-     * @param _deckEditor Pointer to the deck editor instance.
-     * @param _deckModel Deck list model.
-     * @param _cardDatabaseModel Card database model.
-     * @param _cardDatabaseDisplayModel Database display model.
-     */
-    explicit TabDeckEditorVisualTabWidget(QWidget *parent,
-                                          AbstractTabDeckEditor *_deckEditor,
-                                          DeckListModel *_deckModel,
-                                          CardDatabaseModel *_cardDatabaseModel,
-                                          CardDatabaseDisplayModel *_cardDatabaseDisplayModel);
-
-    /// Add a new tab with a widget and title.
-    void addNewTab(QWidget *widget, const QString &title);
-
-    /// Remove the currently active tab.
-    void removeCurrentTab();
-
-    /// Set the title of a specific tab.
-    void setTabTitle(int index, const QString &title);
-
-    /// Get the currently active tab widget.
-    [[nodiscard]] QWidget *getCurrentTab() const;
-
-    /// Get the total number of tabs.
-    [[nodiscard]] int getTabCount() const;
-
-    VisualDeckEditorWidget *visualDeckView; ///< Visual deck editor widget.
-    DeckListStatisticsAnalyzer *statsAnalyzer;
-    DeckAnalyticsWidget *deckAnalytics;                 ///< Deck analytics widget.
-    VisualDatabaseDisplayWidget *visualDatabaseDisplay; ///< Database display widget.
-    PrintingSelector *printingSelector;                 ///< Printing selector widget.
-    VisualDeckEditorSampleHandWidget *sampleHandWidget; ///< Sample hand simulation widget.
-
-public slots:
-    /**
-     * @brief Emitted when the active card changes in the deck view.
-     * @param activeCard New active card.
-     */
-    void onCardChanged(const ExactCard &activeCard);
-
-    /**
-     * @brief Emitted when the active card changes in the database display.
-     * @param activeCard New active card.
-     */
-    void onCardChangedDatabaseDisplay(const ExactCard &activeCard);
-
-    /**
-     * @brief Emitted when a card is clicked in the deck view.
-     * @param event Mouse event.
-     * @param instance Widget representing the clicked card.
-     * @param zoneName Deck zone of the card.
-     */
-    void onCardClickedDeckEditor(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
-
-    /**
-     * @brief Emitted when a card is clicked in the database display.
-     * @param event Mouse event.
-     * @param instance Widget representing the clicked card.
-     */
-    void onCardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
-
-signals:
-    void cardChanged(const ExactCard &activeCard);
-    void cardChangedDatabaseDisplay(const ExactCard &activeCard);
-    void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
-    void cardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
-
-private:
-    QVBoxLayout *layout;                                ///< Layout for tabs and controls.
-    AbstractTabDeckEditor *deckEditor;                  ///< Reference to the deck editor.
-    DeckListModel *deckModel;                           ///< Deck list model.
-    CardDatabaseModel *cardDatabaseModel;               ///< Card database model.
-    CardDatabaseDisplayModel *cardDatabaseDisplayModel; ///< Card database display model.
-
-private slots:
-    /**
-     * @brief Handle closing of a tab at a given index.
-     * @param index Index of the tab to close.
-     */
-    void handleTabClose(int index);
-};
-
-#endif // TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/utility/visibility_change_listener.cpp b/cockatrice/src/interface/widgets/utility/visibility_change_listener.cpp
deleted file mode 100644
index 38696f775..000000000
--- a/cockatrice/src/interface/widgets/utility/visibility_change_listener.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "visibility_change_listener.h"
-
-#include <QEvent>
-#include <QWidget>
-
-VisibilityChangeListener::VisibilityChangeListener(QWidget *targetWidget)
-    : QObject(targetWidget), targetWidget(targetWidget)
-{
-    if (targetWidget) {
-        targetWidget->installEventFilter(this);
-    }
-}
-
-bool VisibilityChangeListener::eventFilter(QObject *o, QEvent *e)
-{
-    if (o == targetWidget && !e->spontaneous()) {
-        if (e->type() == QEvent::Show) {
-            emit visibilityChanged(true);
-        }
-
-        if (e->type() == QEvent::Hide) {
-            emit visibilityChanged(false);
-        }
-    }
-    return false;
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/utility/visibility_change_listener.h b/cockatrice/src/interface/widgets/utility/visibility_change_listener.h
deleted file mode 100644
index 10928caf6..000000000
--- a/cockatrice/src/interface/widgets/utility/visibility_change_listener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef COCKATRICE_VISIBILITY_LISTENER_H
-#define COCKATRICE_VISIBILITY_LISTENER_H
-
-#include <QObject>
-
-/**
- * @brief This filter listens to the visibility changes of a target widget, emitting signals whenever the visibility of
- * that widget changes.
- */
-class VisibilityChangeListener : public QObject
-{
-    Q_OBJECT
-
-    QWidget *targetWidget;
-
-public:
-    /**
-     * Creates a new instance of this class, watching the targetWidget.
-     * This class automatically installs itself as an eventFilter to the targetWidget.
-     *
-     * @param targetWidget The widget to watch. Sets that widget as this object's parent.
-     */
-    explicit VisibilityChangeListener(QWidget *targetWidget);
-
-    bool eventFilter(QObject *o, QEvent *e) override;
-
-signals:
-    /**
-     * Emitted whenever the target widget's visibility changes
-     * @param visible The widget's new visibility
-     */
-    void visibilityChanged(bool visible);
-};
-
-#endif // COCKATRICE_VISIBILITY_LISTENER_H
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
index 57c6da762..e8eb97125 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
@@ -1,9 +1,10 @@
 #include "visual_database_display_color_filter_widget.h"
 
+#include "../../../filters/filter_tree.h"
 #include "../cards/additional_info/mana_symbol_widget.h"
 
+#include <QSet>
 #include <QTimer>
-#include <libcockatrice/filters/filter_tree.h>
 
 /**
  * This widget provides a graphical control element for the CardFilter::Attr::AttrColor filters applied to the filter
@@ -31,12 +32,12 @@ VisualDatabaseDisplayColorFilterWidget::VisualDatabaseDisplayColorFilterWidget(Q
                 &VisualDatabaseDisplayColorFilterWidget::handleColorToggled);
     }
 
-    modeComboBox = new QComboBox(this);
-    layout->addWidget(modeComboBox);
-
-    connect(modeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-            &VisualDatabaseDisplayColorFilterWidget::updateFilterMode);
+    toggleButton = new QPushButton(this);
+    toggleButton->setCheckable(true);
+    layout->addWidget(toggleButton);
 
+    // Connect the button's toggled signal
+    connect(toggleButton, &QPushButton::toggled, this, &VisualDatabaseDisplayColorFilterWidget::updateFilterMode);
     connect(filterModel, &FilterTreeModel::layoutChanged, this,
             [this]() { QTimer::singleShot(100, this, &VisualDatabaseDisplayColorFilterWidget::syncWithFilterModel); });
 
@@ -46,22 +47,19 @@ VisualDatabaseDisplayColorFilterWidget::VisualDatabaseDisplayColorFilterWidget(Q
 
 void VisualDatabaseDisplayColorFilterWidget::retranslateUi()
 {
-    modeComboBox->blockSignals(true);
-    modeComboBox->clear();
-
-    modeComboBox->addItem(tr("Exact match"), QVariant::fromValue(FilterMode::ExactMatch));
-    modeComboBox->addItem(tr("Includes"), QVariant::fromValue(FilterMode::Includes));
-    modeComboBox->addItem(tr("Include / Exclude"), QVariant::fromValue(FilterMode::IncludeExclude));
-
-    modeComboBox->setToolTip(tr("How selected and unselected colors are combined in the filter"));
-
-    // Restore current mode
-    const int index = modeComboBox->findData(QVariant::fromValue(currentMode));
-    if (index >= 0) {
-        modeComboBox->setCurrentIndex(index);
+    switch (currentMode) {
+        case FilterMode::ExactMatch:
+            toggleButton->setText(tr("Mode: Exact Match"));
+            break;
+        case FilterMode::Includes:
+            toggleButton->setText(tr("Mode: Includes"));
+            break;
+        case FilterMode::IncludeExclude:
+            toggleButton->setText(tr("Mode: Include/Exclude"));
+            break;
     }
 
-    modeComboBox->blockSignals(false);
+    toggleButton->setToolTip(tr("Filter mode (AND/OR/NOT conjunctions of filters)"));
 }
 
 void VisualDatabaseDisplayColorFilterWidget::handleColorToggled(QChar color, bool active)
@@ -148,19 +146,24 @@ void VisualDatabaseDisplayColorFilterWidget::removeFilter(QChar color)
 
 void VisualDatabaseDisplayColorFilterWidget::updateFilterMode()
 {
-    const QVariant data = modeComboBox->currentData();
-    if (!data.isValid()) {
-        return;
+    switch (currentMode) {
+        case FilterMode::ExactMatch:
+            currentMode = FilterMode::Includes; // Switch to Includes
+            break;
+        case FilterMode::Includes:
+            currentMode = FilterMode::IncludeExclude; // Switch to Include/Exclude
+            break;
+        case FilterMode::IncludeExclude:
+            currentMode = FilterMode::ExactMatch; // Switch to Exact Match
+            break;
     }
 
-    currentMode = data.value<FilterMode>();
-
     filterModel->blockSignals(true);
     filterModel->filterTree()->blockSignals(true);
 
     filterModel->clearFiltersOfType(CardFilter::Attr::AttrColor);
 
-    const QList<ManaSymbolWidget *> manaSymbolWidgets = findChildren<ManaSymbolWidget *>();
+    QList<ManaSymbolWidget *> manaSymbolWidgets = findChildren<ManaSymbolWidget *>();
 
     for (ManaSymbolWidget *manaSymbolWidget : manaSymbolWidgets) {
         handleColorToggled(manaSymbolWidget->getSymbolChar(), manaSymbolWidget->isColorActive());
@@ -171,7 +174,9 @@ void VisualDatabaseDisplayColorFilterWidget::updateFilterMode()
 
     emit filterModel->filterTree()->changed();
     emit filterModel->layoutChanged();
-    emit filterModeChanged(currentMode);
+
+    retranslateUi();                     // Update button text based on the mode
+    emit filterModeChanged(currentMode); // Signal mode change
 }
 
 void VisualDatabaseDisplayColorFilterWidget::setManaSymbolActive(QChar color, bool active)
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h
index 698ea9e97..42498766c 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,16 +1,10 @@
-/**
- * @file visual_database_display_color_filter_widget.h
- * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H
 
 #include "../../../filters/filter_tree_model.h"
 
-#include <QComboBox>
 #include <QHBoxLayout>
+#include <QPushButton>
 #include <QWidget>
 
 class VisualDatabaseDisplayColorFilterCircleWidget : public QWidget
@@ -39,8 +33,6 @@ enum class FilterMode
     IncludeExclude // Include selected colors (OR) and exclude unselected colors (AND NOT).
 };
 
-Q_DECLARE_METATYPE(FilterMode)
-
 class VisualDatabaseDisplayColorFilterWidget : public QWidget
 {
     Q_OBJECT
@@ -64,7 +56,7 @@ private slots:
 private:
     FilterTreeModel *filterModel;
     QHBoxLayout *layout;
-    QComboBox *modeComboBox;
+    QPushButton *toggleButton;
     FilterMode currentMode = FilterMode::Includes; // Default mode
 };
 
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_button.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_button.h
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 44b275afd..15ef4a590 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
@@ -1,12 +1,13 @@
 #include "visual_database_display_filter_save_load_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../filters/filter_tree.h"
+#include "../../../settings/cache_settings.h"
 #include "visual_database_filter_display_widget.h"
 
 #include <QHBoxLayout>
 #include <QJsonArray>
-#include <QJsonDocument>
-#include <libcockatrice/filters/filter_tree.h>
+#include <QJsonObject>
+#include <QMessageBox>
 
 VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWidget(QWidget *parent,
                                                                                      FilterTreeModel *_filterModel)
@@ -18,16 +19,6 @@ VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWi
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    // Filter search input
-    searchInput = new QLineEdit(this);
-    layout->addWidget(searchInput);
-
-    connect(searchInput, &QLineEdit::textChanged, this, &VisualDatabaseDisplayFilterSaveLoadWidget::applySearchFilter);
-
-    // File list container
-    fileListWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
-    layout->addWidget(fileListWidget);
-
     // Input for filter filename
     filenameInput = new QLineEdit(this);
     layout->addWidget(filenameInput);
@@ -35,20 +26,18 @@ VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWi
     // Save button
     saveButton = new QPushButton(this);
     layout->addWidget(saveButton);
-    // Disable save if empty
-    saveButton->setEnabled(false);
-    connect(filenameInput, &QLineEdit::textChanged, this,
-            [this](const QString &text) { saveButton->setEnabled(!text.trimmed().isEmpty()); });
-
     connect(saveButton, &QPushButton::clicked, this, &VisualDatabaseDisplayFilterSaveLoadWidget::saveFilter);
 
+    // File list container
+    fileListWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
+    layout->addWidget(fileListWidget);
+
     refreshFilterList(); // Populate the file list on startup
     retranslateUi();
 }
 
 void VisualDatabaseDisplayFilterSaveLoadWidget::retranslateUi()
 {
-    searchInput->setPlaceholderText(tr("Search filter..."));
     saveButton->setText(tr("Save Filter"));
     saveButton->setToolTip(tr("Save all currently applied filters to a file"));
     filenameInput->setPlaceholderText(tr("Enter filename..."));
@@ -124,36 +113,42 @@ void VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter(const QString &filena
     emit filterModel->layoutChanged();
 }
 
-void VisualDatabaseDisplayFilterSaveLoadWidget::applySearchFilter(const QString &text)
-{
-    fileListWidget->clearLayout();
-
-    QString filter = text.trimmed();
-    QStringList filtered = allFilterFiles;
-
-    if (!filter.isEmpty()) {
-        filtered = filtered.filter(QRegularExpression(filter, QRegularExpression::CaseInsensitiveOption));
-    }
-
-    for (const QString &filename : filtered) {
-        FilterDisplayWidget *filterWidget = new FilterDisplayWidget(this, filename, filterModel);
-        fileListWidget->addWidget(filterWidget);
-
-        connect(filterWidget, &FilterDisplayWidget::filterLoadRequested, this,
-                &VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter);
-
-        connect(filterWidget, &FilterDisplayWidget::filterDeleted, this,
-                &VisualDatabaseDisplayFilterSaveLoadWidget::refreshFilterList);
-    }
-}
-
 void VisualDatabaseDisplayFilterSaveLoadWidget::refreshFilterList()
 {
     fileListWidget->clearLayout();
-    fileButtons.clear();
+    // Clear existing widgets
+    for (auto buttonPair : fileButtons) {
+        buttonPair.first->deleteLater();
+        buttonPair.second->deleteLater();
+    }
+    fileButtons.clear(); // Clear the list of buttons
 
+    // Refresh the filter file list
     QDir dir(SettingsCache::instance().getFiltersPath());
-    allFilterFiles = dir.entryList({"*.json"}, QDir::Files, QDir::Name);
+    QStringList filterFiles = dir.entryList(QStringList() << "*.json", QDir::Files, QDir::Name);
 
-    applySearchFilter(searchInput->text());
+    // Loop through the filter files and create widgets for them
+    for (const QString &filename : filterFiles) {
+        bool alreadyAdded = false;
+
+        // Check if the widget for this filter file already exists to avoid duplicates
+        for (const auto &pair : fileButtons) {
+            if (pair.first->text() == filename) {
+                alreadyAdded = true;
+                break;
+            }
+        }
+
+        if (!alreadyAdded) {
+            // Create a new custom widget for the filter
+            FilterDisplayWidget *filterWidget = new FilterDisplayWidget(this, filename, filterModel);
+            fileListWidget->addWidget(filterWidget);
+
+            // Connect signals to handle loading and deletion
+            connect(filterWidget, &FilterDisplayWidget::filterLoadRequested, this,
+                    &VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter);
+            connect(filterWidget, &FilterDisplayWidget::filterDeleted, this,
+                    &VisualDatabaseDisplayFilterSaveLoadWidget::refreshFilterList);
+        }
+    }
 }
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 bb5921a02..5b70fbd67 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,17 +1,13 @@
-/**
- * @file visual_database_display_filter_save_load_widget.h
- * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H
 
 #include "../../../filters/filter_tree_model.h"
 #include "../general/layout_containers/flow_widget.h"
 
+#include <QDir>
 #include <QFile>
 #include <QFileDialog>
+#include <QJsonDocument>
 #include <QJsonObject>
 #include <QLineEdit>
 #include <QMap>
@@ -27,7 +23,6 @@ public:
 
     void saveFilter();
     void loadFilter(const QString &filename);
-    void applySearchFilter(const QString &text);
     void refreshFilterList();
     void deleteFilter(const QString &filename, QPushButton *deleteButton);
 
@@ -38,11 +33,9 @@ private:
     FilterTreeModel *filterModel;
 
     QVBoxLayout *layout;
-    QLineEdit *searchInput;
-    FlowWidget *fileListWidget;
     QLineEdit *filenameInput;
     QPushButton *saveButton;
-    QStringList allFilterFiles;
+    FlowWidget *fileListWidget;
 
     QMap<QString, QPair<QPushButton *, QPushButton *>> fileButtons;
 };
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
deleted file mode 100644
index 3cc1bf23b..000000000
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-#include "visual_database_display_filter_toolbar_widget.h"
-
-#include "visual_database_display_widget.h"
-
-#include <QGroupBox>
-
-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);
-
-    sortGroupBox = new QGroupBox(this);
-    filterGroupBox = new QGroupBox(this);
-
-    auto scalePixmap = [](const QString &fileName) { return QIcon(QPixmap(fileName)).pixmap({20, 20}); };
-
-    sortByLabel = new QLabel(this);
-    sortByLabel->setPixmap(scalePixmap("theme:icons/sort_arrow_down"));
-
-    filterByLabel = new QLabel(this);
-    filterByLabel->setPixmap(scalePixmap("theme:icons/filter"));
-
-    sortColumnCombo = new QComboBox(this);
-    sortColumnCombo->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
-    sortOrderCombo = new QComboBox(this);
-    sortOrderCombo->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
-
-    sortOrderCombo->addItem("Ascending", Qt::AscendingOrder);
-    sortOrderCombo->addItem("Descending", Qt::DescendingOrder);
-    sortOrderCombo->view()->setMinimumWidth(sortOrderCombo->view()->sizeHintForColumn(0));
-    sortOrderCombo->adjustSize();
-
-    // Populate columns dynamically from the model
-    for (int i = 0; i < visualDatabaseDisplay->getDatabaseDisplayModel()->columnCount(); ++i) {
-        QString header = visualDatabaseDisplay->getDatabaseDisplayModel()->headerData(i, Qt::Horizontal).toString();
-        sortColumnCombo->addItem(header, i);
-    }
-
-    sortColumnCombo->view()->setMinimumWidth(sortColumnCombo->view()->sizeHintForColumn(0));
-    sortColumnCombo->adjustSize();
-
-    connect(sortColumnCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() {
-        int column = sortColumnCombo->currentData().toInt();
-        Qt::SortOrder order = static_cast<Qt::SortOrder>(sortOrderCombo->currentData().toInt());
-        visualDatabaseDisplay->getDatabaseView()->sortByColumn(column, order);
-
-        emit searchModelChanged();
-    });
-
-    connect(sortOrderCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() {
-        int column = sortColumnCombo->currentData().toInt();
-        Qt::SortOrder order = static_cast<Qt::SortOrder>(sortOrderCombo->currentData().toInt());
-        visualDatabaseDisplay->getDatabaseView()->sortByColumn(column, order);
-
-        emit searchModelChanged();
-    });
-
-    quickFilterSaveLoadWidget = new SettingsButtonWidget(this);
-    quickFilterSaveLoadWidget->setButtonIcon(QPixmap("theme:icons/floppy_disk"));
-
-    quickFilterNameWidget = new SettingsButtonWidget(this);
-    quickFilterNameWidget->setButtonIcon(QPixmap("theme:icons/pen_to_square"));
-
-    quickFilterMainTypeWidget = new SettingsButtonWidget(this);
-    quickFilterMainTypeWidget->setButtonIcon(QPixmap("theme:icons/circle_half_stroke"));
-
-    quickFilterSubTypeWidget = new SettingsButtonWidget(this);
-    quickFilterSubTypeWidget->setButtonIcon(QPixmap("theme:icons/dragon"));
-
-    quickFilterSetWidget = new SettingsButtonWidget(this);
-    quickFilterSetWidget->setButtonIcon(QPixmap("theme:icons/scroll"));
-
-    quickFilterFormatLegalityWidget = new SettingsButtonWidget(this);
-    quickFilterFormatLegalityWidget->setButtonIcon(QPixmap("theme:icons/scale_balanced"));
-
-    retranslateUi();
-}
-
-void VisualDatabaseDisplayFilterToolbarWidget::initialize()
-{
-    // create groupbox layouts
-    auto sortLayout = new QHBoxLayout(this);
-    sortLayout->setContentsMargins(0, 0, 0, 0);
-    sortLayout->setSpacing(0);
-    sortGroupBox->setLayout(sortLayout);
-    sortLayout->setAlignment(Qt::AlignLeft);
-
-    auto filterLayout = new QHBoxLayout(this);
-    filterLayout->setContentsMargins(0, 0, 0, 0);
-    filterLayout->setSpacing(2);
-    filterGroupBox->setLayout(filterLayout);
-    filterLayout->setAlignment(Qt::AlignLeft);
-
-    // create settings widgets
-    auto filterModel = visualDatabaseDisplay->filterModel;
-
-    saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel);
-    nameFilterWidget =
-        new VisualDatabaseDisplayNameFilterWidget(this, visualDatabaseDisplay->getDeckEditor(), filterModel);
-    mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel);
-    formatLegalityWidget = new VisualDatabaseDisplayFormatLegalityFilterWidget(this, filterModel);
-    subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel);
-    setFilterWidget = new VisualDatabaseDisplaySetFilterWidget(this, filterModel);
-
-    quickFilterSaveLoadWidget->addSettingsWidget(saveLoadWidget);
-    quickFilterNameWidget->addSettingsWidget(nameFilterWidget);
-    quickFilterMainTypeWidget->addSettingsWidget(mainTypeFilterWidget);
-    quickFilterSubTypeWidget->addSettingsWidget(subTypeFilterWidget);
-    quickFilterSetWidget->addSettingsWidget(setFilterWidget);
-    quickFilterFormatLegalityWidget->addSettingsWidget(formatLegalityWidget);
-
-    // fill groupbox layouts
-    sortLayout->addWidget(sortByLabel);
-    sortLayout->addWidget(sortColumnCombo);
-    sortLayout->addWidget(sortOrderCombo);
-
-    filterLayout->addWidget(filterByLabel);
-    filterLayout->addWidget(quickFilterNameWidget);
-    filterLayout->addWidget(quickFilterMainTypeWidget);
-    filterLayout->addWidget(quickFilterSubTypeWidget);
-    filterLayout->addWidget(quickFilterSetWidget);
-    filterLayout->addWidget(quickFilterFormatLegalityWidget);
-
-    // put everything into main layout
-    filterContainerLayout->addWidget(sortGroupBox);
-    filterContainerLayout->addWidget(filterGroupBox);
-    filterContainerLayout->addStretch();
-    filterContainerLayout->addWidget(quickFilterSaveLoadWidget);
-}
-
-void VisualDatabaseDisplayFilterToolbarWidget::retranslateUi()
-{
-    sortByLabel->setToolTip(tr("Sort by"));
-    filterByLabel->setToolTip(tr("Filter by"));
-
-    quickFilterSaveLoadWidget->setToolTip(tr("Save and load filters"));
-    quickFilterNameWidget->setToolTip(tr("Filter by exact card name"));
-    quickFilterMainTypeWidget->setToolTip(tr("Filter by card main-type"));
-    quickFilterSubTypeWidget->setToolTip(tr("Filter by card sub-type"));
-    quickFilterSetWidget->setToolTip(tr("Filter by set"));
-    quickFilterFormatLegalityWidget->setToolTip(tr("Filter by format legality"));
-
-    quickFilterSaveLoadWidget->setButtonText(tr("Save/Load"));
-    quickFilterNameWidget->setButtonText(tr("Name"));
-    quickFilterMainTypeWidget->setButtonText(tr("Main Type"));
-    quickFilterSubTypeWidget->setButtonText(tr("Sub Type"));
-    quickFilterSetWidget->setButtonText(tr("Sets"));
-    quickFilterFormatLegalityWidget->setButtonText(tr("Formats"));
-}
\ 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
deleted file mode 100644
index 5cca5187a..000000000
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_TOOLBAR_WIDGET_H
-#define COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_TOOLBAR_WIDGET_H
-
-#include "visual_database_display_filter_save_load_widget.h"
-#include "visual_database_display_format_legality_filter_widget.h"
-#include "visual_database_display_main_type_filter_widget.h"
-#include "visual_database_display_name_filter_widget.h"
-#include "visual_database_display_set_filter_widget.h"
-#include "visual_database_display_sub_type_filter_widget.h"
-
-class VisualDatabaseDisplayWidget;
-
-class VisualDatabaseDisplayFilterToolbarWidget : public QWidget
-{
-    Q_OBJECT
-
-signals:
-    void searchModelChanged();
-
-public:
-    explicit VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *parent);
-    void initialize();
-    void retranslateUi();
-
-private:
-    VisualDatabaseDisplayWidget *visualDatabaseDisplay;
-
-    QGroupBox *sortGroupBox;
-    QLabel *sortByLabel;
-    QComboBox *sortColumnCombo, *sortOrderCombo;
-
-    QGroupBox *filterGroupBox;
-    QLabel *filterByLabel;
-
-    QHBoxLayout *filterContainerLayout;
-    SettingsButtonWidget *quickFilterSaveLoadWidget;
-    VisualDatabaseDisplayFilterSaveLoadWidget *saveLoadWidget;
-    SettingsButtonWidget *quickFilterNameWidget;
-    VisualDatabaseDisplayNameFilterWidget *nameFilterWidget;
-    SettingsButtonWidget *quickFilterMainTypeWidget;
-    VisualDatabaseDisplayMainTypeFilterWidget *mainTypeFilterWidget;
-    SettingsButtonWidget *quickFilterSubTypeWidget;
-    VisualDatabaseDisplaySubTypeFilterWidget *subTypeFilterWidget;
-    SettingsButtonWidget *quickFilterSetWidget;
-    VisualDatabaseDisplaySetFilterWidget *setFilterWidget;
-    SettingsButtonWidget *quickFilterFormatLegalityWidget;
-    VisualDatabaseDisplayFormatLegalityFilterWidget *formatLegalityWidget;
-};
-
-#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
deleted file mode 100644
index 633f07af7..000000000
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-#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>
-#include <QSpinBox>
-#include <QTimer>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/filters/filter_tree.h>
-
-VisualDatabaseDisplayFormatLegalityFilterWidget::VisualDatabaseDisplayFormatLegalityFilterWidget(
-    QWidget *parent,
-    FilterTreeModel *_filterModel)
-    : QWidget(parent), filterModel(_filterModel)
-{
-    allFormatsWithCount = CardDatabaseManager::query()->getAllFormatsWithCount();
-    int maxValue = std::numeric_limits<int>::min();
-    for (int value : allFormatsWithCount) {
-        maxValue = std::max(maxValue, value);
-    }
-    setMinimumWidth(300);
-    setMaximumHeight(300);
-
-    layout = new QVBoxLayout(this);
-    setLayout(layout);
-    layout->setContentsMargins(0, 1, 0, 1);
-    layout->setSpacing(1);
-    layout->setAlignment(Qt::AlignTop);
-
-    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
-    layout->addWidget(flowWidget);
-
-    // Create a container for the threshold control
-    auto *thresholdLayout = new QHBoxLayout();
-    thresholdLayout->setContentsMargins(0, 0, 0, 0);
-
-    thresholdLabel = new QLabel(this);
-    thresholdLayout->addWidget(thresholdLabel);
-
-    // Create the spinbox
-    spinBox = new QSpinBox(this);
-    spinBox->setMinimum(1);
-    spinBox->setMaximum(maxValue); // Set the max value dynamically
-    spinBox->setValue(150);
-    thresholdLayout->addWidget(spinBox);
-    thresholdLayout->addStretch();
-
-    layout->addLayout(thresholdLayout);
-
-    connect(spinBox, qOverload<int>(&QSpinBox::valueChanged), this,
-            &VisualDatabaseDisplayFormatLegalityFilterWidget::updateFormatButtonsVisibility);
-
-    // Create the toggle button for Exact Match/Includes mode
-    toggleButton = new QPushButton(this);
-    layout->addWidget(toggleButton);
-    connect(toggleButton, &QPushButton::clicked, this,
-            &VisualDatabaseDisplayFormatLegalityFilterWidget::updateFilterMode);
-    connect(filterModel, &FilterTreeModel::layoutChanged, this, [this]() {
-        QTimer::singleShot(100, this, &VisualDatabaseDisplayFormatLegalityFilterWidget::syncWithFilterModel);
-    });
-
-    createFormatButtons(); // Populate buttons initially
-    updateFilterMode();    // Initialize toggle button text
-
-    retranslateUi();
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::retranslateUi()
-{
-    thresholdLabel->setText(tr("Show formats with at least:"));
-    spinBox->setSuffix(tr(" cards"));
-    spinBox->setToolTip(tr("Do not display formats with less than this amount of cards in the database"));
-    toggleButton->setToolTip(tr("Filter mode (AND/OR/NOT conjunctions of filters)"));
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::createFormatButtons()
-{
-    // Iterate through main types and create buttons
-    for (auto it = allFormatsWithCount.begin(); it != allFormatsWithCount.end(); ++it) {
-        auto *button = new QPushButton(it.key(), flowWidget);
-        button->setCheckable(true);
-        button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
-
-        flowWidget->addWidget(button);
-        formatButtons[it.key()] = button;
-
-        // Connect toggle signal
-        connect(button, &QPushButton::toggled, this,
-                [this, mainType = it.key()](bool checked) { handleFormatToggled(mainType, checked); });
-    }
-    updateFormatButtonsVisibility(); // Ensure visibility is updated initially
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::updateFormatButtonsVisibility()
-{
-    int threshold = spinBox->value(); // Get the current spinbox value
-
-    // Iterate through buttons and hide/disable those below the threshold
-    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
-        bool visible = allFormatsWithCount[it.key()] >= threshold;
-        it.value()->setVisible(visible);
-        it.value()->setEnabled(visible);
-    }
-}
-
-int VisualDatabaseDisplayFormatLegalityFilterWidget::getMaxMainTypeCount() const
-{
-    int maxCount = 1;
-    for (auto it = allFormatsWithCount.begin(); it != allFormatsWithCount.end(); ++it) {
-        maxCount = qMax(maxCount, it.value());
-    }
-    return maxCount;
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::handleFormatToggled(const QString &format, bool active)
-{
-    activeFormats[format] = active;
-
-    if (formatButtons.contains(format)) {
-        formatButtons[format]->setChecked(active);
-    }
-
-    updateFormatFilter();
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::updateFormatFilter()
-{
-    // Clear existing filters related to main type
-    filterModel->blockSignals(true);
-    filterModel->filterTree()->blockSignals(true);
-    filterModel->clearFiltersOfType(CardFilter::Attr::AttrFormat);
-
-    if (exactMatchMode) {
-        // Exact Match: Only selected main types are allowed
-        QSet<QString> selectedTypes;
-        for (const auto &type : activeFormats.keys()) {
-            if (activeFormats[type]) {
-                selectedTypes.insert(type);
-            }
-        }
-
-        if (!selectedTypes.isEmpty()) {
-            // Require all selected types (TypeAnd)
-            for (const auto &type : selectedTypes) {
-                QString typeString = type;
-                filterModel->addFilter(
-                    new CardFilter(typeString, CardFilter::Type::TypeAnd, CardFilter::Attr::AttrFormat));
-            }
-
-            // Exclude any other types (TypeAndNot)
-            for (const auto &type : formatButtons.keys()) {
-                if (!selectedTypes.contains(type)) {
-                    QString typeString = type;
-                    filterModel->addFilter(
-                        new CardFilter(typeString, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrFormat));
-                }
-            }
-        }
-    } else {
-        // Default Includes Mode (TypeOr) - match any selected main types
-        for (const auto &type : activeFormats.keys()) {
-            if (activeFormats[type]) {
-                QString typeString = type;
-                filterModel->addFilter(
-                    new CardFilter(typeString, CardFilter::Type::TypeAnd, CardFilter::Attr::AttrFormat));
-            }
-        }
-    }
-
-    filterModel->blockSignals(false);
-    filterModel->filterTree()->blockSignals(false);
-
-    emit filterModel->filterTree()->changed();
-    emit filterModel->layoutChanged();
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::updateFilterMode()
-{
-    exactMatchMode = !exactMatchMode;
-    toggleButton->setText(exactMatchMode ? tr("Mode: Exact Match") : tr("Mode: Includes"));
-    updateFormatFilter();
-}
-
-void VisualDatabaseDisplayFormatLegalityFilterWidget::syncWithFilterModel()
-{
-    // Temporarily block signals for each button to prevent toggling while updating button states
-    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
-        it.value()->blockSignals(true);
-    }
-
-    // Uncheck all buttons
-    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
-        it.value()->setChecked(false);
-    }
-
-    // Get active filters for main types
-    QSet<QString> activeTypes;
-    for (const auto &filter : filterModel->getFiltersOfType(CardFilter::AttrFormat)) {
-        if (filter->type() == CardFilter::Type::TypeAnd) {
-            activeTypes.insert(filter->term());
-        }
-    }
-
-    // Check the buttons for active types
-    for (const auto &type : activeTypes) {
-        activeFormats[type] = true;
-        if (formatButtons.contains(type)) {
-            formatButtons[type]->setChecked(true);
-        }
-    }
-
-    // Re-enable signal emissions for each button
-    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
-        it.value()->blockSignals(false);
-    }
-
-    // Update the visibility of buttons
-    updateFormatButtonsVisibility();
-}
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h
deleted file mode 100644
index 1b1a1382e..000000000
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef COCKATRICE_VISUAL_DATABASE_DISPLAY_FORMAT_LEGALITY_FILTER_WIDGET_H
-#define COCKATRICE_VISUAL_DATABASE_DISPLAY_FORMAT_LEGALITY_FILTER_WIDGET_H
-
-#include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QLabel>
-#include <QMap>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QToolButton>
-#include <QVBoxLayout>
-#include <QWidget>
-
-class VisualDatabaseDisplayFormatLegalityFilterWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit VisualDatabaseDisplayFormatLegalityFilterWidget(QWidget *parent, FilterTreeModel *filterModel);
-    void retranslateUi();
-    void createFormatButtons();
-    void updateFormatButtonsVisibility();
-    int getMaxMainTypeCount() const;
-
-    void handleFormatToggled(const QString &format, bool active);
-    void updateFormatFilter();
-    void updateFilterMode();
-    void syncWithFilterModel();
-
-private:
-    FilterTreeModel *filterModel;
-    QMap<QString, int> allFormatsWithCount;
-
-    QVBoxLayout *layout;
-    FlowWidget *flowWidget;
-    QLabel *thresholdLabel;
-    QSpinBox *spinBox;
-    QPushButton *toggleButton; // Mode switch button
-
-    QMap<QString, bool> activeFormats;          // Track active filters
-    QMap<QString, QPushButton *> formatButtons; // Store toggle buttons
-
-    bool exactMatchMode = true; // Toggle between "Exact Match" and "Includes"
-};
-
-#endif // COCKATRICE_VISUAL_DATABASE_DISPLAY_FORMAT_LEGALITY_FILTER_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
index c44489c1b..1fddc9724 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,25 +1,24 @@
 #include "visual_database_display_main_type_filter_widget.h"
 
+#include "../../../database/card_database_manager.h"
+#include "../../../filters/filter_tree.h"
 #include "../../../filters/filter_tree_model.h"
-#include "visual_database_display_filter_button.h"
 
-#include <QLabel>
 #include <QPushButton>
 #include <QSpinBox>
 #include <QTimer>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/filters/filter_tree.h>
 
 VisualDatabaseDisplayMainTypeFilterWidget::VisualDatabaseDisplayMainTypeFilterWidget(QWidget *parent,
                                                                                      FilterTreeModel *_filterModel)
     : QWidget(parent), filterModel(_filterModel)
 {
-    // Get all main card types with their count
     allMainCardTypesWithCount = CardDatabaseManager::query()->getAllMainCardTypesWithCount();
-    setMinimumWidth(300);
-    setMaximumHeight(200);
+    // Get all main card types with their count
 
-    layout = new QVBoxLayout(this);
+    setMaximumHeight(75);
+    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
+
+    layout = new QHBoxLayout(this);
     setLayout(layout);
     layout->setContentsMargins(0, 1, 0, 1);
     layout->setSpacing(1);
@@ -28,44 +27,32 @@ VisualDatabaseDisplayMainTypeFilterWidget::VisualDatabaseDisplayMainTypeFilterWi
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
     layout->addWidget(flowWidget);
 
-    // Create a container for the threshold control
-    auto *thresholdLayout = new QHBoxLayout();
-    thresholdLayout->setContentsMargins(0, 0, 0, 0);
-
-    thresholdLabel = new QLabel(this);
-    thresholdLayout->addWidget(thresholdLabel);
-
     // Create the spinbox
     spinBox = new QSpinBox(this);
     spinBox->setMinimum(1);
-    spinBox->setMaximum(getMaxMainTypeCount());
+    spinBox->setMaximum(getMaxMainTypeCount()); // Set the max value dynamically
     spinBox->setValue(150);
-    thresholdLayout->addWidget(spinBox);
-    thresholdLayout->addStretch();
-
-    layout->addLayout(thresholdLayout);
-
-    connect(spinBox, qOverload<int>(&QSpinBox::valueChanged), this,
+    layout->addWidget(spinBox);
+    connect(spinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
             &VisualDatabaseDisplayMainTypeFilterWidget::updateMainTypeButtonsVisibility);
 
     // Create the toggle button for Exact Match/Includes mode
     toggleButton = new QPushButton(this);
+    toggleButton->setCheckable(true);
     layout->addWidget(toggleButton);
-    connect(toggleButton, &QPushButton::clicked, this, &VisualDatabaseDisplayMainTypeFilterWidget::updateFilterMode);
+    connect(toggleButton, &QPushButton::toggled, this, &VisualDatabaseDisplayMainTypeFilterWidget::updateFilterMode);
     connect(filterModel, &FilterTreeModel::layoutChanged, this, [this]() {
         QTimer::singleShot(100, this, &VisualDatabaseDisplayMainTypeFilterWidget::syncWithFilterModel);
     });
 
     createMainTypeButtons(); // Populate buttons initially
-    updateFilterMode();      // Initialize toggle button text
+    updateFilterMode(false); // Initialize toggle button text
 
     retranslateUi();
 }
 
 void VisualDatabaseDisplayMainTypeFilterWidget::retranslateUi()
 {
-    thresholdLabel->setText(tr("Show main types with at least:"));
-    spinBox->setSuffix(tr(" cards"));
     spinBox->setToolTip(tr("Do not display card main-types with less than this amount of cards in the database"));
     toggleButton->setToolTip(tr("Filter mode (AND/OR/NOT conjunctions of filters)"));
 }
@@ -76,8 +63,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;
@@ -172,9 +159,9 @@ void VisualDatabaseDisplayMainTypeFilterWidget::updateMainTypeFilter()
     emit filterModel->layoutChanged();
 }
 
-void VisualDatabaseDisplayMainTypeFilterWidget::updateFilterMode()
+void VisualDatabaseDisplayMainTypeFilterWidget::updateFilterMode(bool checked)
 {
-    exactMatchMode = !exactMatchMode;
+    exactMatchMode = checked;
     toggleButton->setText(exactMatchMode ? tr("Mode: Exact Match") : tr("Mode: Includes"));
     updateMainTypeFilter();
 }
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.h
index 9145812a7..9d6807b95 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,19 +1,13 @@
-/**
- * @file visual_database_display_main_type_filter_widget.h
- * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H
 
 #include "../../../filters/filter_tree_model.h"
 #include "../general/layout_containers/flow_widget.h"
 
-#include <QLabel>
 #include <QMap>
 #include <QPushButton>
 #include <QSpinBox>
+#include <QToolButton>
 #include <QVBoxLayout>
 #include <QWidget>
 
@@ -29,23 +23,21 @@ public:
 
     void handleMainTypeToggled(const QString &mainType, bool active);
     void updateMainTypeFilter();
-    void updateFilterMode();
+    void updateFilterMode(bool checked);
     void syncWithFilterModel();
 
 private:
     FilterTreeModel *filterModel;
     QMap<QString, int> allMainCardTypesWithCount;
-
-    QVBoxLayout *layout;
-    FlowWidget *flowWidget;
-    QLabel *thresholdLabel;
     QSpinBox *spinBox;
+    QHBoxLayout *layout;
+    FlowWidget *flowWidget;
     QPushButton *toggleButton; // Mode switch button
 
     QMap<QString, bool> activeMainTypes;      // Track active filters
     QMap<QString, QPushButton *> typeButtons; // Store toggle buttons
 
-    bool exactMatchMode = true; // Toggle between "Exact Match" and "Includes"
+    bool exactMatchMode = false; // Toggle between "Exact Match" and "Includes"
 };
 
 #endif // VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
index 2751ee971..75ab238be 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
@@ -1,9 +1,7 @@
 #include "visual_database_display_name_filter_widget.h"
 
-#include "../../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../deck_editor/deck_state_manager.h"
-#include "visual_database_display_filter_button.h"
+#include "../../../dialogs/dlg_load_deck_from_clipboard.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
 
 #include <QHBoxLayout>
 
@@ -53,7 +51,7 @@ VisualDatabaseDisplayNameFilterWidget::VisualDatabaseDisplayNameFilterWidget(QWi
 
 void VisualDatabaseDisplayNameFilterWidget::retranslateUi()
 {
-    searchBox->setPlaceholderText(tr("Filter by name... (Exact match)"));
+    searchBox->setPlaceholderText(tr("Filter by name..."));
     loadFromDeckButton->setText(tr("Load from Deck"));
     loadFromDeckButton->setToolTip(tr("Apply all card names in currently loaded deck as exact match name filters"));
     loadFromClipboardButton->setText(tr("Load from Clipboard"));
@@ -62,16 +60,28 @@ void VisualDatabaseDisplayNameFilterWidget::retranslateUi()
 
 void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck()
 {
-    DeckListModel *deckListModel = deckEditor->deckStateManager->getModel();
+    DeckListModel *deckListModel = deckEditor->deckDockWidget->deckModel;
 
     if (!deckListModel)
         return;
+    DeckList *decklist = deckListModel->getDeckList();
+    if (!decklist)
+        return;
+    InnerDecklistNode *listRoot = decklist->getRoot();
+    if (!listRoot)
+        return;
 
-    QList<QString> cardNames = deckListModel->getCardNames();
-    for (auto cardName : cardNames) {
-        createNameFilter(cardName);
+    for (int i = 0; i < listRoot->size(); i++) {
+        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+        if (!currentZone)
+            continue;
+        for (int j = 0; j < currentZone->size(); j++) {
+            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+            if (!currentCard)
+                continue;
+            createNameFilter(currentCard->getName());
+        }
     }
-
     updateFilterModel();
 }
 
@@ -81,7 +91,7 @@ void VisualDatabaseDisplayNameFilterWidget::actLoadFromClipboard()
     if (!dlg.exec())
         return;
 
-    QStringList cardsInClipboard = dlg.getDeckList().getCardList();
+    QStringList cardsInClipboard = dlg.getDeckList()->getCardList();
     for (QString cardName : cardsInClipboard) {
         createNameFilter(cardName);
     }
@@ -96,8 +106,8 @@ void VisualDatabaseDisplayNameFilterWidget::createNameFilter(const QString &name
 
     // 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);
@@ -121,14 +131,14 @@ void VisualDatabaseDisplayNameFilterWidget::updateFilterModel()
 {
     // Clear existing name filters
     emit filterModel->layoutAboutToBeChanged();
-    filterModel->clearFiltersOfType(CardFilter::Attr::AttrNameExact);
+    filterModel->clearFiltersOfType(CardFilter::Attr::AttrName);
 
     filterModel->blockSignals(true);
     filterModel->filterTree()->blockSignals(true);
 
     for (const auto &name : activeFilters.keys()) {
         QString nameString = name;
-        filterModel->addFilter(new CardFilter(nameString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrNameExact));
+        filterModel->addFilter(new CardFilter(nameString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrName));
     }
 
     filterModel->blockSignals(false);
@@ -144,7 +154,7 @@ void VisualDatabaseDisplayNameFilterWidget::updateFilterModel()
 void VisualDatabaseDisplayNameFilterWidget::syncWithFilterModel()
 {
     QStringList currentFilters;
-    for (const auto &filter : filterModel->getFiltersOfType(CardFilter::Attr::AttrNameExact)) {
+    for (const auto &filter : filterModel->getFiltersOfType(CardFilter::Attr::AttrName)) {
         if (filter->type() == CardFilter::Type::TypeOr) {
             currentFilters.append(filter->term());
         }
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.h
index 76d3ec29e..b977eb507 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,19 +1,14 @@
-/**
- * @file visual_database_display_name_filter_widget.h
- * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H
 
 #include "../../../filters/filter_tree_model.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
 #include "../general/layout_containers/flow_widget.h"
 
 #include <QLineEdit>
 #include <QMap>
 #include <QPushButton>
+#include <QVBoxLayout>
 #include <QWidget>
 
 class VisualDatabaseDisplayNameFilterWidget : public QWidget
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
index b72116461..691292a2d 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
@@ -1,22 +1,19 @@
 #include "visual_database_display_set_filter_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../filters/filter_tree.h"
 #include "../../../filters/filter_tree_model.h"
-#include "visual_database_display_filter_button.h"
+#include "../../../settings/cache_settings.h"
 
 #include <QLineEdit>
 #include <QPushButton>
 #include <QTimer>
 #include <algorithm>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/filters/filter_tree.h>
 
 VisualDatabaseDisplayRecentSetFilterSettingsWidget::VisualDatabaseDisplayRecentSetFilterSettingsWidget(QWidget *parent)
     : QWidget(parent)
 {
     layout = new QHBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-
     setLayout(layout);
 
     filterToMostRecentSetsCheckBox = new QCheckBox(this);
@@ -30,7 +27,7 @@ VisualDatabaseDisplayRecentSetFilterSettingsWidget::VisualDatabaseDisplayRecentS
     filterToMostRecentSetsAmount->setMaximum(100);
     filterToMostRecentSetsAmount->setValue(
         SettingsCache::instance().getVisualDatabaseDisplayFilterToMostRecentSetsAmount());
-    connect(filterToMostRecentSetsAmount, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
+    connect(filterToMostRecentSetsAmount, QOverload<int>::of(&QSpinBox::valueChanged), &SettingsCache::instance(),
             &SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsAmount);
 
     layout->addWidget(filterToMostRecentSetsCheckBox);
@@ -54,6 +51,14 @@ VisualDatabaseDisplaySetFilterWidget::VisualDatabaseDisplaySetFilterWidget(QWidg
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
+    recentSetsSettingsWidget = new VisualDatabaseDisplayRecentSetFilterSettingsWidget(this);
+    layout->addWidget(recentSetsSettingsWidget);
+
+    connect(&SettingsCache::instance(), &SettingsCache::visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged, this,
+            &VisualDatabaseDisplaySetFilterWidget::filterToRecentSets);
+    connect(&SettingsCache::instance(), &SettingsCache::visualDatabaseDisplayFilterToMostRecentSetsAmountChanged, this,
+            &VisualDatabaseDisplaySetFilterWidget::filterToRecentSets);
+
     searchBox = new QLineEdit(this);
     searchBox->setPlaceholderText(tr("Search sets..."));
     layout->addWidget(searchBox);
@@ -63,23 +68,15 @@ VisualDatabaseDisplaySetFilterWidget::VisualDatabaseDisplaySetFilterWidget(QWidg
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
     layout->addWidget(flowWidget);
 
-    recentSetsSettingsWidget = new VisualDatabaseDisplayRecentSetFilterSettingsWidget(this);
-    layout->addWidget(recentSetsSettingsWidget);
-
-    connect(&SettingsCache::instance(), &SettingsCache::visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged, this,
-            &VisualDatabaseDisplaySetFilterWidget::filterToRecentSets);
-    connect(&SettingsCache::instance(), &SettingsCache::visualDatabaseDisplayFilterToMostRecentSetsAmountChanged, this,
-            &VisualDatabaseDisplaySetFilterWidget::filterToRecentSets);
-
     // Create the toggle button for Exact Match/Includes mode
     toggleButton = new QPushButton(this);
+    toggleButton->setCheckable(true);
     layout->addWidget(toggleButton);
-    connect(toggleButton, &QPushButton::clicked, this, &VisualDatabaseDisplaySetFilterWidget::updateFilterMode);
+    connect(toggleButton, &QPushButton::toggled, this, &VisualDatabaseDisplaySetFilterWidget::updateFilterMode);
     connect(filterModel, &FilterTreeModel::layoutChanged, this,
             [this]() { QTimer::singleShot(100, this, &VisualDatabaseDisplaySetFilterWidget::syncWithFilterModel); });
 
     createSetButtons(); // Populate buttons initially
-    updateFilterMode();
     retranslateUi();
 }
 
@@ -90,7 +87,7 @@ void VisualDatabaseDisplaySetFilterWidget::retranslateUi()
 
 void VisualDatabaseDisplaySetFilterWidget::createSetButtons()
 {
-    CardSetList allSets = CardDatabaseManager::getInstance()->getSetList();
+    SetList allSets = CardDatabaseManager::getInstance()->getSetList();
 
     // Sort by release date
     std::sort(allSets.begin(), allSets.end(),
@@ -102,8 +99,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;
@@ -123,7 +120,7 @@ void VisualDatabaseDisplaySetFilterWidget::filterToRecentSets()
             activeSets[set] = false;
         }
 
-        CardSetList allSets = CardDatabaseManager::getInstance()->getSetList();
+        SetList allSets = CardDatabaseManager::getInstance()->getSetList();
 
         // Sort by release date
         std::sort(allSets.begin(), allSets.end(),
@@ -267,16 +264,9 @@ void VisualDatabaseDisplaySetFilterWidget::syncWithFilterModel()
     }
 }
 
-void VisualDatabaseDisplaySetFilterWidget::updateFilterMode()
+void VisualDatabaseDisplaySetFilterWidget::updateFilterMode(bool checked)
 {
-    // Disconnect the layoutChanged -> sync lambda temporarily
-    disconnect(filterModel, &FilterTreeModel::layoutChanged, this, nullptr);
-
-    exactMatchMode = !exactMatchMode;
+    exactMatchMode = checked;
     updateSetFilter();
     retranslateUi();
-
-    // Reconnect the layoutChanged -> sync lambda
-    connect(filterModel, &FilterTreeModel::layoutChanged, this,
-            [this]() { QTimer::singleShot(100, this, &VisualDatabaseDisplaySetFilterWidget::syncWithFilterModel); });
 }
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.h
index dc7fd0e92..7960ec45c 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,9 +1,3 @@
-/**
- * @file visual_database_display_set_filter_widget.h
- * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H
 
@@ -15,6 +9,7 @@
 #include <QMap>
 #include <QPushButton>
 #include <QSpinBox>
+#include <QToolButton>
 #include <QVBoxLayout>
 #include <QWidget>
 
@@ -44,7 +39,7 @@ public:
 
     void updateSetFilter();
     void syncWithFilterModel();
-    void updateFilterMode();
+    void updateFilterMode(bool checked);
 
 private:
     FilterTreeModel *filterModel;
@@ -60,7 +55,7 @@ private:
     QMap<QString, QPushButton *> setButtons;  // Store set filter buttons
     QMap<QString, bool> activeSets;           // Track active set filters
 
-    bool exactMatchMode = true; // Toggle between "Exact Match" and "Includes"
+    bool exactMatchMode = false; // Toggle between "Exact Match" and "Includes"
 };
 
 #endif // VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
index 6d4bcb58e..9c531ba1a 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,15 +1,13 @@
 #include "visual_database_display_sub_type_filter_widget.h"
 
+#include "../../../database/card_database_manager.h"
+#include "../../../filters/filter_tree.h"
 #include "../../../filters/filter_tree_model.h"
-#include "visual_database_display_filter_button.h"
 
-#include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
 #include <QSpinBox>
 #include <QTimer>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/filters/filter_tree.h>
 
 VisualDatabaseDisplaySubTypeFilterWidget::VisualDatabaseDisplaySubTypeFilterWidget(QWidget *parent,
                                                                                    FilterTreeModel *_filterModel)
@@ -22,6 +20,15 @@ VisualDatabaseDisplaySubTypeFilterWidget::VisualDatabaseDisplaySubTypeFilterWidg
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
+    // Create and setup the spinbox
+    spinBox = new QSpinBox(this);
+    spinBox->setMinimum(1);
+    spinBox->setMaximum(getMaxSubTypeCount());
+    spinBox->setValue(150);
+    layout->addWidget(spinBox);
+    connect(spinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
+            &VisualDatabaseDisplaySubTypeFilterWidget::updateSubTypeButtonsVisibility);
+
     // Create search box
     searchBox = new QLineEdit(this);
     searchBox->setPlaceholderText(tr("Search subtypes..."));
@@ -33,44 +40,23 @@ VisualDatabaseDisplaySubTypeFilterWidget::VisualDatabaseDisplaySubTypeFilterWidg
     flowWidget->setMaximumHeight(300);
     layout->addWidget(flowWidget);
 
-    // Create a container for the threshold control
-    auto *thresholdLayout = new QHBoxLayout();
-    thresholdLayout->setContentsMargins(0, 0, 0, 0);
-
-    thresholdLabel = new QLabel(this);
-    thresholdLayout->addWidget(thresholdLabel);
-
-    // Create the spinbox
-    spinBox = new QSpinBox(this);
-    spinBox->setMinimum(1);
-    spinBox->setMaximum(getMaxSubTypeCount());
-    spinBox->setValue(150);
-    thresholdLayout->addWidget(spinBox);
-    thresholdLayout->addStretch();
-
-    layout->addLayout(thresholdLayout);
-
-    connect(spinBox, qOverload<int>(&QSpinBox::valueChanged), this,
-            &VisualDatabaseDisplaySubTypeFilterWidget::updateSubTypeButtonsVisibility);
-
     // Toggle button setup (Exact Match / Includes mode)
     toggleButton = new QPushButton(this);
+    toggleButton->setCheckable(true);
     layout->addWidget(toggleButton);
-    connect(toggleButton, &QPushButton::clicked, this, &VisualDatabaseDisplaySubTypeFilterWidget::updateFilterMode);
+    connect(toggleButton, &QPushButton::toggled, this, &VisualDatabaseDisplaySubTypeFilterWidget::updateFilterMode);
     connect(filterModel, &FilterTreeModel::layoutChanged, this, [this]() {
         QTimer::singleShot(100, this, &VisualDatabaseDisplaySubTypeFilterWidget::syncWithFilterModel);
     });
 
-    createSubTypeButtons(); // Populate buttons initially
-    updateFilterMode();     // Initialize the toggle button text
+    createSubTypeButtons();  // Populate buttons initially
+    updateFilterMode(false); // Initialize the toggle button text
 
     retranslateUi();
 }
 
 void VisualDatabaseDisplaySubTypeFilterWidget::retranslateUi()
 {
-    thresholdLabel->setText(tr("Show sub types with at least:"));
-    spinBox->setSuffix(tr(" cards"));
     spinBox->setToolTip(tr("Do not display card sub-types with less than this amount of cards in the database"));
     toggleButton->setToolTip(tr("Filter mode (AND/OR/NOT conjunctions of filters)"));
 }
@@ -81,8 +67,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;
@@ -169,7 +155,7 @@ void VisualDatabaseDisplaySubTypeFilterWidget::updateSubTypeFilter()
             if (activeSubTypes[type]) {
                 QString typeString = type;
                 filterModel->addFilter(
-                    new CardFilter(typeString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrSubType));
+                    new CardFilter(typeString, CardFilter::Type::TypeAnd, CardFilter::Attr::AttrSubType));
             }
         }
     }
@@ -180,9 +166,9 @@ void VisualDatabaseDisplaySubTypeFilterWidget::updateSubTypeFilter()
     emit filterModel->layoutChanged();
 }
 
-void VisualDatabaseDisplaySubTypeFilterWidget::updateFilterMode()
+void VisualDatabaseDisplaySubTypeFilterWidget::updateFilterMode(bool checked)
 {
-    exactMatchMode = !exactMatchMode;
+    exactMatchMode = checked;
     toggleButton->setText(exactMatchMode ? tr("Mode: Exact Match") : tr("Mode: Includes"));
     updateSubTypeFilter();
 }
@@ -202,7 +188,7 @@ void VisualDatabaseDisplaySubTypeFilterWidget::syncWithFilterModel()
     // Get active filters for sub types
     QSet<QString> activeTypes;
     for (const auto &filter : filterModel->getFiltersOfType(CardFilter::AttrSubType)) {
-        if (filter->type() == CardFilter::Type::TypeAnd || filter->type() == CardFilter::Type::TypeOr) {
+        if (filter->type() == CardFilter::Type::TypeAnd) {
             activeTypes.insert(filter->term());
         }
     }
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h
index ce5546fc8..d8a3c831e 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h
@@ -1,19 +1,14 @@
-/**
- * @file visual_database_display_sub_type_filter_widget.h
- * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H
 
 #include "../../../filters/filter_tree_model.h"
 #include "../general/layout_containers/flow_widget.h"
 
-#include <QLabel>
 #include <QMap>
 #include <QPushButton>
 #include <QSpinBox>
+#include <QToolButton>
+#include <QVBoxLayout>
 #include <QWidget>
 
 class VisualDatabaseDisplaySubTypeFilterWidget : public QWidget
@@ -24,28 +19,26 @@ public:
     void retranslateUi();
     void createSubTypeButtons();
     void updateSubTypeButtonsVisibility();
-    [[nodiscard]] int getMaxSubTypeCount() const;
+    int getMaxSubTypeCount() const;
 
     void handleSubTypeToggled(const QString &mainType, bool active);
     void updateSubTypeFilter();
-    void updateFilterMode();
+    void updateFilterMode(bool checked);
     void syncWithFilterModel();
 
 private:
     FilterTreeModel *filterModel;
     QMap<QString, int> allSubCardTypesWithCount;
-
+    QSpinBox *spinBox;
     QVBoxLayout *layout;
     QLineEdit *searchBox;
     FlowWidget *flowWidget;
-    QLabel *thresholdLabel;
-    QSpinBox *spinBox;
     QPushButton *toggleButton; // Mode switch button
 
     QMap<QString, bool> activeSubTypes;       // Track active filters
     QMap<QString, QPushButton *> typeButtons; // Store toggle buttons
 
-    bool exactMatchMode = true; // Toggle between "Exact Match" and "Includes"
+    bool exactMatchMode = false; // Toggle between "Exact Match" and "Includes"
 };
 
 #endif // VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
index 44a9e98a0..95a463b23 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
@@ -1,12 +1,15 @@
 #include "visual_database_display_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../database/card_database.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../deck/custom_line_edit.h"
 #include "../../../filters/filter_tree_model.h"
 #include "../../../filters/syntax_help.h"
+#include "../../../settings/cache_settings.h"
+#include "../../../utility/card_info_comparator.h"
 #include "../../pixel_map_generator.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.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"
 #include "visual_database_display_main_type_filter_widget.h"
@@ -16,10 +19,7 @@
 
 #include <QHeaderView>
 #include <QScrollBar>
-#include <QStyledItemDelegate>
-#include <libcockatrice/card/card_info_comparator.h>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
+#include <qpropertyanimation.h>
 #include <utility>
 
 VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
@@ -42,9 +42,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     mainLayout->setContentsMargins(0, 0, 0, 0);
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded);
-    cardSizeWidget = new CardSizeWidget(this, flowWidget, SettingsCache::instance().getVisualDatabaseDisplayCardSize());
-    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
-            &SettingsCache::setVisualDatabaseDisplayCardSize);
+    cardSizeWidget = new CardSizeWidget(this, flowWidget);
 
     searchContainer = new QWidget(this);
     searchLayout = new QHBoxLayout(searchContainer);
@@ -62,48 +60,37 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     setFocusProxy(searchEdit);
     setFocusPolicy(Qt::ClickFocus);
 
-    displayModeButton = new QPushButton(tr("Visual"), this);
-    displayModeButton->setCheckable(true); // Toggle button
-
-    connect(displayModeButton, &QPushButton::toggled, this, &VisualDatabaseDisplayWidget::onDisplayModeChanged);
-
-    displayModeButton->setChecked(false); // Start in Visual mode
-
     filterModel = new FilterTreeModel();
     filterModel->setObjectName("filterModel");
 
     searchKeySignals.setObjectName("searchKeySignals");
-    connect(searchEdit, &SearchLineEdit::textChanged, this, &VisualDatabaseDisplayWidget::updateSearch);
+    connect(searchEdit, &QLineEdit::textChanged, this, &VisualDatabaseDisplayWidget::updateSearch);
+    /*connect(&searchKeySignals, SIGNAL(onEnter()), this, SLOT(actAddCard()));
+    connect(&searchKeySignals, SIGNAL(onCtrlAltEqual()), this, SLOT(actAddCard()));
+    connect(&searchKeySignals, SIGNAL(onCtrlAltRBracket()), this, SLOT(actAddCardToSideboard()));
+    connect(&searchKeySignals, SIGNAL(onCtrlAltMinus()), this, SLOT(actDecrementCard()));
+    connect(&searchKeySignals, SIGNAL(onCtrlAltLBracket()), this, SLOT(actDecrementCardFromSideboard()));
+    connect(&searchKeySignals, SIGNAL(onCtrlAltEnter()), this, SLOT(actAddCardToSideboard()));
+    connect(&searchKeySignals, SIGNAL(onCtrlEnter()), this, SLOT(actAddCardToSideboard()));
+    connect(&searchKeySignals, SIGNAL(onCtrlC()), this, SLOT(copyDatabaseCellContents()));*/
 
-    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 = new QTreeView(this);
+    databaseView->setObjectName("databaseView");
     databaseView->setFocusProxy(searchEdit);
+    databaseView->setRootIsDecorated(false);
     databaseView->setItemDelegate(nullptr);
+    databaseView->setSortingEnabled(true);
+    databaseView->sortByColumn(0, Qt::AscendingOrder);
+    databaseView->setModel(databaseDisplayModel);
     databaseView->setVisible(false);
 
     searchEdit->setTreeView(databaseView);
 
     colorFilterWidget = new VisualDatabaseDisplayColorFilterWidget(this, filterModel);
 
-    filterContainer = new VisualDatabaseDisplayFilterToolbarWidget(this);
+    filterContainer = new QWidget(this);
+    filterContainerLayout = new QHBoxLayout(filterContainer);
+    filterContainer->setLayout(filterContainerLayout);
 
     clearFilterWidget = new QToolButton();
     clearFilterWidget->setFixedSize(32, 32);
@@ -118,6 +105,20 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
         emit filterModel->layoutChanged();
     });
 
+    quickFilterSaveLoadWidget = new SettingsButtonWidget(this);
+    quickFilterSaveLoadWidget->setButtonIcon(QPixmap("theme:icons/lock"));
+
+    quickFilterNameWidget = new SettingsButtonWidget(this);
+    quickFilterNameWidget->setButtonIcon(QPixmap("theme:icons/rename"));
+
+    quickFilterSubTypeWidget = new SettingsButtonWidget(this);
+    quickFilterSubTypeWidget->setButtonIcon(QPixmap("theme:icons/player"));
+
+    quickFilterSetWidget = new SettingsButtonWidget(this);
+    quickFilterSetWidget->setButtonIcon(QPixmap("theme:icons/scales"));
+
+    filterContainer->setMaximumHeight(80);
+
     databaseLoadIndicator = new QLabel(this);
     databaseLoadIndicator->setAlignment(Qt::AlignCenter);
 
@@ -126,7 +127,10 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     if (CardDatabaseManager::getInstance()->getLoadStatus() != LoadStatus::Ok) {
         connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
                 &VisualDatabaseDisplayWidget::initialize);
-        filterContainer->setVisible(false);
+        quickFilterSaveLoadWidget->setVisible(false);
+        quickFilterNameWidget->setVisible(false);
+        quickFilterSubTypeWidget->setVisible(false);
+        quickFilterSetWidget->setVisible(false);
     } else {
         initialize();
         databaseLoadIndicator->setVisible(false);
@@ -139,19 +143,36 @@ void VisualDatabaseDisplayWidget::initialize()
 {
     databaseLoadIndicator->setVisible(false);
 
-    filterContainer->initialize();
+    quickFilterSaveLoadWidget->setVisible(true);
+    quickFilterNameWidget->setVisible(true);
+    quickFilterSubTypeWidget->setVisible(true);
+    quickFilterSetWidget->setVisible(true);
+
+    saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel);
+    nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, deckEditor, filterModel);
+    mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel);
+    subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel);
+    setFilterWidget = new VisualDatabaseDisplaySetFilterWidget(this, filterModel);
+
+    quickFilterSaveLoadWidget->addSettingsWidget(saveLoadWidget);
+    quickFilterNameWidget->addSettingsWidget(nameFilterWidget);
+    quickFilterSubTypeWidget->addSettingsWidget(subTypeFilterWidget);
+    quickFilterSetWidget->addSettingsWidget(setFilterWidget);
+
+    filterContainerLayout->addWidget(quickFilterSaveLoadWidget);
+    filterContainerLayout->addWidget(quickFilterNameWidget);
+    filterContainerLayout->addWidget(quickFilterSubTypeWidget);
+    filterContainerLayout->addWidget(quickFilterSetWidget);
+    filterContainerLayout->addWidget(mainTypeFilterWidget);
 
     searchLayout->addWidget(colorFilterWidget);
     searchLayout->addWidget(clearFilterWidget);
     searchLayout->addWidget(searchEdit);
-    searchLayout->addWidget(displayModeButton);
 
     mainLayout->addWidget(searchContainer);
 
     mainLayout->addWidget(filterContainer);
 
-    mainLayout->addWidget(databaseView);
-
     mainLayout->addWidget(flowWidget);
 
     mainLayout->addWidget(cardSizeWidget);
@@ -159,11 +180,11 @@ void VisualDatabaseDisplayWidget::initialize()
     debounceTimer = new QTimer(this);
     debounceTimer->setSingleShot(true); // Ensure it only fires once after the timeout
 
-    connect(debounceTimer, &QTimer::timeout, this, &VisualDatabaseDisplayWidget::onSearchModelChanged);
+    connect(debounceTimer, &QTimer::timeout, this, &VisualDatabaseDisplayWidget::searchModelChanged);
 
     databaseDisplayModel->setFilterTree(filterModel->filterTree());
 
-    connect(filterModel, &FilterTreeModel::layoutChanged, this, &VisualDatabaseDisplayWidget::onSearchModelChanged);
+    connect(filterModel, &FilterTreeModel::layoutChanged, this, &VisualDatabaseDisplayWidget::searchModelChanged);
 
     loadCardsTimer = new QTimer(this);
     loadCardsTimer->setSingleShot(true); // Ensure it only fires once after the timeout
@@ -177,7 +198,13 @@ void VisualDatabaseDisplayWidget::initialize()
 void VisualDatabaseDisplayWidget::retranslateUi()
 {
     databaseLoadIndicator->setText(tr("Loading database ..."));
+
     clearFilterWidget->setToolTip(tr("Clear all filters"));
+
+    quickFilterSaveLoadWidget->setToolTip(tr("Save and load filters"));
+    quickFilterNameWidget->setToolTip(tr("Filter by exact card name"));
+    quickFilterSubTypeWidget->setToolTip(tr("Filter by card sub-type"));
+    quickFilterSetWidget->setToolTip(tr("Filter by set"));
 }
 
 void VisualDatabaseDisplayWidget::resizeEvent(QResizeEvent *event)
@@ -186,25 +213,6 @@ void VisualDatabaseDisplayWidget::resizeEvent(QResizeEvent *event)
     loadCurrentPage();
 }
 
-void VisualDatabaseDisplayWidget::onDisplayModeChanged(bool checked)
-{
-    if (checked) {
-        // Table mode
-        displayModeButton->setText(tr("Table"));
-        flowWidget->setVisible(false);
-        cardSizeWidget->setVisible(false);
-        databaseView->setItemDelegate(new QStyledItemDelegate(databaseView));
-        databaseView->setVisible(true);
-    } else {
-        // Visual mode
-        displayModeButton->setText(tr("Visual"));
-        flowWidget->setVisible(true);
-        cardSizeWidget->setVisible(true);
-        databaseView->setVisible(false);
-        populateCards();
-    }
-}
-
 void VisualDatabaseDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance)
 {
     emit cardClickedDatabaseDisplay(event, instance);
@@ -236,21 +244,19 @@ void VisualDatabaseDisplayWidget::updateSearch(const QString &search) const
                                                         QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
 }
 
-void VisualDatabaseDisplayWidget::onSearchModelChanged()
+void VisualDatabaseDisplayWidget::searchModelChanged()
 {
-    if (flowWidget->isVisible()) {
-        // Clear the current page and prepare for new data
-        flowWidget->clearLayout(); // Clear existing cards
-        cards->clear();            // Clear the card list
-        // Reset scrollbar position to the top after loading new cards
-        if (QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar()) {
-            scrollBar->setValue(0); // Reset scrollbar to top
-        }
-
-        currentPage = 0;
-        loadCurrentPage();
-        qCDebug(VisualDatabaseDisplayLog) << "Search model changed";
+    // Clear the current page and prepare for new data
+    flowWidget->clearLayout(); // Clear existing cards
+    cards->clear();            // Clear the card list
+    // Reset scrollbar position to the top after loading new cards
+    if (QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar()) {
+        scrollBar->setValue(0); // Reset scrollbar to top
     }
+
+    currentPage = 0;
+    loadCurrentPage();
+    qCDebug(VisualDatabaseDisplayLog) << "Search model changed";
 }
 
 void VisualDatabaseDisplayWidget::loadCurrentPage()
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 3aa8d7f8e..ec7bc9d5c 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,29 +1,30 @@
-/**
- * @file visual_database_display_widget.h
- * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_WIDGET_H
 
+#include "../../../database/card_database.h"
+#include "../../../database/model/card_database_model.h"
+#include "../../../deck/custom_line_edit.h"
+#include "../../../deck/deck_list_model.h"
 #include "../../../filters/filter_tree_model.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../../key_signals.h"
+#include "../../../tabs/abstract_tab_deck_editor.h"
+#include "../../../utility/key_signals.h"
+#include "../../layouts/flow_layout.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "../general/layout_containers/overlap_control_widget.h"
-#include "../utility/custom_line_edit.h"
 #include "visual_database_display_color_filter_widget.h"
-#include "visual_database_display_filter_toolbar_widget.h"
+#include "visual_database_display_filter_save_load_widget.h"
+#include "visual_database_display_main_type_filter_widget.h"
+#include "visual_database_display_name_filter_widget.h"
+#include "visual_database_display_set_filter_widget.h"
+#include "visual_database_display_sub_type_filter_widget.h"
 
 #include <QLoggingCategory>
+#include <QTreeView>
 #include <QVBoxLayout>
 #include <QWheelEvent>
 #include <QWidget>
-#include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <qscrollarea.h>
 
 inline Q_LOGGING_CATEGORY(VisualDatabaseDisplayLog, "visual_database_display");
@@ -47,30 +48,14 @@ 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;
-    }
-
-    QTreeView *getDatabaseView()
-    {
-        return databaseView;
-    }
-
     QWidget *searchContainer;
     QHBoxLayout *searchLayout;
     SearchLineEdit *searchEdit;
-    QPushButton *displayModeButton;
     FilterTreeModel *filterModel;
     VisualDatabaseDisplayColorFilterWidget *colorFilterWidget;
 
 public slots:
-    void onSearchModelChanged();
+    void searchModelChanged();
 
 signals:
     void cardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
@@ -85,13 +70,21 @@ protected slots:
     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;
+    QWidget *filterContainer;
+    QHBoxLayout *filterContainerLayout;
+    SettingsButtonWidget *quickFilterSaveLoadWidget;
+    VisualDatabaseDisplayFilterSaveLoadWidget *saveLoadWidget;
+    SettingsButtonWidget *quickFilterNameWidget;
+    VisualDatabaseDisplayNameFilterWidget *nameFilterWidget;
+    VisualDatabaseDisplayMainTypeFilterWidget *mainTypeFilterWidget;
+    SettingsButtonWidget *quickFilterSubTypeWidget;
+    VisualDatabaseDisplaySubTypeFilterWidget *subTypeFilterWidget;
+    SettingsButtonWidget *quickFilterSetWidget;
+    VisualDatabaseDisplaySetFilterWidget *setFilterWidget;
     KeySignals searchKeySignals;
     AbstractTabDeckEditor *deckEditor;
     CardDatabaseModel *databaseModel;
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
index 5364fa813..3f6c2d104 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
@@ -1,6 +1,6 @@
 #include "visual_database_filter_display_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../settings/cache_settings.h"
 
 #include <QDir>
 #include <QFile>
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.h
index 05bf43118..f8aabd144 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,9 +1,3 @@
-/**
- * @file visual_database_filter_display_widget.h
- * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
- */
-
 #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
deleted file mode 100644
index 79a98fda6..000000000
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-#include "visual_deck_display_options_widget.h"
-
-#include "../tabs/visual_deck_editor/tab_deck_editor_visual.h"
-
-#include <libcockatrice/utility/qt_utils.h>
-
-VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent) : QWidget(parent)
-{
-    groupAndSortLayout = new QHBoxLayout(this);
-    groupAndSortLayout->setContentsMargins(0, 0, 0, 0);
-    groupAndSortLayout->setSpacing(3);
-    groupAndSortLayout->setAlignment(Qt::AlignLeft);
-    this->setLayout(groupAndSortLayout);
-
-    groupByLabel = new QLabel(this);
-
-    groupByComboBox = new QComboBox(this);
-
-    if (auto tab = QtUtils::findParentOfType<TabDeckEditorVisual>(this)) {
-        auto originalBox = tab->getDeckDockWidget()->getGroupByComboBox();
-        groupByComboBox->setModel(originalBox->model());
-        groupByComboBox->setModelColumn(originalBox->modelColumn());
-
-        // Original -> clone
-        connect(originalBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-                [this](int index) { groupByComboBox->setCurrentIndex(index); });
-
-        // Clone -> original
-        connect(groupByComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-                [originalBox](int index) { originalBox->setCurrentIndex(index); });
-    } else {
-        groupByComboBox->addItem(
-            tr(qPrintable(DeckListModelGroupCriteria::toString(DeckListModelGroupCriteria::MAIN_TYPE))),
-            DeckListModelGroupCriteria::MAIN_TYPE);
-        groupByComboBox->addItem(
-            tr(qPrintable(DeckListModelGroupCriteria::toString(DeckListModelGroupCriteria::MANA_COST))),
-            DeckListModelGroupCriteria::MANA_COST);
-        groupByComboBox->addItem(
-            tr(qPrintable(DeckListModelGroupCriteria::toString(DeckListModelGroupCriteria::COLOR))),
-            DeckListModelGroupCriteria::COLOR);
-        groupByComboBox->setMinimumWidth(300);
-        connect(groupByComboBox, QOverload<const QString &>::of(&QComboBox::currentTextChanged), this,
-                &VisualDeckDisplayOptionsWidget::groupCriteriaChanged);
-        emit groupCriteriaChanged(groupByComboBox->currentText());
-    }
-
-    sortByLabel = new QLabel(this);
-
-    sortCriteriaButton = new SettingsButtonWidget(this);
-    sortCriteriaButton->setButtonIcon(QPixmap("theme:icons/sort_arrow_down"));
-
-    sortLabel = new QLabel(sortCriteriaButton);
-    sortLabel->setWordWrap(true);
-
-    QStringList sortProperties = {"colors", "cmc", "name", "maintype"};
-    sortByListWidget = new QListWidget();
-    sortByListWidget->setSelectionMode(QAbstractItemView::SingleSelection);
-    sortByListWidget->setDragDropMode(QAbstractItemView::InternalMove);
-    sortByListWidget->setDefaultDropAction(Qt::MoveAction);
-
-    for (const QString &property : sortProperties) {
-        QListWidgetItem *item = new QListWidgetItem(property, sortByListWidget);
-        item->setFlags(item->flags() | Qt::ItemIsDragEnabled | Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    }
-
-    connect(sortByListWidget->model(), &QAbstractItemModel::rowsMoved, this,
-            &VisualDeckDisplayOptionsWidget::onSortCriteriaChange);
-    onSortCriteriaChange();
-
-    sortByListWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-
-    sortCriteriaButton->addSettingsWidget(sortLabel);
-    sortCriteriaButton->addSettingsWidget(sortByListWidget);
-
-    displayTypeButton = new QPushButton(this);
-    connect(displayTypeButton, &QPushButton::clicked, this, &VisualDeckDisplayOptionsWidget::updateDisplayType);
-
-    groupAndSortLayout->addWidget(groupByLabel);
-    groupAndSortLayout->addWidget(groupByComboBox);
-    groupAndSortLayout->addWidget(sortByLabel);
-    groupAndSortLayout->addWidget(sortCriteriaButton);
-    groupAndSortLayout->addWidget(displayTypeButton);
-
-    retranslateUi();
-}
-
-void VisualDeckDisplayOptionsWidget::retranslateUi()
-{
-    groupByLabel->setText(tr("Group by:"));
-    groupByComboBox->setToolTip(tr("Change how cards are divided into categories/groups."));
-    sortByLabel->setText(tr("Sort by:"));
-    sortLabel->setText(tr("Click and drag to change the sort order within the groups"));
-    sortCriteriaButton->setToolTip(tr("Configure how cards are sorted within their groups"));
-    displayTypeButton->setText(tr("Toggle Layout: Overlap"));
-    displayTypeButton->setToolTip(
-        tr("Change how cards are displayed within zones (i.e. overlapped or fully visible.)"));
-}
-
-void VisualDeckDisplayOptionsWidget::onSortCriteriaChange()
-{
-    QStringList selectedCriteria;
-    for (int i = 0; i < sortByListWidget->count(); ++i) {
-        QListWidgetItem *item = sortByListWidget->item(i);
-        selectedCriteria.append(item->text()); // Collect user-defined sort order
-    }
-
-    emit sortCriteriaChanged(selectedCriteria);
-}
-
-void VisualDeckDisplayOptionsWidget::updateDisplayType()
-{
-    // Toggle the display type
-    currentDisplayType = (currentDisplayType == DisplayType::Overlap) ? DisplayType::Flat : DisplayType::Overlap;
-
-    // Update UI and emit signal
-    switch (currentDisplayType) {
-        case DisplayType::Flat:
-            displayTypeButton->setText(tr("Toggle Layout: Flat"));
-            break;
-        case DisplayType::Overlap:
-            displayTypeButton->setText(tr("Toggle Layout: Overlap"));
-            break;
-    }
-    emit displayTypeChanged(currentDisplayType);
-}
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
deleted file mode 100644
index 7a447753f..000000000
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.h
+++ /dev/null
@@ -1,138 +0,0 @@
-#ifndef COCKATRICE_VISUAL_DECK_DISPLAY_OPTIONS_WIDGET_H
-#define COCKATRICE_VISUAL_DECK_DISPLAY_OPTIONS_WIDGET_H
-
-#include "visual_deck_editor_widget.h"
-
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QListWidget>
-#include <QPushButton>
-#include <QWidget>
-
-/**
- * @class VisualDeckDisplayOptionsWidget
- * @brief A widget that controls how deck cards are displayed in the visual deck editor.
- *
- * This widget provides:
- *  - A **group-by** selector (QComboBox)
- *  - A **sort-by** multi-criteria, draggable list (QListWidget within a SettingsButtonWidget)
- *  - A **display-type toggler** (flat vs. overlap layout)
- *
- * Depending on whether the parent is a VisualDeckEditorWidget, this widget can mirror the
- * original group by checkbox from the main deck editor UI to maintain synchronization.
- *
- * It emits signals whenever the grouping criterion, sorting criteria, or display mode changes.
- */
-class VisualDeckDisplayOptionsWidget : public QWidget
-{
-    Q_OBJECT
-signals:
-    /**
-     * @brief Emitted when the display type (flat or overlapping layout) changes.
-     * @param displayType The newly selected display layout.
-     */
-    void displayTypeChanged(const DisplayType &displayType);
-
-    /**
-     * @brief Emitted when a new grouping criterion is selected.
-     * @param activeGroupCriteria Name of the selected group-by criterion.
-     */
-    void groupCriteriaChanged(const QString &activeGroupCriteria);
-
-    /**
-     * @brief Emitted when the order of sort criteria changes.
-     * @param activeSortCriteria Ordered list of sorting keys.
-     */
-    void sortCriteriaChanged(const QStringList &activeSortCriteria);
-
-public slots:
-    /**
-     * @brief Updates all UI text for retranslation/localization.
-     *
-     * Called when the application language changes.
-     */
-    void retranslateUi();
-
-public:
-    /**
-     * @brief Constructs a new VisualDeckDisplayOptionsWidget.
-     * @param parent The parent QWidget—may trigger cloning of models if the parent is a visual deck editor.
-     */
-    explicit VisualDeckDisplayOptionsWidget(QWidget *parent);
-
-    /**
-     * @brief Gets the current display type (Overlap or Flat).
-     */
-    DisplayType getDisplayType() const
-    {
-        return currentDisplayType;
-    }
-
-    /**
-     * @brief Gets the currently active group-by criterion.
-     */
-    QString getActiveGroupCriteria() const
-    {
-        return activeGroupCriteria;
-    }
-
-    /**
-     * @brief Gets the currently active ordered sort criteria.
-     */
-    QStringList getActiveSortCriteria() const
-    {
-        return activeSortCriteria;
-    }
-
-private slots:
-    /**
-     * @brief Slot triggered whenever the sort list is reordered.
-     *
-     * Reads the QListWidget’s order and emits `sortCriteriaChanged()`.
-     */
-    void onSortCriteriaChange();
-
-    /**
-     * @brief Toggles the display layout between flat and overlapping modes.
-     *
-     * Emits `displayTypeChanged()`.
-     */
-    void updateDisplayType();
-
-private:
-    /// Layout for grouping and sorting UI elements.
-    QHBoxLayout *groupAndSortLayout;
-
-    /// Current deck display type.
-    DisplayType currentDisplayType = DisplayType::Overlap;
-
-    /// Button used to toggle the display layout.
-    QPushButton *displayTypeButton;
-
-    /// Label for the group-by selector.
-    QLabel *groupByLabel;
-
-    /// Combo box listing group-by criteria.
-    QComboBox *groupByComboBox;
-
-    /// Currently active group-by criterion.
-    QString activeGroupCriteria = "maintype";
-
-    /// Encapsulates the sort settings widgets (label + list).
-    SettingsButtonWidget *sortCriteriaButton;
-
-    /// Label for “Sort by”.
-    QLabel *sortByLabel;
-
-    /// Descriptive label inside the sort criteria button.
-    QLabel *sortLabel;
-
-    /// Draggable list of sort criteria.
-    QListWidget *sortByListWidget;
-
-    /// Ordered list of current sort criteria.
-    QStringList activeSortCriteria = {"name", "cmc", "colors", "maintype"};
-};
-
-#endif // COCKATRICE_VISUAL_DECK_DISPLAY_OPTIONS_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
deleted file mode 100644
index da4fe09e5..000000000
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "visual_deck_editor_placeholder_widget.h"
-
-VisualDeckEditorPlaceholderWidget::VisualDeckEditorPlaceholderWidget(QWidget *parent) : QWidget(parent)
-{
-    mainLayout = new QVBoxLayout(this);
-    mainLayout->setAlignment(Qt::AlignCenter);
-    setLayout(mainLayout);
-
-    // Image label with the background image
-    imageLabel = new QLabel(this);
-    imageLabel->setAlignment(Qt::AlignCenter);
-    imageLabel->setStyleSheet(R"(
-        QLabel {
-            background-image: url(theme:backgrounds/card_triplet.svg);
-            background-repeat: no-repeat;
-            background-position: center;
-        }
-    )");
-    imageLabel->setFixedSize(300, 300);
-
-    textLabel = new QLabel(this);
-    textLabel->setAlignment(Qt::AlignCenter);
-    textLabel->setWordWrap(true);
-    textLabel->setStyleSheet(R"(
-        QLabel {
-            color: palette(mid);
-            font-size: 14px;
-            padding: 10px;
-        }
-    )");
-
-    mainLayout->addWidget(imageLabel);
-    mainLayout->addWidget(textLabel);
-
-    retranslateUi();
-}
-
-void VisualDeckEditorPlaceholderWidget::retranslateUi()
-{
-    textLabel->setText(tr("Add cards using the search bar or database tab to have them appear here"));
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
deleted file mode 100644
index de2362a81..000000000
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef COCKATRICE_VISUAL_DECK_EDITOR_PLACEHOLDER_WIDGET_H
-#define COCKATRICE_VISUAL_DECK_EDITOR_PLACEHOLDER_WIDGET_H
-
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QWidget>
-
-class VisualDeckEditorPlaceholderWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit VisualDeckEditorPlaceholderWidget(QWidget *parent = nullptr);
-    void retranslateUi();
-
-private:
-    QVBoxLayout *mainLayout;
-    QLabel *imageLabel;
-    QLabel *textLabel;
-};
-
-#endif // COCKATRICE_VISUAL_DECK_EDITOR_PLACEHOLDER_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
index cc35372b0..0f3fc9e49 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
@@ -1,31 +1,20 @@
 #include "visual_deck_editor_sample_hand_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_loader.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../deck/deck_loader.h"
+#include "../../../settings/cache_settings.h"
 #include "../cards/card_info_picture_widget.h"
-#include "../deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h"
-#include "../deck_analytics/deck_list_statistics_analyzer.h"
 
-#include <QSplitter>
-#include <libcockatrice/card/database/card_database_manager.h>
 #include <random>
 
-VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent,
-                                                                   DeckListModel *_deckListModel,
-                                                                   DeckListStatisticsAnalyzer *_statsAnalyzer)
-    : QWidget(parent), deckListModel(_deckListModel), statsAnalyzer(_statsAnalyzer)
+VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent, DeckListModel *_deckListModel)
+    : QWidget(parent), deckListModel(_deckListModel)
 {
     layout = new QVBoxLayout(this);
-    layout->setSpacing(0);
     setLayout(layout);
 
-    auto upperLayout = new QVBoxLayout();
-    upperLayout->setContentsMargins(0, 0, 0, 0);
-    upperLayout->setSpacing(0);
-
     resetAndHandSizeContainerWidget = new QWidget(this);
     resetAndHandSizeLayout = new QHBoxLayout(resetAndHandSizeContainerWidget);
-    resetAndHandSizeLayout->setContentsMargins(11, 0, 11, 0);
     resetAndHandSizeContainerWidget->setLayout(resetAndHandSizeLayout);
 
     resetButton = new QPushButton(this);
@@ -35,33 +24,26 @@ VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *pare
     handSizeSpinBox = new QSpinBox(this);
     handSizeSpinBox->setValue(SettingsCache::instance().getVisualDeckEditorSampleHandSize());
     handSizeSpinBox->setMinimum(1);
-    connect(handSizeSpinBox, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
+    connect(handSizeSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), &SettingsCache::instance(),
             &SettingsCache::setVisualDeckEditorSampleHandSize);
-    connect(handSizeSpinBox, qOverload<int>(&QSpinBox::valueChanged), this,
+    connect(handSizeSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
             &VisualDeckEditorSampleHandWidget::updateDisplay);
     resetAndHandSizeLayout->addWidget(handSizeSpinBox);
 
-    upperLayout->addWidget(resetAndHandSizeContainerWidget);
+    layout->addWidget(resetAndHandSizeContainerWidget);
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
-    upperLayout->addWidget(flowWidget);
+    layout->addWidget(flowWidget);
 
     cardSizeWidget = new CardSizeWidget(this, flowWidget);
-    upperLayout->addWidget(cardSizeWidget);
+    layout->addWidget(cardSizeWidget);
 
-    auto upperLayoutWidget = new QWidget(this);
-    upperLayoutWidget->setLayout(upperLayout);
-
-    drawProbabilityWidget = new DrawProbabilityWidget(this, statsAnalyzer);
-
-    auto *splitter = new QSplitter(this);
-    splitter->setObjectName("splitter");
-    splitter->setOrientation(Qt::Vertical);
-
-    splitter->addWidget(upperLayoutWidget);
-    splitter->addWidget(drawProbabilityWidget);
-
-    layout->addWidget(splitter);
+    for (const ExactCard &card : getRandomCards(handSizeSpinBox->value())) {
+        auto displayWidget = new CardInfoPictureWidget(this);
+        displayWidget->setCard(card);
+        displayWidget->setScaleFactor(cardSizeWidget->getSlider()->value());
+        flowWidget->addWidget(displayWidget);
+    }
 
     retranslateUi();
 }
@@ -92,30 +74,40 @@ void VisualDeckEditorSampleHandWidget::updateDisplay()
     }
 }
 
-static QList<ExactCard> cardNodesToExactCards(QList<const DecklistCardNode *> nodes)
-{
-    QList<ExactCard> cards;
-    for (auto node : nodes) {
-        ExactCard card = CardDatabaseManager::query()->getCard(node->toCardRef());
-        if (card) {
-            for (int k = 0; k < node->getNumber(); ++k) {
-                cards.append(card);
-            }
-        } else {
-            qDebug() << "Card not found in database!";
-        }
-    }
-
-    return cards;
-}
-
 QList<ExactCard> VisualDeckEditorSampleHandWidget::getRandomCards(int amountToGet)
 {
+    QList<ExactCard> mainDeckCards;
     QList<ExactCard> randomCards;
     if (!deckListModel)
         return randomCards;
+    DeckList *decklist = deckListModel->getDeckList();
+    if (!decklist)
+        return randomCards;
+    InnerDecklistNode *listRoot = decklist->getRoot();
+    if (!listRoot)
+        return randomCards;
 
-    QList<ExactCard> mainDeckCards = cardNodesToExactCards(deckListModel->getCardNodesForZone(DECK_ZONE_MAIN));
+    // Collect all cards in the main deck, allowing duplicates based on their count
+    for (int i = 0; i < listRoot->size(); i++) {
+        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+        if (!currentZone)
+            continue;
+        if (currentZone->getName() != DECK_ZONE_MAIN)
+            continue; // Only process the main deck
+
+        for (int j = 0; j < currentZone->size(); j++) {
+            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+            if (!currentCard)
+                continue;
+
+            for (int k = 0; k < currentCard->getNumber(); ++k) {
+                ExactCard card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
+                if (card) {
+                    mainDeckCards.append(card);
+                }
+            }
+        }
+    }
 
     if (mainDeckCards.isEmpty())
         return randomCards;
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 c63c74a4d..4688c6ac4 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,29 +1,19 @@
-/**
- * @file visual_deck_editor_sample_hand_widget.h
- * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
 #define VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
 
+#include "../../../deck/deck_list_model.h"
 #include "../cards/card_size_widget.h"
-#include "../deck_analytics/deck_list_statistics_analyzer.h"
 #include "../general/layout_containers/flow_widget.h"
 
 #include <QPushButton>
 #include <QSpinBox>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
-class DrawProbabilityWidget;
 class VisualDeckEditorSampleHandWidget : public QWidget
 {
     Q_OBJECT
 public:
-    VisualDeckEditorSampleHandWidget(QWidget *parent,
-                                     DeckListModel *deckListModel,
-                                     DeckListStatisticsAnalyzer *statsAnalyzer);
+    VisualDeckEditorSampleHandWidget(QWidget *parent, DeckListModel *deckListModel);
     QList<ExactCard> getRandomCards(int amountToGet);
 
 public slots:
@@ -33,14 +23,12 @@ public slots:
 
 private:
     DeckListModel *deckListModel;
-    DeckListStatisticsAnalyzer *statsAnalyzer;
     QVBoxLayout *layout;
     QWidget *resetAndHandSizeContainerWidget;
     QHBoxLayout *resetAndHandSizeLayout;
     QPushButton *resetButton;
     QSpinBox *handSizeSpinBox;
     FlowWidget *flowWidget;
-    DrawProbabilityWidget *drawProbabilityWidget;
     CardSizeWidget *cardSizeWidget;
 };
 
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
index e957eb304..6a23d8215 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
@@ -1,15 +1,19 @@
 #include "visual_deck_editor_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../database/card_database.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../database/model/card/card_completer_proxy_model.h"
+#include "../../../database/model/card/card_search_model.h"
+#include "../../../database/model/card_database_model.h"
+#include "../../../deck/deck_list_model.h"
+#include "../../../deck/deck_loader.h"
 #include "../../../main.h"
-#include "../../deck_loader/deck_loader.h"
+#include "../../../utility/card_info_comparator.h"
 #include "../../layouts/overlap_layout.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../cards/deck_card_zone_display_widget.h"
 #include "../general/layout_containers/flow_widget.h"
-#include "../tabs/visual_deck_editor/tab_deck_editor_visual.h"
-#include "../tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h"
-#include "visual_deck_display_options_widget.h"
+#include "../general/layout_containers/overlap_control_widget.h"
 
 #include <QCheckBox>
 #include <QCompleter>
@@ -17,19 +21,10 @@
 #include <QLineEdit>
 #include <QPushButton>
 #include <QResizeEvent>
-#include <libcockatrice/card/card_info_comparator.h>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/database/card/card_completer_proxy_model.h>
-#include <libcockatrice/models/database/card/card_search_model.h>
-#include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <qscrollarea.h>
 
-VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
-                                               DeckListModel *_deckListModel,
-                                               QItemSelectionModel *_selectionModel)
-    : QWidget(parent), deckListModel(_deckListModel), selectionModel(_selectionModel)
+VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_deckListModel)
+    : QWidget(parent), deckListModel(_deckListModel)
 {
     // The Main Widget and Main Layout, which contain a single Widget: The Scroll Area
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -38,37 +33,10 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
     mainLayout->setContentsMargins(9, 0, 9, 5);
     mainLayout->setSpacing(0);
 
-    initializeDisplayOptionsAndSearchWidget();
+    searchContainer = new QWidget(this);
+    searchLayout = new QHBoxLayout(searchContainer);
+    searchContainer->setLayout(searchLayout);
 
-    initializeScrollAreaAndZoneContainer();
-
-    cardSizeWidget = new CardSizeWidget(this, nullptr, SettingsCache::instance().getVisualDeckEditorCardSize());
-    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckEditorCardSize);
-
-    mainLayout->addWidget(displayOptionsAndSearch);
-    mainLayout->addWidget(scrollArea);
-    mainLayout->addWidget(cardSizeWidget);
-
-    connectDeckListModel();
-
-    constructZoneWidgetsFromDeckListModel();
-
-    if (selectionModel) {
-        connect(selectionModel, &QItemSelectionModel::selectionChanged, this,
-                &VisualDeckEditorWidget::onSelectionChanged);
-    }
-
-    updatePlaceholderVisibility();
-    retranslateUi();
-}
-
-// =====================================================================================================================
-//                                                  Constructor helpers
-// =====================================================================================================================
-
-void VisualDeckEditorWidget::initializeSearchBarAndCompleter()
-{
     searchBar = new QLineEdit(this);
     connect(searchBar, &QLineEdit::returnPressed, this, [=, this]() {
         if (!searchBar->hasFocus())
@@ -140,38 +108,57 @@ void VisualDeckEditorWidget::initializeSearchBarAndCompleter()
             emit cardAdditionRequested(card);
         }
     });
-}
 
-void VisualDeckEditorWidget::initializeDisplayOptionsWidget()
-{
-    displayOptionsWidget = new VisualDeckDisplayOptionsWidget(this);
-    connect(displayOptionsWidget, &VisualDeckDisplayOptionsWidget::displayTypeChanged, this,
-            &VisualDeckEditorWidget::displayTypeChanged);
-    connect(displayOptionsWidget, &VisualDeckDisplayOptionsWidget::groupCriteriaChanged, this,
-            &VisualDeckEditorWidget::activeGroupCriteriaChanged);
-    connect(displayOptionsWidget, &VisualDeckDisplayOptionsWidget::sortCriteriaChanged, this,
-            &VisualDeckEditorWidget::activeSortCriteriaChanged);
-}
+    searchLayout->addWidget(searchBar);
+    searchLayout->addWidget(searchPushButton);
 
-void VisualDeckEditorWidget::initializeDisplayOptionsAndSearchWidget()
-{
-    initializeSearchBarAndCompleter();
+    mainLayout->addWidget(searchContainer);
 
-    initializeDisplayOptionsWidget();
+    groupAndSortContainer = new QWidget(this);
+    groupAndSortLayout = new QHBoxLayout(groupAndSortContainer);
+    groupAndSortLayout->setAlignment(Qt::AlignLeft);
+    groupAndSortContainer->setLayout(groupAndSortLayout);
 
-    displayOptionsAndSearch = new QWidget(this);
-    displayOptionsAndSearchLayout = new QHBoxLayout(displayOptionsAndSearch);
-    displayOptionsAndSearchLayout->setContentsMargins(0, 0, 0, 0);
-    displayOptionsAndSearchLayout->setAlignment(Qt::AlignLeft);
-    displayOptionsAndSearch->setLayout(displayOptionsAndSearchLayout);
+    groupByComboBox = new QComboBox();
+    QStringList groupProperties = {"maintype", "colors", "cmc", "name"};
+    groupByComboBox->addItems(groupProperties);
+    groupByComboBox->setMinimumWidth(300);
+    connect(groupByComboBox, QOverload<const QString &>::of(&QComboBox::currentTextChanged), this,
+            &VisualDeckEditorWidget::actChangeActiveGroupCriteria);
+    actChangeActiveGroupCriteria();
 
-    displayOptionsAndSearchLayout->addWidget(displayOptionsWidget);
-    displayOptionsAndSearchLayout->addWidget(searchBar);
-    displayOptionsAndSearchLayout->addWidget(searchPushButton);
-}
+    sortCriteriaButton = new SettingsButtonWidget(this);
+
+    sortLabel = new QLabel(sortCriteriaButton);
+    sortLabel->setWordWrap(true);
+
+    QStringList sortProperties = {"colors", "cmc", "name", "maintype"};
+    sortByListWidget = new QListWidget();
+    sortByListWidget->setSelectionMode(QAbstractItemView::SingleSelection);
+    sortByListWidget->setDragDropMode(QAbstractItemView::InternalMove);
+    sortByListWidget->setDefaultDropAction(Qt::MoveAction);
+
+    for (const QString &property : sortProperties) {
+        QListWidgetItem *item = new QListWidgetItem(property, sortByListWidget);
+        item->setFlags(item->flags() | Qt::ItemIsDragEnabled | Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+    }
+
+    connect(sortByListWidget->model(), &QAbstractItemModel::rowsMoved, this,
+            &VisualDeckEditorWidget::actChangeActiveSortCriteria);
+    actChangeActiveSortCriteria();
+
+    sortByListWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+
+    sortCriteriaButton->addSettingsWidget(sortLabel);
+    sortCriteriaButton->addSettingsWidget(sortByListWidget);
+
+    displayTypeButton = new QPushButton(this);
+    connect(displayTypeButton, &QPushButton::clicked, this, &VisualDeckEditorWidget::updateDisplayType);
+
+    groupAndSortLayout->addWidget(groupByComboBox);
+    groupAndSortLayout->addWidget(sortCriteriaButton);
+    groupAndSortLayout->addWidget(displayTypeButton);
 
-void VisualDeckEditorWidget::initializeScrollAreaAndZoneContainer()
-{
     scrollArea = new QScrollArea(this);
     scrollArea->setWidgetResizable(true);
     scrollArea->setMinimumSize(0, 0);
@@ -181,99 +168,36 @@ void VisualDeckEditorWidget::initializeScrollAreaAndZoneContainer()
     scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 
     zoneContainer = new QWidget(scrollArea);
-    zoneContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    zoneContainer->setObjectName("zoneContainer");
     zoneContainerLayout = new QVBoxLayout(zoneContainer);
     zoneContainer->setLayout(zoneContainerLayout);
-
-    // Create placeholder widget
-    placeholderWidget = new VisualDeckEditorPlaceholderWidget(zoneContainer);
-    zoneContainerLayout->addWidget(placeholderWidget);
-
     scrollArea->addScrollBarWidget(zoneContainer, Qt::AlignHCenter);
     scrollArea->setWidget(zoneContainer);
-}
 
-void VisualDeckEditorWidget::connectDeckListModel()
-{
+    cardSizeWidget = new CardSizeWidget(this);
+
+    mainLayout->addWidget(groupAndSortContainer);
+    mainLayout->addWidget(scrollArea);
+    mainLayout->addWidget(cardSizeWidget);
+
     connect(deckListModel, &DeckListModel::modelReset, this, &VisualDeckEditorWidget::decklistModelReset);
     connect(deckListModel, &DeckListModel::dataChanged, this, &VisualDeckEditorWidget::decklistDataChanged);
     connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &VisualDeckEditorWidget::onCardAddition);
     connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &VisualDeckEditorWidget::onCardRemoval);
+    constructZoneWidgetsFromDeckListModel();
+
+    retranslateUi();
 }
 
 void VisualDeckEditorWidget::retranslateUi()
 {
-    searchBar->setPlaceholderText(tr("Type a card name here for suggestions from the database..."));
+    sortLabel->setText(tr("Click and drag to change the sort order within the groups"));
     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"));
-
-    if (placeholderWidget) {
-        placeholderWidget->retranslateUi();
-    }
-}
-
-void VisualDeckEditorWidget::updatePlaceholderVisibility()
-{
-    if (placeholderWidget) {
-        placeholderWidget->setVisible(indexToWidgetMap.isEmpty());
-    }
-}
-
-// =====================================================================================================================
-//                                              Display Widget Management
-// =====================================================================================================================
-
-void VisualDeckEditorWidget::constructZoneWidgetForIndex(QPersistentModelIndex persistent)
-{
-    QString zoneName =
-        persistent.sibling(persistent.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
-    DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget(
-        zoneContainer, deckListModel, selectionModel, persistent, zoneName,
-        displayOptionsWidget->getActiveGroupCriteria(), displayOptionsWidget->getActiveSortCriteria(),
-        displayOptionsWidget->getDisplayType(), 20, 10, cardSizeWidget);
-    connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);
-    connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick);
-    connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this,
-            &VisualDeckEditorWidget::cleanupInvalidZones);
-    connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget,
-            &DeckCardZoneDisplayWidget::onActiveSortCriteriaChanged);
-    connect(this, &VisualDeckEditorWidget::activeGroupCriteriaChanged, zoneDisplayWidget,
-            &DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged);
-    connect(this, &VisualDeckEditorWidget::displayTypeChanged, zoneDisplayWidget,
-            &DeckCardZoneDisplayWidget::refreshDisplayType);
-    zoneDisplayWidget->refreshDisplayType(displayOptionsWidget->getDisplayType());
-    zoneContainerLayout->addWidget(zoneDisplayWidget);
-
-    indexToWidgetMap.insert(persistent, zoneDisplayWidget);
-}
-
-void VisualDeckEditorWidget::constructZoneWidgetsFromDeckListModel()
-{
-    QSortFilterProxyModel proxy;
-    proxy.setSourceModel(deckListModel);
-    proxy.setSortRole(Qt::EditRole);
-    proxy.sort(DeckListModelColumns::CARD_NAME, Qt::AscendingOrder);
-
-    for (int i = 0; i < proxy.rowCount(); ++i) {
-        QModelIndex proxyIndex = proxy.index(i, 0);
-        QModelIndex sourceIndex = proxy.mapToSource(proxyIndex);
-
-        // Make a persistent index from the *source* model
-        QPersistentModelIndex persistent(sourceIndex);
-
-        if (indexToWidgetMap.contains(persistent)) {
-            continue;
-        }
-
-        constructZoneWidgetForIndex(persistent);
-    }
-    updatePlaceholderVisibility();
-}
-
-void VisualDeckEditorWidget::updateZoneWidgets()
-{
+    sortCriteriaButton->setToolTip(tr("Configure how cards are sorted within their groups"));
+    displayTypeButton->setText(tr("Overlap Layout"));
+    displayTypeButton->setToolTip(
+        tr("Change how cards are displayed within zones (i.e. overlapped or fully visible.)"));
 }
 
 void VisualDeckEditorWidget::clearAllDisplayWidgets()
@@ -284,7 +208,6 @@ void VisualDeckEditorWidget::clearAllDisplayWidgets()
         indexToWidgetMap.remove(idx);
         delete displayWidget;
     }
-    updatePlaceholderVisibility();
 }
 
 void VisualDeckEditorWidget::cleanupInvalidZones(DeckCardZoneDisplayWidget *displayWidget)
@@ -296,13 +219,8 @@ void VisualDeckEditorWidget::cleanupInvalidZones(DeckCardZoneDisplayWidget *disp
         }
     }
     delete displayWidget;
-    updatePlaceholderVisibility();
 }
 
-// =====================================================================================================================
-//                                                 DeckModel Signals Management
-// =====================================================================================================================
-
 void VisualDeckEditorWidget::onCardAddition(const QModelIndex &parent, int first, int last)
 {
     if (parent == deckListModel->getRoot()) {
@@ -313,10 +231,27 @@ void VisualDeckEditorWidget::onCardAddition(const QModelIndex &parent, int first
                 continue;
             }
 
-            constructZoneWidgetForIndex(index);
+            DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget(
+                zoneContainer, deckListModel, index,
+                deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString(), activeGroupCriteria,
+                activeSortCriteria, currentDisplayType, 20, 10, cardSizeWidget);
+            connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);
+            connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this,
+                    &VisualDeckEditorWidget::onCardClick);
+            connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this,
+                    &VisualDeckEditorWidget::cleanupInvalidZones);
+            connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget,
+                    &DeckCardZoneDisplayWidget::onActiveSortCriteriaChanged);
+            connect(this, &VisualDeckEditorWidget::activeGroupCriteriaChanged, zoneDisplayWidget,
+                    &DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged);
+            connect(this, &VisualDeckEditorWidget::displayTypeChanged, zoneDisplayWidget,
+                    &DeckCardZoneDisplayWidget::refreshDisplayType);
+            zoneDisplayWidget->refreshDisplayType(currentDisplayType);
+            zoneContainerLayout->addWidget(zoneDisplayWidget);
+
+            indexToWidgetMap.insert(index, zoneDisplayWidget);
         }
     }
-    updatePlaceholderVisibility();
 }
 
 void VisualDeckEditorWidget::onCardRemoval(const QModelIndex &parent, int first, int last)
@@ -331,7 +266,90 @@ void VisualDeckEditorWidget::onCardRemoval(const QModelIndex &parent, int first,
             indexToWidgetMap.remove(idx);
         }
     }
-    updatePlaceholderVisibility();
+}
+
+void VisualDeckEditorWidget::constructZoneWidgetsFromDeckListModel()
+{
+    QSortFilterProxyModel proxy;
+    proxy.setSourceModel(deckListModel);
+    proxy.setSortRole(Qt::EditRole);
+    proxy.sort(1, Qt::AscendingOrder);
+
+    for (int i = 0; i < proxy.rowCount(); ++i) {
+        QModelIndex proxyIndex = proxy.index(i, 0);
+        QModelIndex sourceIndex = proxy.mapToSource(proxyIndex);
+
+        // Make a persistent index from the *source* model
+        QPersistentModelIndex persistent(sourceIndex);
+
+        if (indexToWidgetMap.contains(persistent)) {
+            continue;
+        }
+
+        DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget(
+            zoneContainer, deckListModel, persistent,
+            deckListModel->data(persistent.sibling(persistent.row(), 1), Qt::EditRole).toString(), activeGroupCriteria,
+            activeSortCriteria, currentDisplayType, 20, 10, cardSizeWidget);
+        connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);
+        connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick);
+        connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this,
+                &VisualDeckEditorWidget::cleanupInvalidZones);
+        connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget,
+                &DeckCardZoneDisplayWidget::onActiveSortCriteriaChanged);
+        connect(this, &VisualDeckEditorWidget::activeGroupCriteriaChanged, zoneDisplayWidget,
+                &DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged);
+        connect(this, &VisualDeckEditorWidget::displayTypeChanged, zoneDisplayWidget,
+                &DeckCardZoneDisplayWidget::refreshDisplayType);
+        zoneContainerLayout->addWidget(zoneDisplayWidget);
+
+        indexToWidgetMap.insert(persistent, zoneDisplayWidget);
+    }
+}
+
+void VisualDeckEditorWidget::updateZoneWidgets()
+{
+}
+
+void VisualDeckEditorWidget::updateDisplayType()
+{
+    // Toggle the display type
+    currentDisplayType = (currentDisplayType == DisplayType::Overlap) ? DisplayType::Flat : DisplayType::Overlap;
+
+    // Update UI and emit signal
+    switch (currentDisplayType) {
+        case DisplayType::Flat:
+            displayTypeButton->setText(tr("Flat Layout"));
+            break;
+        case DisplayType::Overlap:
+            displayTypeButton->setText(tr("Overlap Layout"));
+            break;
+    }
+    emit displayTypeChanged(currentDisplayType);
+}
+
+void VisualDeckEditorWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    zoneContainer->setMaximumWidth(scrollArea->viewport()->width());
+}
+
+void VisualDeckEditorWidget::actChangeActiveGroupCriteria()
+{
+    activeGroupCriteria = groupByComboBox->currentText();
+    emit activeGroupCriteriaChanged(activeGroupCriteria);
+}
+
+void VisualDeckEditorWidget::actChangeActiveSortCriteria()
+{
+    QStringList selectedCriteria;
+    for (int i = 0; i < sortByListWidget->count(); ++i) {
+        QListWidgetItem *item = sortByListWidget->item(i);
+        selectedCriteria.append(item->text()); // Collect user-defined sort order
+    }
+
+    activeSortCriteria = selectedCriteria;
+
+    emit activeSortCriteriaChanged(selectedCriteria);
 }
 
 void VisualDeckEditorWidget::decklistModelReset()
@@ -350,9 +368,10 @@ void VisualDeckEditorWidget::decklistDataChanged(QModelIndex topLeft, QModelInde
     updateZoneWidgets();
 }
 
-// =====================================================================================================================
-//                                                 User Interaction
-// =====================================================================================================================
+void VisualDeckEditorWidget::onHover(const ExactCard &hoveredCard)
+{
+    emit activeCardChanged(hoveredCard);
+}
 
 void VisualDeckEditorWidget::onCardClick(QMouseEvent *event,
                                          CardInfoPictureWithTextOverlayWidget *instance,
@@ -360,58 +379,3 @@ void VisualDeckEditorWidget::onCardClick(QMouseEvent *event,
 {
     emit cardClicked(event, instance, zoneName);
 }
-
-void VisualDeckEditorWidget::onHover(const ExactCard &hoveredCard)
-{
-    // If user has any card selected, ignore hover
-    if (selectionModel->hasSelection()) {
-        return;
-    }
-
-    // If nothing is selected -> this is our "active/preview" card
-    emit activeCardChanged(hoveredCard);
-
-    // TODO: highlight hovered card visually:
-    // highlightHoveredCard(hoveredCard);
-}
-
-void VisualDeckEditorWidget::setSelectionModel(QItemSelectionModel *model)
-{
-    if (selectionModel == model) {
-        return;
-    }
-
-    if (selectionModel) {
-        // TODO: Possibly disconnect old ones?
-    }
-
-    selectionModel = model;
-
-    if (selectionModel) {
-        connect(selectionModel, &QItemSelectionModel::selectionChanged, this,
-                &VisualDeckEditorWidget::onSelectionChanged);
-    }
-}
-
-void VisualDeckEditorWidget::onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
-{
-    for (auto &range : selected) {
-        for (int row = range.top(); row <= range.bottom(); ++row) {
-            QModelIndex idx = range.model()->index(row, 0, range.parent());
-            auto it = indexToWidgetMap.find(QPersistentModelIndex(idx));
-            if (it != indexToWidgetMap.end()) {
-                // it.value()->setHighlighted(true);
-            }
-        }
-    }
-
-    for (auto &range : deselected) {
-        for (int row = range.top(); row <= range.bottom(); ++row) {
-            QModelIndex idx = range.model()->index(row, 0, range.parent());
-            auto it = indexToWidgetMap.find(QPersistentModelIndex(idx));
-            if (it != indexToWidgetMap.end()) {
-                // it.value()->setHighlighted(false);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
index 13065d623..cd5cfcd98 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
@@ -1,30 +1,23 @@
-/**
- * @file visual_deck_editor_widget.h
- * @ingroup DeckEditors
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DECK_EDITOR_H
 #define VISUAL_DECK_EDITOR_H
 
+#include "../../../database/card_database.h"
+#include "../../../database/model/card/card_completer_proxy_model.h"
+#include "../../../database/model/card_database_display_model.h"
+#include "../../../database/model/card_database_model.h"
+#include "../../../deck/deck_list_model.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../cards/card_size_widget.h"
+#include "../general/layout_containers/flow_widget.h"
 #include "../general/layout_containers/overlap_control_widget.h"
 #include "../quick_settings/settings_button_widget.h"
-#include "visual_deck_editor_placeholder_widget.h"
 
 #include <QCheckBox>
 #include <QListWidget>
 #include <QPushButton>
 #include <QWidget>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/models/database/card/card_completer_proxy_model.h>
-#include <libcockatrice/models/database/card_database_display_model.h>
-#include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <qscrollarea.h>
 
-class VisualDeckDisplayOptionsWidget;
 class DeckCardZoneDisplayWidget;
 enum class DisplayType
 {
@@ -37,30 +30,23 @@ class VisualDeckEditorWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit VisualDeckEditorWidget(QWidget *parent, DeckListModel *deckListModel, QItemSelectionModel *selectionModel);
+    explicit VisualDeckEditorWidget(QWidget *parent, DeckListModel *deckListModel);
     void retranslateUi();
     void clearAllDisplayWidgets();
+    void resizeEvent(QResizeEvent *event) override;
 
     void setDeckList(const DeckList &_deckListModel);
 
-    void setSelectionModel(QItemSelectionModel *model);
-    void onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
-    void updatePlaceholderVisibility();
-    QItemSelectionModel *getSelectionModel() const
-    {
-        return selectionModel;
-    }
-
     QLineEdit *searchBar;
     CardSizeWidget *cardSizeWidget;
 
 public slots:
     void decklistDataChanged(QModelIndex topLeft, QModelIndex bottomRight);
     void updateZoneWidgets();
+    void updateDisplayType();
     void cleanupInvalidZones(DeckCardZoneDisplayWidget *displayWidget);
     void onCardAddition(const QModelIndex &parent, int first, int last);
     void onCardRemoval(const QModelIndex &parent, int first, int last);
-    void constructZoneWidgetForIndex(QPersistentModelIndex persistent);
     void constructZoneWidgetsFromDeckListModel();
 
 signals:
@@ -71,35 +57,38 @@ signals:
     void cardAdditionRequested(const ExactCard &card);
     void displayTypeChanged(DisplayType displayType);
 
-protected:
-    void initializeSearchBarAndCompleter();
-    void initializeDisplayOptionsWidget();
-    void initializeDisplayOptionsAndSearchWidget();
-    void initializeScrollAreaAndZoneContainer();
-    void connectDeckListModel();
-
 protected slots:
     void onHover(const ExactCard &hoveredCard);
     void onCardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
+    void actChangeActiveGroupCriteria();
+    void actChangeActiveSortCriteria();
     void decklistModelReset();
 
 private:
     DeckListModel *deckListModel;
-    QItemSelectionModel *selectionModel;
     QVBoxLayout *mainLayout;
+    QWidget *searchContainer;
+    QHBoxLayout *searchLayout;
     CardDatabaseModel *cardDatabaseModel;
     CardDatabaseDisplayModel *cardDatabaseDisplayModel;
     CardCompleterProxyModel *proxyModel;
     QCompleter *completer;
-    QWidget *displayOptionsAndSearch;
-    QHBoxLayout *displayOptionsAndSearchLayout;
-    VisualDeckDisplayOptionsWidget *displayOptionsWidget;
     QPushButton *searchPushButton;
+    DisplayType currentDisplayType = DisplayType::Overlap;
+    QPushButton *displayTypeButton;
+    QWidget *groupAndSortContainer;
+    QHBoxLayout *groupAndSortLayout;
+    QComboBox *groupByComboBox;
+    QString activeGroupCriteria = "maintype";
+    SettingsButtonWidget *sortCriteriaButton;
+    QLabel *sortLabel;
+    QListWidget *sortByListWidget;
+    QStringList activeSortCriteria = {"name", "cmc", "colors", "maintype"};
     QScrollArea *scrollArea;
     QWidget *zoneContainer;
     QVBoxLayout *zoneContainerLayout;
-    VisualDeckEditorPlaceholderWidget *placeholderWidget;
     // OverlapControlWidget *overlapControlWidget;
+    QWidget *container;
     QHash<QPersistentModelIndex, QWidget *> indexToWidgetMap;
 };
 
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
index 575632724..ef59e90ff 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
@@ -4,6 +4,7 @@
 #include "deck_preview_widget.h"
 
 #include <QMouseEvent>
+#include <QPainter>
 
 DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(VisualDeckStorageWidget *parent)
     : QWidget(parent), layout(new QHBoxLayout(this))
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h
index 551dbb35c..415d946cd 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,15 +1,11 @@
-/**
- * @file deck_preview_color_identity_filter_widget.h
- * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_PREVIEW_COLOR_IDENTITY_FILTER_WIDGET_H
 #define DECK_PREVIEW_COLOR_IDENTITY_FILTER_WIDGET_H
 
 #include "../visual_deck_storage_widget.h"
 
+#include <QChar>
 #include <QHBoxLayout>
+#include <QList>
 #include <QPushButton>
 #include <QWidget>
 
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
index 8cd1004de..6dc579c5b 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
@@ -1,8 +1,8 @@
 #include "deck_preview_deck_tags_display_widget.h"
 
-#include "../../../../client/settings/cache_settings.h"
-#include "../../../../interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h"
-#include "../../../../interface/widgets/tabs/tab_deck_editor.h"
+#include "../../../../dialogs/dlg_convert_deck_to_cod_format.h"
+#include "../../../../settings/cache_settings.h"
+#include "../../../../tabs/tab_deck_editor.h"
 #include "../../general/layout_containers/flow_widget.h"
 #include "deck_preview_tag_addition_widget.h"
 #include "deck_preview_tag_dialog.h"
@@ -11,10 +11,11 @@
 
 #include <QDirIterator>
 #include <QHBoxLayout>
+#include <QLabel>
 #include <QMessageBox>
 
-DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, const QStringList &_tags)
-    : QWidget(_parent), currentTags(_tags)
+DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, DeckList *_deckList)
+    : QWidget(_parent), deckList(nullptr)
 {
 
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
@@ -27,14 +28,22 @@ DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_par
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
 
-    layout->addWidget(flowWidget);
+    if (_deckList) {
+        connectDeckList(_deckList);
+    }
 
-    refreshTags();
+    layout->addWidget(flowWidget);
 }
 
-void DeckPreviewDeckTagsDisplayWidget::setTags(const QStringList &_tags)
+void DeckPreviewDeckTagsDisplayWidget::connectDeckList(DeckList *_deckList)
 {
-    currentTags = _tags;
+    if (deckList) {
+        disconnect(deckList, &DeckList::deckTagsChanged, this, &DeckPreviewDeckTagsDisplayWidget::refreshTags);
+    }
+
+    deckList = _deckList;
+    connect(deckList, &DeckList::deckTagsChanged, this, &DeckPreviewDeckTagsDisplayWidget::refreshTags);
+
     refreshTags();
 }
 
@@ -42,7 +51,7 @@ void DeckPreviewDeckTagsDisplayWidget::refreshTags()
 {
     flowWidget->clearLayout();
 
-    for (const QString &tag : currentTags) {
+    for (const QString &tag : deckList->getTags()) {
         flowWidget->addWidget(new DeckPreviewTagDisplayWidget(this, tag));
     }
 
@@ -69,45 +78,7 @@ static QStringList getAllFiles(const QString &filePath)
     return allFiles;
 }
 
-/**
- * Gets all tags that appear in the deck folder
- */
-static QStringList findAllKnownTags()
-{
-    QStringList allFiles = getAllFiles(SettingsCache::instance().getDeckPath());
-
-    QStringList knownTags;
-    for (const QString &file : allFiles) {
-        std::optional<LoadedDeck> deckOpt =
-            DeckLoader::loadFromFile(file, DeckFileFormat::getFormatFromName(file), false);
-        QStringList tags = deckOpt.has_value() ? deckOpt->deckList.getTags() : QStringList();
-        knownTags.append(tags);
-        knownTags.removeDuplicates();
-    }
-
-    return knownTags;
-}
-
-void DeckPreviewDeckTagsDisplayWidget::openTagEditDlg()
-{
-    if (qobject_cast<DeckPreviewWidget *>(parentWidget())) {
-        // If we're the child of a DeckPreviewWidget, then we need to handle conversion
-        auto *deckPreviewWidget = qobject_cast<DeckPreviewWidget *>(parentWidget());
-
-        bool canAddTags = promptFileConversionIfRequired(deckPreviewWidget);
-
-        if (canAddTags) {
-            QStringList knownTags = deckPreviewWidget->visualDeckStorageWidget->tagFilterWidget->getAllKnownTags();
-            execTagDialog(knownTags);
-        }
-    } else {
-        // If we're the child of an AbstractTabDeckEditor, then we don't bother with conversion
-        QStringList knownTags = findAllKnownTags();
-        execTagDialog(knownTags);
-    }
-}
-
-static bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath)
+bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath)
 {
     QFileInfo fileInfo(filePath);
     QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod");
@@ -122,70 +93,96 @@ static bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath)
     return true; // Safe to proceed
 }
 
-static void convertFileToCockatriceFormat(DeckPreviewWidget *deckPreviewWidget)
+void DeckPreviewDeckTagsDisplayWidget::openTagEditDlg()
 {
-    DeckLoader::convertToCockatriceFormat(deckPreviewWidget->deckLoader->getDeck());
-    deckPreviewWidget->filePath = deckPreviewWidget->deckLoader->getDeck().lastLoadInfo.fileName;
-    deckPreviewWidget->refreshBannerCardText();
+    if (qobject_cast<DeckPreviewWidget *>(parentWidget())) {
+        auto *deckPreviewWidget = qobject_cast<DeckPreviewWidget *>(parentWidget());
+        QStringList knownTags = deckPreviewWidget->visualDeckStorageWidget->tagFilterWidget->getAllKnownTags();
+        QStringList activeTags = deckList->getTags();
+
+        bool canAddTags = true;
+
+        if (DeckLoader::getFormatFromName(deckPreviewWidget->filePath) != DeckLoader::CockatriceFormat) {
+            canAddTags = false;
+            // Retrieve saved preference if the prompt is disabled
+            if (!SettingsCache::instance().getVisualDeckStoragePromptForConversion()) {
+                if (SettingsCache::instance().getVisualDeckStorageAlwaysConvert()) {
+
+                    if (!confirmOverwriteIfExists(this, deckPreviewWidget->filePath))
+                        return;
+
+                    deckPreviewWidget->deckLoader->convertToCockatriceFormat(deckPreviewWidget->filePath);
+                    deckPreviewWidget->filePath = deckPreviewWidget->deckLoader->getLastFileName();
+                    deckPreviewWidget->refreshBannerCardText();
+                    canAddTags = true;
+                }
+            } else {
+                // Show the dialog to the user
+                DialogConvertDeckToCodFormat conversionDialog(parentWidget());
+                if (conversionDialog.exec() == QDialog::Accepted) {
+
+                    if (!confirmOverwriteIfExists(this, deckPreviewWidget->filePath))
+                        return;
+
+                    deckPreviewWidget->deckLoader->convertToCockatriceFormat(deckPreviewWidget->filePath);
+                    deckPreviewWidget->filePath = deckPreviewWidget->deckLoader->getLastFileName();
+                    deckPreviewWidget->refreshBannerCardText();
+                    canAddTags = true;
+
+                    if (conversionDialog.dontAskAgain()) {
+                        SettingsCache::instance().setVisualDeckStoragePromptForConversion(false);
+                        SettingsCache::instance().setVisualDeckStorageAlwaysConvert(true);
+                    }
+                } else {
+                    SettingsCache::instance().setVisualDeckStorageAlwaysConvert(false);
+
+                    if (conversionDialog.dontAskAgain()) {
+                        SettingsCache::instance().setVisualDeckStoragePromptForConversion(false);
+                    } else {
+                        SettingsCache::instance().setVisualDeckStoragePromptForConversion(true);
+                    }
+                }
+            }
+        }
+
+        if (canAddTags) {
+            DeckPreviewTagDialog dialog(knownTags, activeTags);
+            if (dialog.exec() == QDialog::Accepted) {
+                QStringList updatedTags = dialog.getActiveTags();
+                deckList->setTags(updatedTags);
+                deckPreviewWidget->deckLoader->saveToFile(deckPreviewWidget->filePath, DeckLoader::CockatriceFormat);
+            }
+        }
+    } else if (parentWidget()) {
+        // If we're the child of an AbstractTabDeckEditor, we are buried under a ton of childWidgets in the
+        // DeckInfoDock.
+        QWidget *currentParent = parentWidget();
+        while (currentParent) {
+            if (qobject_cast<AbstractTabDeckEditor *>(currentParent)) {
+                break;
+            }
+            currentParent = currentParent->parentWidget();
+        }
+        if (qobject_cast<AbstractTabDeckEditor *>(currentParent)) {
+            auto *deckEditor = qobject_cast<AbstractTabDeckEditor *>(currentParent);
+            QStringList knownTags;
+            QStringList allFiles = getAllFiles(SettingsCache::instance().getDeckPath());
+            DeckLoader loader;
+            for (const QString &file : allFiles) {
+                loader.loadFromFile(file, DeckLoader::getFormatFromName(file), false);
+                QStringList tags = loader.getTags();
+                knownTags.append(tags);
+                knownTags.removeDuplicates();
+            }
+
+            QStringList activeTags = deckList->getTags();
+
+            DeckPreviewTagDialog dialog(knownTags, activeTags);
+            if (dialog.exec() == QDialog::Accepted) {
+                QStringList updatedTags = dialog.getActiveTags();
+                deckList->setTags(updatedTags);
+                deckEditor->setModified(true);
+            }
+        }
+    }
 }
-
-/**
- * Checks if the deck's file format supports tags.
- * If not, then prompt the user for file conversion.
- * @return whether the resulting file can support adding tags
- */
-bool DeckPreviewDeckTagsDisplayWidget::promptFileConversionIfRequired(DeckPreviewWidget *deckPreviewWidget)
-{
-    if (DeckFileFormat::getFormatFromName(deckPreviewWidget->filePath) == DeckFileFormat::Cockatrice) {
-        return true;
-    }
-
-    // Retrieve saved preference if the prompt is disabled
-    if (!SettingsCache::instance().getVisualDeckStoragePromptForConversion()) {
-        if (!SettingsCache::instance().getVisualDeckStorageAlwaysConvert()) {
-            return false;
-        }
-
-        if (!confirmOverwriteIfExists(this, deckPreviewWidget->filePath)) {
-            return false;
-        }
-
-        convertFileToCockatriceFormat(deckPreviewWidget);
-        return true;
-    }
-
-    // Show the dialog to the user
-    DialogConvertDeckToCodFormat conversionDialog(parentWidget());
-    if (conversionDialog.exec() != QDialog::Accepted) {
-        SettingsCache::instance().setVisualDeckStoragePromptForConversion(!conversionDialog.dontAskAgain());
-        SettingsCache::instance().setVisualDeckStorageAlwaysConvert(false);
-
-        return false;
-    }
-
-    // Try to convert file
-    if (!confirmOverwriteIfExists(this, deckPreviewWidget->filePath)) {
-        return false;
-    }
-
-    convertFileToCockatriceFormat(deckPreviewWidget);
-
-    if (conversionDialog.dontAskAgain()) {
-        SettingsCache::instance().setVisualDeckStoragePromptForConversion(false);
-        SettingsCache::instance().setVisualDeckStorageAlwaysConvert(true);
-    }
-
-    return true;
-}
-
-void DeckPreviewDeckTagsDisplayWidget::execTagDialog(const QStringList &knownTags)
-{
-    DeckPreviewTagDialog dialog(knownTags, currentTags);
-    if (dialog.exec() == QDialog::Accepted) {
-        QStringList updatedTags = dialog.getActiveTags();
-        if (updatedTags != currentTags) {
-            setTags(updatedTags);
-            emit tagsChanged(updatedTags);
-        }
-    }
-}
\ No newline at end of file
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 bfd0a170d..30564074a 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,42 +1,26 @@
-/**
- * @file deck_preview_deck_tags_display_widget.h
- * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
 #define DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
 
-#include "../../../deck_loader/deck_loader.h"
+#include "../../../../deck/deck_loader.h"
 #include "deck_preview_widget.h"
 
 #include <QWidget>
 
+inline bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath);
+
 class DeckPreviewWidget;
 class DeckPreviewDeckTagsDisplayWidget : public QWidget
 {
     Q_OBJECT
 
-    QStringList currentTags;
-    FlowWidget *flowWidget;
-
 public:
-    explicit DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, const QStringList &_tags = {});
-    void setTags(const QStringList &_tags);
+    explicit DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, DeckList *_deckList);
+    void connectDeckList(DeckList *_deckList);
     void refreshTags();
+    DeckList *deckList;
+    FlowWidget *flowWidget;
 
 public slots:
     void openTagEditDlg();
-
-private:
-    bool promptFileConversionIfRequired(DeckPreviewWidget *deckPreviewWidget);
-    void execTagDialog(const QStringList &knownTags);
-
-signals:
-    /**
-     * Emitted when the tags have changed due to user interaction.
-     * @param tags The new list of tags.
-     */
-    void tagsChanged(const QStringList &tags);
 };
 #endif // DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
index fdf4b2a28..df9fa72ae 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
@@ -1,7 +1,8 @@
 #include "deck_preview_tag_addition_widget.h"
 
-#include "../../../../client/settings/cache_settings.h"
-#include "../../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../../../../settings/cache_settings.h"
+#include "../../../../tabs/abstract_tab_deck_editor.h"
+#include "deck_preview_tag_dialog.h"
 
 #include <QFontMetrics>
 #include <QHBoxLayout>
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h
index c0fa86d19..bdf4a0103 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,14 +1,12 @@
-/**
- * @file deck_preview_tag_addition_widget.h
- * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_PREVIEW_TAG_ADDITION_WIDGET_H
 #define DECK_PREVIEW_TAG_ADDITION_WIDGET_H
 
 #include "deck_preview_deck_tags_display_widget.h"
 
+#include <QLabel>
+#include <QPushButton>
+#include <QWidget>
+
 class DeckPreviewTagAdditionWidget : public QWidget
 {
     Q_OBJECT
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
index e8a399fe5..601a03394 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
@@ -1,7 +1,7 @@
 #include "deck_preview_tag_dialog.h"
 
-#include "../../../../client/settings/cache_settings.h"
-#include "../../../../interface/widgets/dialogs/dlg_default_tags_editor.h"
+#include "../../../../dialogs/dlg_default_tags_editor.h"
+#include "../../../../settings/cache_settings.h"
 #include "deck_preview_tag_item_widget.h"
 
 #include <QCheckBox>
@@ -11,6 +11,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QTimer>
+#include <QVBoxLayout>
 
 DeckPreviewTagDialog::DeckPreviewTagDialog(const QStringList &knownTags,
                                            const QStringList &_activeTags,
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h
index 59b330a65..cfb338dcb 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
@@ -1,17 +1,13 @@
-/**
- * @file deck_preview_tag_dialog.h
- * @ingroup VisualDeckPreviewWidgets
- * @ingroup Dialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_PREVIEW_TAG_DIALOG_H
 #define DECK_PREVIEW_TAG_DIALOG_H
 
+#include <QCheckBox>
 #include <QDialog>
 #include <QLabel>
 #include <QLineEdit>
 #include <QListWidget>
+#include <QPushButton>
+#include <QStringList>
 #include <QVBoxLayout>
 
 class DeckPreviewTagDialog : public QDialog
@@ -22,7 +18,7 @@ public:
     explicit DeckPreviewTagDialog(const QStringList &knownTags,
                                   const QStringList &activeTags,
                                   QWidget *parent = nullptr);
-    [[nodiscard]] QStringList getActiveTags() const;
+    QStringList getActiveTags() const;
     void filterTags(const QString &text);
 
 private slots:
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h
index a868aa4f1..ff649dd32 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,9 +1,3 @@
-/**
- * @file deck_preview_tag_display_widget.h
- * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_PREVIEW_TAG_DISPLAY_WIDGET_H
 #define DECK_PREVIEW_TAG_DISPLAY_WIDGET_H
 
@@ -30,12 +24,12 @@ public:
      * @param tagName The name of the tag to display.
      */
     explicit DeckPreviewTagDisplayWidget(QWidget *parent = nullptr, const QString &tagName = "");
-    [[nodiscard]] QSize sizeHint() const override;
-    [[nodiscard]] QString getTagName() const
+    QSize sizeHint() const override;
+    QString getTagName() const
     {
         return tagName;
     }
-    [[nodiscard]] TagState getState() const
+    TagState getState() const
     {
         return state;
     }
@@ -44,7 +38,7 @@ public:
     {
         state = newState;
         update();
-    }
+    };
 
 signals:
     /**
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h
index 5caae90a1..60cd8ba44 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,9 +1,3 @@
-/**
- * @file deck_preview_tag_item_widget.h
- * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_PREVIEW_TAG_ITEM_WIDGET_H
 #define DECK_PREVIEW_TAG_ITEM_WIDGET_H
 
@@ -19,7 +13,7 @@ public:
     DeckPreviewTagItemWidget(const QString &tagName, bool isChecked, QWidget *parent = nullptr);
 
     // Accessor for the checkbox widget
-    [[nodiscard]] QCheckBox *checkBox() const;
+    QCheckBox *checkBox() const;
 
 private:
     QCheckBox *checkBox_; // Checkbox to represent the tag's state
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 77ea8f865..695918861 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
@@ -1,12 +1,12 @@
 #include "deck_preview_widget.h"
 
-#include "../../../../client/settings/cache_settings.h"
+#include "../../../../database/card_database_manager.h"
+#include "../../../../settings/cache_settings.h"
 #include "../../cards/additional_info/color_identity_widget.h"
 #include "../../cards/deck_preview_card_picture_widget.h"
 #include "deck_preview_deck_tags_display_widget.h"
 
 #include <QClipboard>
-#include <QDir>
 #include <QFileInfo>
 #include <QInputDialog>
 #include <QMenu>
@@ -15,7 +15,6 @@
 #include <QSet>
 #include <QStandardItemModel>
 #include <QVBoxLayout>
-#include <libcockatrice/card/database/card_database_manager.h>
 
 DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
                                      VisualDeckStorageWidget *_visualDeckStorageWidget,
@@ -26,13 +25,14 @@ DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    deckLoader = new DeckLoader(this);
+    deckLoader = new DeckLoader();
+    deckLoader->setParent(this);
     connect(deckLoader, &DeckLoader::loadFinished, this, &DeckPreviewWidget::initializeUi);
     /* TODO: We shouldn't update the tags on *every* deck load, since it's kinda expensive. We should instead count how
      many deck loads have finished already and if we've loaded all decks and THEN load all the tags at once. */
     connect(deckLoader, &DeckLoader::loadFinished, visualDeckStorageWidget->tagFilterWidget,
             &VisualDeckStorageTagFilterWidget::refreshTags);
-    deckLoader->loadFromFileAsync(filePath, DeckFileFormat::getFormatFromName(filePath), false);
+    deckLoader->loadFromFileAsync(filePath, DeckLoader::getFormatFromName(filePath), false);
 
     bannerCardDisplayWidget =
         new DeckPreviewCardPictureWidget(this, false, visualDeckStorageWidget->deckPreviewSelectionAnimationEnabled);
@@ -42,8 +42,6 @@ DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
     connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this,
             &DeckPreviewWidget::imageDoubleClickedEvent);
 
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageShowColorIdentityChanged, this,
-            &DeckPreviewWidget::updateColorIdentityVisibility);
     connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageShowTagsOnDeckPreviewsChanged, this,
             &DeckPreviewWidget::updateTagsVisibility);
     connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageShowBannerCardComboBoxChanged, this,
@@ -71,64 +69,33 @@ void DeckPreviewWidget::resizeEvent(QResizeEvent *event)
     }
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-void DeckPreviewWidget::enterEvent(QEnterEvent *event)
-#else
-void DeckPreviewWidget::enterEvent(QEvent *event)
-#endif
-{
-    QWidget::enterEvent(event);
-
-    // don't do reloads until widgets have been created
-    if (bannerCardComboBox != nullptr) {
-        reloadIfModified();
-    }
-}
-
-/**
- * @brief Sets the lastModifiedTime to the value given by the file.
- */
-void DeckPreviewWidget::updateLastModifiedTime()
-{
-    QFileInfo fileInfo(filePath);
-    lastModifiedTime = fileInfo.lastModified();
-}
-
-/**
- * @brief Writes the current contents of the deck to file. Updates the lastModifiedTime afterward.
- */
-void DeckPreviewWidget::writeDeckToFile()
-{
-    DeckLoader::saveToFile(deckLoader->getDeck());
-    updateLastModifiedTime();
-}
-
 void DeckPreviewWidget::initializeUi(const bool deckLoadSuccess)
 {
     if (!deckLoadSuccess) {
         return;
     }
+    auto bannerCard = deckLoader->getBannerCard().name.isEmpty()
+                          ? ExactCard()
+                          : CardDatabaseManager::query()->getCard(deckLoader->getBannerCard());
 
-    QFileInfo fileInfo(filePath);
-    lastModifiedTime = fileInfo.lastModified();
-
+    bannerCardDisplayWidget->setCard(bannerCard);
     bannerCardDisplayWidget->setFontSize(24);
-    setFilePath(deckLoader->getDeck().lastLoadInfo.fileName);
+    setFilePath(deckLoader->getLastFileName());
 
-    colorIdentityWidget = new ColorIdentityWidget(this);
-    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this);
-    connect(deckTagsDisplayWidget, &DeckPreviewDeckTagsDisplayWidget::tagsChanged, this, &DeckPreviewWidget::setTags);
+    colorIdentityWidget = new ColorIdentityWidget(this, getColorIdentity());
+    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckLoader);
 
     bannerCardLabel = new QLabel(this);
     bannerCardLabel->setObjectName("bannerCardLabel");
     bannerCardComboBox = new QComboBox(this);
     bannerCardComboBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
     bannerCardComboBox->setObjectName("bannerCardComboBox");
-    bannerCardComboBox->installEventFilter(new NoScrollFilter(bannerCardComboBox));
+    bannerCardComboBox->setCurrentText(deckLoader->getBannerCard().name);
+    bannerCardComboBox->installEventFilter(new NoScrollFilter());
     connect(bannerCardComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             &DeckPreviewWidget::setBannerCard);
 
-    updateColorIdentityVisibility(SettingsCache::instance().getVisualDeckStorageShowColorIdentity());
+    updateBannerCardComboBox();
     updateBannerCardComboBoxVisibility(SettingsCache::instance().getVisualDeckStorageShowBannerCardComboBox());
     updateTagsVisibility(SettingsCache::instance().getVisualDeckStorageShowTagsOnDeckPreviews());
 
@@ -137,44 +104,9 @@ void DeckPreviewWidget::initializeUi(const bool deckLoadSuccess)
     layout->addWidget(bannerCardLabel);
     layout->addWidget(bannerCardComboBox);
 
-    retranslateUi();
-    resyncWidgets();
-}
-
-/**
- * @brief Syncs the contents of the child widgets with the current deck.
- */
-void DeckPreviewWidget::resyncWidgets()
-{
-    auto bannerCardRef = deckLoader->getDeck().deckList.getBannerCard();
-    auto bannerCard = bannerCardRef.name.isEmpty() ? ExactCard() : CardDatabaseManager::query()->getCard(bannerCardRef);
-
-    bannerCardDisplayWidget->setCard(bannerCard);
     refreshBannerCardText();
-    updateBannerCardComboBox(bannerCardRef.name);
-    colorIdentityWidget->setColorIdentity(getColorIdentity());
-    deckTagsDisplayWidget->setTags(deckLoader->getDeck().deckList.getTags());
-}
 
-/**
- * @brief Reloads the deck if the file's last modified time has increased since we last checked.
- */
-void DeckPreviewWidget::reloadIfModified()
-{
-    QFileInfo fileInfo(filePath);
-    QDateTime newLastModifiedTime = fileInfo.lastModified();
-
-    if (!newLastModifiedTime.isValid() || newLastModifiedTime <= lastModifiedTime) {
-        return;
-    }
-
-    bool success = deckLoader->reload();
-
-    if (success) {
-        fileInfo.refresh();
-        lastModifiedTime = fileInfo.lastModified();
-        resyncWidgets();
-    }
+    retranslateUi();
 }
 
 void DeckPreviewWidget::updateVisibility()
@@ -190,15 +122,6 @@ bool DeckPreviewWidget::checkVisibility() const
     return true;
 }
 
-void DeckPreviewWidget::updateColorIdentityVisibility(bool visible)
-{
-    if (colorIdentityWidget == nullptr) {
-        return;
-    }
-
-    colorIdentityWidget->setVisible(visible);
-}
-
 void DeckPreviewWidget::updateBannerCardComboBoxVisibility(bool visible)
 {
     if (bannerCardComboBox == nullptr) {
@@ -229,7 +152,7 @@ void DeckPreviewWidget::updateTagsVisibility(bool visible)
 
 QString DeckPreviewWidget::getColorIdentity()
 {
-    QStringList cardList = deckLoader->getDeck().deckList.getCardList({DECK_ZONE_MAIN, DECK_ZONE_SIDE});
+    QStringList cardList = deckLoader->getCardList();
     if (cardList.isEmpty()) {
         return {};
     }
@@ -263,8 +186,8 @@ QString DeckPreviewWidget::getColorIdentity()
  */
 QString DeckPreviewWidget::getDisplayName() const
 {
-    QString deckName = deckLoader->getDeck().deckList.getName();
-    return !deckName.isEmpty() ? deckName : QFileInfo(deckLoader->getDeck().lastLoadInfo.fileName).fileName();
+    return deckLoader->getName().isEmpty() ? QFileInfo(deckLoader->getLastFileName()).fileName()
+                                           : deckLoader->getName();
 }
 
 void DeckPreviewWidget::setFilePath(const QString &_filePath)
@@ -296,8 +219,11 @@ void DeckPreviewWidget::refreshBannerCardToolTip()
     }
 }
 
-void DeckPreviewWidget::updateBannerCardComboBox(const QString &currentText)
+void DeckPreviewWidget::updateBannerCardComboBox()
 {
+    // Store the current text of the combo box
+    QString currentText = bannerCardComboBox->currentText();
+
     // Block signals temporarily
     bool wasBlocked = bannerCardComboBox->blockSignals(true);
     bannerCardComboBox->setUpdatesEnabled(false);
@@ -307,12 +233,17 @@ void DeckPreviewWidget::updateBannerCardComboBox(const QString &currentText)
 
     // Prepare the new items with deduplication
     QSet<QPair<QString, QString>> bannerCardSet;
+    InnerDecklistNode *listRoot = deckLoader->getRoot();
+    for (auto i : *listRoot) {
+        auto *currentZone = dynamic_cast<InnerDecklistNode *>(i);
+        for (auto j : *currentZone) {
+            auto *currentCard = dynamic_cast<DecklistCardNode *>(j);
+            if (!currentCard)
+                continue;
 
-    QList<const DecklistCardNode *> cardsInDeck = deckLoader->getDeck().deckList.getCardNodes();
-
-    for (auto currentCard : cardsInDeck) {
-        for (int k = 0; k < currentCard->getNumber(); ++k) {
-            bannerCardSet.insert(QPair<QString, QString>(currentCard->getName(), currentCard->getCardProviderId()));
+            for (int k = 0; k < currentCard->getNumber(); ++k) {
+                bannerCardSet.insert(QPair<QString, QString>(currentCard->getName(), currentCard->getCardProviderId()));
+            }
         }
     }
 
@@ -342,7 +273,7 @@ void DeckPreviewWidget::updateBannerCardComboBox(const QString &currentText)
         bannerCardComboBox->setCurrentIndex(restoredIndex);
     } else {
         // Add a placeholder "-" and set it as the current selection
-        int bannerIndex = bannerCardComboBox->findText(deckLoader->getDeck().deckList.getBannerCard().name);
+        int bannerIndex = bannerCardComboBox->findText(deckLoader->getBannerCard().name);
         if (bannerIndex != -1) {
             bannerCardComboBox->setCurrentIndex(bannerIndex);
         } else {
@@ -360,8 +291,8 @@ void DeckPreviewWidget::setBannerCard(int /* changedIndex */)
 {
     auto [name, id] = bannerCardComboBox->currentData().value<QPair<QString, QString>>();
     CardRef cardRef = {name, id};
-    deckLoader->getDeck().deckList.setBannerCard(cardRef);
-    writeDeckToFile();
+    deckLoader->setBannerCard(cardRef);
+    deckLoader->saveToFile(filePath, DeckLoader::getFormatFromName(filePath));
     bannerCardDisplayWidget->setCard(CardDatabaseManager::query()->getCard(cardRef));
 }
 
@@ -381,19 +312,13 @@ void DeckPreviewWidget::imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewC
     emit deckLoadRequested(filePath);
 }
 
-void DeckPreviewWidget::setTags(const QStringList &tags)
-{
-    deckLoader->getDeck().deckList.setTags(tags);
-    writeDeckToFile();
-}
-
 QMenu *DeckPreviewWidget::createRightClickMenu()
 {
     auto *menu = new QMenu(this);
     menu->setAttribute(Qt::WA_DeleteOnClose);
 
     connect(menu->addAction(tr("Open in deck editor")), &QAction::triggered, this,
-            [this] { emit openDeckEditor(deckLoader->getDeck()); });
+            [this] { emit openDeckEditor(deckLoader); });
 
     connect(menu->addAction(tr("Edit Tags")), &QAction::triggered, deckTagsDisplayWidget,
             &DeckPreviewDeckTagsDisplayWidget::openTagEditDlg);
@@ -407,13 +332,13 @@ QMenu *DeckPreviewWidget::createRightClickMenu()
     auto saveToClipboardMenu = menu->addMenu(tr("Save Deck to Clipboard"));
 
     connect(saveToClipboardMenu->addAction(tr("Annotated")), &QAction::triggered, this,
-            [this] { DeckLoader::saveToClipboard(deckLoader->getDeck().deckList, true, true); });
+            [this] { deckLoader->saveToClipboard(true, true); });
     connect(saveToClipboardMenu->addAction(tr("Annotated (No set info)")), &QAction::triggered, this,
-            [this] { DeckLoader::saveToClipboard(deckLoader->getDeck().deckList, true, false); });
+            [this] { deckLoader->saveToClipboard(true, false); });
     connect(saveToClipboardMenu->addAction(tr("Not Annotated")), &QAction::triggered, this,
-            [this] { DeckLoader::saveToClipboard(deckLoader->getDeck().deckList, false, true); });
+            [this] { deckLoader->saveToClipboard(false, true); });
     connect(saveToClipboardMenu->addAction(tr("Not Annotated (No set info)")), &QAction::triggered, this,
-            [this] { DeckLoader::saveToClipboard(deckLoader->getDeck().deckList, false, false); });
+            [this] { deckLoader->saveToClipboard(false, false); });
 
     menu->addSeparator();
 
@@ -449,7 +374,7 @@ void DeckPreviewWidget::addSetBannerCardMenu(QMenu *menu)
 void DeckPreviewWidget::actRenameDeck()
 {
     // read input
-    const QString oldName = deckLoader->getDeck().deckList.getName();
+    const QString oldName = deckLoader->getName();
 
     bool ok;
     QString newName = QInputDialog::getText(this, "Rename deck", tr("New name:"), QLineEdit::Normal, oldName, &ok);
@@ -458,8 +383,8 @@ void DeckPreviewWidget::actRenameDeck()
     }
 
     // write change
-    deckLoader->getDeck().deckList.setName(newName);
-    writeDeckToFile();
+    deckLoader->setName(newName);
+    deckLoader->saveToFile(filePath, DeckLoader::getFormatFromName(filePath));
 
     // update VDS
     refreshBannerCardText();
@@ -489,11 +414,10 @@ void DeckPreviewWidget::actRenameFile()
         return;
     }
 
-    deckLoader->getDeck().lastLoadInfo.fileName = newFilePath;
-    setFilePath(newFilePath);
+    deckLoader->setLastFileName(newFilePath);
 
     // update VDS
-    updateLastModifiedTime();
+    setFilePath(newFilePath);
     refreshBannerCardText();
 }
 
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 98116cabe..a87f5aad7 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,13 +1,7 @@
-/**
- * @file deck_preview_widget.h
- * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef DECK_PREVIEW_WIDGET_H
 #define DECK_PREVIEW_WIDGET_H
 
-#include "../../../deck_loader/deck_loader.h"
+#include "../../../../deck/deck_loader.h"
 #include "../../cards/additional_info/color_identity_widget.h"
 #include "../../cards/deck_preview_card_picture_widget.h"
 #include "../visual_deck_storage_widget.h"
@@ -33,12 +27,11 @@ public:
                                const QString &_filePath);
     void retranslateUi();
     QString getColorIdentity();
-    [[nodiscard]] QString getDisplayName() const;
+    QString getDisplayName() const;
 
     VisualDeckStorageWidget *visualDeckStorageWidget;
     QVBoxLayout *layout;
     QString filePath;
-    QDateTime lastModifiedTime;
     DeckLoader *deckLoader;
     DeckPreviewCardPictureWidget *bannerCardDisplayWidget = nullptr;
     ColorIdentityWidget *colorIdentityWidget = nullptr;
@@ -48,45 +41,31 @@ public:
     bool filteredBySearch = false;
     bool filteredByColor = false;
     bool filteredByTags = false;
-    [[nodiscard]] bool checkVisibility() const;
+    bool checkVisibility() const;
 
 signals:
     void deckLoadRequested(const QString &filePath);
-    void openDeckEditor(const LoadedDeck &deck);
+    void openDeckEditor(const DeckLoader *deck);
 
 public slots:
     void setFilePath(const QString &filePath);
     void refreshBannerCardText();
     void refreshBannerCardToolTip();
-    void updateBannerCardComboBox(const QString &currentText);
+    void updateBannerCardComboBox();
     void setBannerCard(int);
     void imageClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
     void imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
     void initializeUi(bool deckLoadSuccess);
-    void resyncWidgets();
-    void reloadIfModified();
     void updateVisibility();
-    void updateColorIdentityVisibility(bool visible);
     void updateBannerCardComboBoxVisibility(bool visible);
     void updateTagsVisibility(bool visible);
     void resizeEvent(QResizeEvent *event) override;
 
-protected:
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    void enterEvent(QEnterEvent *event) override; // Qt6 signature
-#else
-    void enterEvent(QEvent *event) override; // Qt5 signature
-#endif
-
 private:
-    void updateLastModifiedTime();
-    void writeDeckToFile();
     QMenu *createRightClickMenu();
     void addSetBannerCardMenu(QMenu *menu);
 
 private slots:
-    void setTags(const QStringList &tags);
-
     void actRenameDeck();
     void actRenameFile();
     void actDeleteFile();
@@ -95,11 +74,6 @@ private slots:
 class NoScrollFilter : public QObject
 {
     Q_OBJECT
-public:
-    explicit NoScrollFilter(QObject *parent = nullptr) : QObject(parent)
-    {
-    }
-
 protected:
     bool eventFilter(QObject *obj, QEvent *event) override
     {
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
index fdb44dff4..235e62deb 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
@@ -1,8 +1,7 @@
 #include "visual_deck_storage_folder_display_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../settings/cache_settings.h"
 #include "deck_preview/deck_preview_widget.h"
-#include "visual_deck_storage_widget.h"
 
 #include <QDirIterator>
 #include <QMouseEvent>
@@ -211,7 +210,7 @@ QStringList VisualDeckStorageFolderDisplayWidget::gatherAllTagsFromFlowWidget()
         // Iterate through all DeckPreviewWidgets
         for (DeckPreviewWidget *display : flowWidget->findChildren<DeckPreviewWidget *>()) {
             // Get tags from each DeckPreviewWidget
-            QStringList tags = display->deckLoader->getDeck().deckList.getTags();
+            QStringList tags = display->deckLoader->getTags();
 
             // Add tags to the list while avoiding duplicates
             allTags.append(tags);
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h
index d76fb0497..747bcf8bd 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,16 +1,13 @@
-/**
- * @file visual_deck_storage_folder_display_widget.h
- * @ingroup VisualDeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DECK_STORAGE_FOLDER_DISPLAY_WIDGET_H
 #define VISUAL_DECK_STORAGE_FOLDER_DISPLAY_WIDGET_H
 
 #include "../general/display/banner_widget.h"
 #include "../general/layout_containers/flow_widget.h"
+#include "visual_deck_storage_widget.h"
+
+#include <QVBoxLayout>
+#include <QWidget>
 
-class VisualDeckStorageWidget;
 class VisualDeckStorageFolderDisplayWidget : public QWidget
 {
     Q_OBJECT
@@ -24,11 +21,11 @@ public:
     void createWidgetsForFiles();
     void createWidgetsForFolders();
     void flattenFolderStructure();
-    [[nodiscard]] QStringList gatherAllTagsFromFlowWidget() const;
-    [[nodiscard]] FlowWidget *getFlowWidget() const
+    QStringList gatherAllTagsFromFlowWidget() const;
+    FlowWidget *getFlowWidget() const
     {
         return flowWidget;
-    }
+    };
 
 public slots:
     void updateVisibility(bool recursive = true);
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
index a0e8512ac..6e269a9b5 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
@@ -1,6 +1,6 @@
 #include "visual_deck_storage_quick_settings_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../settings/cache_settings.h"
 #include "visual_deck_storage_widget.h"
 
 #include <QCheckBox>
@@ -26,14 +26,6 @@ VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidg
     connect(showTagFilterCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
             &SettingsCache::setVisualDeckStorageShowTagFilter);
 
-    // show color identity on DeckPreviewWidget checkbox
-    showColorIdentityCheckBox = new QCheckBox(this);
-    showColorIdentityCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowColorIdentity());
-    connect(showColorIdentityCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
-            &VisualDeckStorageQuickSettingsWidget::showColorIdentityChanged);
-    connect(showColorIdentityCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageShowColorIdentity);
-
     // show tags on DeckPreviewWidget checkbox
     showTagsOnDeckPreviewsCheckBox = new QCheckBox(this);
     showTagsOnDeckPreviewsCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowTagsOnDeckPreviews());
@@ -69,10 +61,10 @@ VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidg
     unusedColorIdentitiesOpacitySpinBox->setMaximum(100);
     unusedColorIdentitiesOpacitySpinBox->setValue(
         SettingsCache::instance().getVisualDeckStorageUnusedColorIdentitiesOpacity());
-    connect(unusedColorIdentitiesOpacitySpinBox, qOverload<int>(&QSpinBox::valueChanged), this,
+    connect(unusedColorIdentitiesOpacitySpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
             &VisualDeckStorageQuickSettingsWidget::unusedColorIdentitiesOpacityChanged);
-    connect(unusedColorIdentitiesOpacitySpinBox, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity);
+    connect(unusedColorIdentitiesOpacitySpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+            &SettingsCache::instance(), &SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity);
 
     unusedColorIdentitiesOpacityLabel->setBuddy(unusedColorIdentitiesOpacitySpinBox);
 
@@ -111,7 +103,6 @@ VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidg
     // putting everything together
     this->addSettingsWidget(showFoldersCheckBox);
     this->addSettingsWidget(showTagFilterCheckBox);
-    this->addSettingsWidget(showColorIdentityCheckBox);
     this->addSettingsWidget(showTagsOnDeckPreviewsCheckBox);
     this->addSettingsWidget(showBannerCardComboBoxCheckBox);
     this->addSettingsWidget(drawUnusedColorIdentitiesCheckBox);
@@ -128,7 +119,6 @@ void VisualDeckStorageQuickSettingsWidget::retranslateUi()
 {
     showFoldersCheckBox->setText(tr("Show Folders"));
     showTagFilterCheckBox->setText(tr("Show Tag Filter"));
-    showColorIdentityCheckBox->setText(tr("Show Color Identity"));
     showTagsOnDeckPreviewsCheckBox->setText(tr("Show Tags On Deck Previews"));
     showBannerCardComboBoxCheckBox->setText(tr("Show Banner Card Selection Option"));
     drawUnusedColorIdentitiesCheckBox->setText(tr("Draw unused Color Identities"));
@@ -150,11 +140,6 @@ bool VisualDeckStorageQuickSettingsWidget::getDrawUnusedColorIdentities() const
     return drawUnusedColorIdentitiesCheckBox->isChecked();
 }
 
-bool VisualDeckStorageQuickSettingsWidget::getShowColorIdentity() const
-{
-    return showColorIdentityCheckBox->isChecked();
-}
-
 bool VisualDeckStorageQuickSettingsWidget::getShowBannerCardComboBox() const
 {
     return showBannerCardComboBoxCheckBox->isChecked();
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h
index ea4330a15..11c1d64e9 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h
@@ -1,11 +1,3 @@
-/**
- * @file visual_deck_storage_quick_settings_widget.h
- * @ingroup VisualDeckStorageWidgets
- * @brief The VDS's quick settings menu.
- * Manages the widgets in the quick settings menu dropdown, as well as syncing their values with SettingsCache.
- * The current values of the settings are exposed through getters and signals.
- */
-
 #ifndef VISUAL_DECK_STORAGE_QUICK_SETTINGS_WIDGET_H
 #define VISUAL_DECK_STORAGE_QUICK_SETTINGS_WIDGET_H
 
@@ -17,12 +9,16 @@ class QSpinBox;
 class QCheckBox;
 class QComboBox;
 
+/**
+ * The VDS's quick settings menu.
+ * Manages the widgets in the quick settings menu dropdown, as well as syncing their values with SettingsCache.
+ * The current values of the settings are exposed through getters and signals.
+ */
 class VisualDeckStorageQuickSettingsWidget : public SettingsButtonWidget
 {
     Q_OBJECT
 
     QCheckBox *showFoldersCheckBox;
-    QCheckBox *showColorIdentityCheckBox;
     QCheckBox *drawUnusedColorIdentitiesCheckBox;
     QCheckBox *showBannerCardComboBoxCheckBox;
     QCheckBox *showTagFilterCheckBox;
@@ -48,20 +44,18 @@ public:
 
     void retranslateUi();
 
-    [[nodiscard]] bool getShowFolders() const;
-    [[nodiscard]] bool getDrawUnusedColorIdentities() const;
-    [[nodiscard]] bool getShowColorIdentity() const;
-    [[nodiscard]] bool getShowBannerCardComboBox() const;
-    [[nodiscard]] bool getShowTagFilter() const;
-    [[nodiscard]] bool getShowTagsOnDeckPreviews() const;
-    [[nodiscard]] int getUnusedColorIdentitiesOpacity() const;
-    [[nodiscard]] TooltipType getDeckPreviewTooltip() const;
-    [[nodiscard]] int getCardSize() const;
+    bool getShowFolders() const;
+    bool getDrawUnusedColorIdentities() const;
+    bool getShowBannerCardComboBox() const;
+    bool getShowTagFilter() const;
+    bool getShowTagsOnDeckPreviews() const;
+    int getUnusedColorIdentitiesOpacity() const;
+    TooltipType getDeckPreviewTooltip() const;
+    int getCardSize() const;
 
 signals:
     void showFoldersChanged(bool enabled);
     void drawUnusedColorIdentitiesChanged(bool enabled);
-    void showColorIdentityChanged(bool enabled);
     void showBannerCardComboBoxChanged(bool enabled);
     void showTagFilterChanged(bool enabled);
     void showTagsOnDeckPreviewsChanged(bool enabled);
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
index 70b438232..69fb1025a 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
@@ -1,12 +1,11 @@
 #include "visual_deck_storage_search_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../../../filters/deck_filter_string.h"
 #include "../../../filters/syntax_help.h"
+#include "../../../settings/cache_settings.h"
 #include "../../pixel_map_generator.h"
 
 #include <QAction>
-#include <QFileInfo>
 
 /**
  * @brief Constructs a PrintingSelectorCardSearchWidget for searching cards by set name or set code.
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.h
index 67d260b21..e8b91bc5b 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,16 +1,11 @@
-/**
- * @file visual_deck_storage_search_widget.h
- * @ingroup VisualDeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DECK_STORAGE_SEARCH_WIDGET_H
 #define VISUAL_DECK_STORAGE_SEARCH_WIDGET_H
 
-#include "deck_preview/deck_preview_widget.h"
+#include "visual_deck_storage_widget.h"
 
 #include <QHBoxLayout>
 #include <QLineEdit>
+#include <QTimer>
 #include <QWidget>
 
 class VisualDeckStorageWidget;
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
index 0eb45cdcc..c7917ed44 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
@@ -1,8 +1,6 @@
 #include "visual_deck_storage_sort_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
-
-#include <QFileInfo>
+#include "../../../settings/cache_settings.h"
 
 /**
  * @brief Constructs a PrintingSelectorCardSortWidget for searching cards by set name or set code.
@@ -95,17 +93,14 @@ QList<DeckPreviewWidget *> VisualDeckStorageSortWidget::filterFiles(QList<DeckPr
 
         switch (sortOrder) {
             case ByName:
-                return widget1->deckLoader->getDeck().deckList.getName() <
-                       widget2->deckLoader->getDeck().deckList.getName();
+                return widget1->deckLoader->getName() < widget2->deckLoader->getName();
             case Alphabetical:
                 return QString::localeAwareCompare(info1.fileName(), info2.fileName()) <= 0;
             case ByLastModified:
                 return info1.lastModified() > info2.lastModified();
             case ByLastLoaded: {
-                QDateTime time1 =
-                    QDateTime::fromString(widget1->deckLoader->getDeck().deckList.getLastLoadedTimestamp());
-                QDateTime time2 =
-                    QDateTime::fromString(widget2->deckLoader->getDeck().deckList.getLastLoadedTimestamp());
+                QDateTime time1 = QDateTime::fromString(widget1->deckLoader->getLastLoadedTimestamp());
+                QDateTime time2 = QDateTime::fromString(widget2->deckLoader->getLastLoadedTimestamp());
                 return time1 > time2;
             }
         }
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.h
index 1ea06aba4..1aac55d2d 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,9 +1,3 @@
-/**
- * @file visual_deck_storage_sort_widget.h
- * @ingroup VisualDeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DECK_STORAGE_SORT_WIDGET_H
 #define VISUAL_DECK_STORAGE_SORT_WIDGET_H
 
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 28fd7a5ca..47ed6ebee 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
@@ -1,10 +1,12 @@
 #include "visual_deck_storage_tag_filter_widget.h"
 
 #include "../general/layout_containers/flow_widget.h"
+#include "deck_preview/deck_preview_tag_addition_widget.h"
 #include "deck_preview/deck_preview_tag_display_widget.h"
-#include "visual_deck_storage_widget.h"
+#include "deck_preview/deck_preview_widget.h"
 
 #include <QHBoxLayout>
+#include <QLabel>
 
 VisualDeckStorageTagFilterWidget::VisualDeckStorageTagFilterWidget(VisualDeckStorageWidget *_parent)
     : QWidget(_parent), parent(_parent)
@@ -57,7 +59,7 @@ void VisualDeckStorageTagFilterWidget::filterDecksBySelectedTags(const QList<Dec
     }
 
     for (DeckPreviewWidget *deckPreview : deckPreviews) {
-        QStringList deckTags = deckPreview->deckLoader->getDeck().deckList.getTags();
+        QStringList deckTags = deckPreview->deckLoader->getTags();
 
         bool hasAllSelected = std::all_of(selectedTags.begin(), selectedTags.end(),
                                           [&deckTags](const QString &tag) { return deckTags.contains(tag); });
@@ -153,7 +155,7 @@ QSet<QString> VisualDeckStorageTagFilterWidget::gatherAllTags() const
 
     for (DeckPreviewWidget *widget : deckWidgets) {
         if (widget->checkVisibility()) {
-            for (const QString &tag : widget->deckLoader->getDeck().deckList.getTags()) {
+            for (const QString &tag : widget->deckLoader->getTags()) {
                 allTags.insert(tag);
             }
         }
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h
index ada94a244..3198e9769 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,13 +1,7 @@
-/**
- * @file visual_deck_storage_tag_filter_widget.h
- * @ingroup VisualDeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H
 #define VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H
 
-#include "deck_preview/deck_preview_widget.h"
+#include "visual_deck_storage_widget.h"
 
 #include <QWidget>
 
@@ -18,7 +12,7 @@ class VisualDeckStorageTagFilterWidget : public QWidget
 
     VisualDeckStorageWidget *parent;
 
-    [[nodiscard]] QSet<QString> gatherAllTags() const;
+    QSet<QString> gatherAllTags() const;
     void removeTagsNotInList(const QSet<QString> &tags);
     void addTagsIfNotPresent(const QSet<QString> &tags);
     void addTagIfNotPresent(const QString &tag);
@@ -26,7 +20,7 @@ class VisualDeckStorageTagFilterWidget : public QWidget
 
 public:
     explicit VisualDeckStorageTagFilterWidget(VisualDeckStorageWidget *_parent);
-    [[nodiscard]] QStringList getAllKnownTags() const;
+    QStringList getAllKnownTags() const;
     void filterDecksBySelectedTags(const QList<DeckPreviewWidget *> &deckPreviews) const;
 
 public slots:
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
index bfc425993..36f9c7705 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@@ -1,6 +1,7 @@
 #include "visual_deck_storage_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../settings/cache_settings.h"
 #include "../quick_settings/settings_button_widget.h"
 #include "deck_preview/deck_preview_widget.h"
 #include "visual_deck_storage_folder_display_widget.h"
@@ -11,8 +12,8 @@
 #include <QComboBox>
 #include <QDirIterator>
 #include <QMouseEvent>
+#include <QSpinBox>
 #include <QVBoxLayout>
-#include <libcockatrice/card/database/card_database_manager.h>
 
 VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent), folderWidget(nullptr)
 {
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 b13c51700..13323c326 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,23 +1,20 @@
-/**
- * @file visual_deck_storage_widget.h
- * @ingroup VisualDeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef VISUAL_DECK_STORAGE_WIDGET_H
 #define VISUAL_DECK_STORAGE_WIDGET_H
 
-#include "../../deck_loader/deck_loader.h"
+#include "../../../deck/deck_list_model.h"
 #include "../cards/card_size_widget.h"
+#include "../general/layout_containers/flow_widget.h"
 #include "../quick_settings/settings_button_widget.h"
 #include "deck_preview/deck_preview_color_identity_filter_widget.h"
+#include "deck_preview/deck_preview_widget.h"
 #include "visual_deck_storage_folder_display_widget.h"
 #include "visual_deck_storage_quick_settings_widget.h"
 #include "visual_deck_storage_search_widget.h"
 #include "visual_deck_storage_sort_widget.h"
 #include "visual_deck_storage_tag_filter_widget.h"
 
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <QCheckBox>
+#include <QFileSystemModel>
 
 class QSpinBox;
 class VisualDeckStorageSearchWidget;
@@ -36,7 +33,7 @@ public:
     VisualDeckStorageTagFilterWidget *tagFilterWidget;
     bool deckPreviewSelectionAnimationEnabled;
 
-    [[nodiscard]] const VisualDeckStorageQuickSettingsWidget *settings() const;
+    const VisualDeckStorageQuickSettingsWidget *settings() const;
 
 public slots:
     void createRootFolderWidget(); // Refresh the display of cards based on the current sorting option
@@ -53,7 +50,7 @@ public slots:
 signals:
     void bannerCardsRefreshed();
     void deckLoadRequested(const QString &filePath);
-    void openDeckEditor(const LoadedDeck &deck);
+    void openDeckEditor(const DeckLoader *deck);
 
 private:
     QVBoxLayout *layout;
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index 86e6c1534..7b5746520 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -19,28 +19,37 @@
  ***************************************************************************/
 #include "window_main.h"
 
-#include "../client/network/update/client/client_update_checker.h"
-#include "../client/network/update/client/release_channel.h"
-#include "../client/settings/cache_settings.h"
-#include "../interface/widgets/dialogs/dlg_connect.h"
-#include "../interface/widgets/dialogs/dlg_edit_tokens.h"
-#include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h"
-#include "../interface/widgets/dialogs/dlg_forgot_password_request.h"
-#include "../interface/widgets/dialogs/dlg_forgot_password_reset.h"
-#include "../interface/widgets/dialogs/dlg_local_game_options.h"
-#include "../interface/widgets/dialogs/dlg_manage_sets.h"
-#include "../interface/widgets/dialogs/dlg_register.h"
-#include "../interface/widgets/dialogs/dlg_settings.h"
-#include "../interface/widgets/dialogs/dlg_startup_card_check.h"
-#include "../interface/widgets/dialogs/dlg_tip_of_the_day.h"
-#include "../interface/widgets/dialogs/dlg_update.h"
-#include "../interface/widgets/dialogs/dlg_view_log.h"
-#include "../interface/widgets/tabs/tab_game.h"
-#include "../interface/widgets/tabs/tab_supervisor.h"
+#include "../client/get_text_with_max.h"
+#include "../client/network/client_update_checker.h"
+#include "../client/network/release_channel.h"
+#include "../database/card_database.h"
+#include "../database/card_database_manager.h"
+#include "../dialogs/dlg_connect.h"
+#include "../dialogs/dlg_edit_tokens.h"
+#include "../dialogs/dlg_forgot_password_challenge.h"
+#include "../dialogs/dlg_forgot_password_request.h"
+#include "../dialogs/dlg_forgot_password_reset.h"
+#include "../dialogs/dlg_manage_sets.h"
+#include "../dialogs/dlg_register.h"
+#include "../dialogs/dlg_settings.h"
+#include "../dialogs/dlg_startup_card_check.h"
+#include "../dialogs/dlg_tip_of_the_day.h"
+#include "../dialogs/dlg_update.h"
+#include "../dialogs/dlg_view_log.h"
 #include "../main.h"
-#include "logger.h"
+#include "../server/local_client.h"
+#include "../server/local_server.h"
+#include "../server/local_server_interface.h"
+#include "../server/remote/remote_client.h"
+#include "../settings/cache_settings.h"
+#include "../tabs/tab_game.h"
+#include "../tabs/tab_supervisor.h"
+#include "../utility/logger.h"
+#include "pb/event_connection_closed.pb.h"
+#include "pb/event_server_shutdown.pb.h"
+#include "pb/game_replay.pb.h"
+#include "pb/room_commands.pb.h"
 #include "version_string.h"
-#include "widgets/utility/get_text_with_max.h"
 
 #include <QAction>
 #include <QApplication>
@@ -50,10 +59,12 @@
 #include <QDesktopServices>
 #include <QFile>
 #include <QFileDialog>
+#include <QInputDialog>
 #include <QMenu>
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QPixmapCache>
+#include <QRadioButton>
 #include <QStatusBar>
 #include <QSystemTrayIcon>
 #include <QThread>
@@ -61,16 +72,6 @@
 #include <QWindow>
 #include <QtConcurrent>
 #include <QtNetwork>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/network/client/local/local_client.h>
-#include <libcockatrice/network/client/remote/remote_client.h>
-#include <libcockatrice/network/server/local/local_server.h>
-#include <libcockatrice/network/server/local/local_server_interface.h>
-#include <libcockatrice/protocol/pb/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>
 
 #define GITHUB_PAGES_URL "https://cockatrice.github.io"
 #define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors?type=c"
@@ -84,7 +85,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.
@@ -226,15 +226,16 @@ void MainWindow::actDisconnect()
 
 void MainWindow::actSinglePlayer()
 {
-    DlgLocalGameOptions dlg(this);
-    if (dlg.exec() != QDialog::Accepted) {
+    bool ok;
+    int numberPlayers =
+        QInputDialog::getInt(this, tr("Number of players"), tr("Please enter the number of players."), 1, 1, 8, 1, &ok);
+    if (!ok)
         return;
-    }
 
-    startLocalGame(dlg.getOptions());
+    startLocalGame(numberPlayers);
 }
 
-void MainWindow::startLocalGame(const LocalGameOptions &options)
+void MainWindow::startLocalGame(int numberPlayers)
 {
     aConnect->setEnabled(false);
     aRegister->setEnabled(false);
@@ -248,7 +249,7 @@ void MainWindow::startLocalGame(const LocalGameOptions &options)
     QList<AbstractClient *> localClients;
     localClients.append(mainClient);
 
-    for (int i = 0; i < options.numberPlayers - 1; ++i) {
+    for (int i = 0; i < numberPlayers - 1; ++i) {
         LocalServerInterface *slaveLsi = localServer->newConnection();
         LocalClient *slaveClient =
             new LocalClient(slaveLsi, tr("Player %1").arg(i + 2), SettingsCache::instance().getClientID(), this);
@@ -257,8 +258,7 @@ void MainWindow::startLocalGame(const LocalGameOptions &options)
     tabSupervisor->startLocal(localClients);
 
     Command_CreateGame createCommand;
-    createCommand.set_max_players(static_cast<google::protobuf::uint32>(options.numberPlayers));
-    createCommand.set_starting_life_total(options.startingLifeTotal);
+    createCommand.set_max_players(static_cast<google::protobuf::uint32>(numberPlayers));
     mainClient->sendCommand(LocalClient::prepareRoomCommand(createCommand, 0));
 }
 
@@ -278,11 +278,9 @@ void MainWindow::actWatchReplay()
     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()
@@ -502,7 +500,11 @@ QString MainWindow::extractInvalidUsernameMessage(QString &in)
                 if (words.startsWith("\n")) {
                     out += tr("no unacceptable language as specified by these server rules:",
                               "note that the following lines will not be translated");
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
                     for (QString &line : words.split("\n", Qt::SkipEmptyParts)) {
+#else
+                    for (QString &line : words.split("\n", QString::SkipEmptyParts)) {
+#endif
                         out += "<li>" + line + "</li>";
                     }
                 } else {
@@ -844,7 +846,7 @@ MainWindow::MainWindow(QWidget *parent)
             &MainWindow::pixmapCacheSizeChanged);
     pixmapCacheSizeChanged(SettingsCache::instance().getPixmapCacheSize());
 
-    client = new RemoteClient(nullptr, &SettingsCache::instance());
+    client = new RemoteClient;
     connect(client, &RemoteClient::connectionClosedEventReceived, this, &MainWindow::processConnectionClosedEvent);
     connect(client, &RemoteClient::serverShutdownEventReceived, this, &MainWindow::processServerShutdownEvent);
     connect(client, &RemoteClient::loginError, this, &MainWindow::loginError);
@@ -882,7 +884,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     retranslateUi();
 
-    if (!restoreGeometry(SettingsCache::instance().layouts().getMainWindowGeometry())) {
+    if (!restoreGeometry(SettingsCache::instance().getMainWindowGeometry())) {
         setWindowState(Qt::WindowMaximized);
     }
     aFullScreen->setChecked(static_cast<bool>(windowState() & Qt::WindowFullScreen));
@@ -916,9 +918,7 @@ MainWindow::MainWindow(QWidget *parent)
 void MainWindow::startupConfigCheck()
 {
     if (SettingsCache::instance().debug().getLocalGameOnStartup()) {
-        LocalGameOptions options;
-        options.numberPlayers = SettingsCache::instance().debug().getLocalGamePlayerCount();
-        startLocalGame(options);
+        startLocalGame(SettingsCache::instance().debug().getLocalGamePlayerCount());
     }
 
     if (SettingsCache::instance().getCheckUpdatesOnStartup()) {
@@ -943,25 +943,9 @@ void MainWindow::startupConfigCheck()
             const auto reloadOk0 = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
         }
 
-        qCInfo(WindowMainStartupShortcutsLog) << "Migrating shortcuts after update detected.";
+        qCInfo(WindowMainStartupShortcutsLog) << "[MainWindow] Migrating shortcuts after update detected.";
         SettingsCache::instance().shortcuts().migrateShortcuts();
 
-        if (SettingsCache::instance().getCheckUpdatesOnStartup()) {
-            if (QString(VERSION_STRING).contains("custom", Qt::CaseInsensitive)) {
-                qCInfo(WindowMainStartupShortcutsLog) << "Update has changed to custom version, disabling auto update";
-                SettingsCache::instance().setCheckUpdatesOnStartup(Qt::Unchecked);
-            } else {
-                int channel = 0;
-                if (QString(VERSION_STRING).contains("beta", Qt::CaseInsensitive)) {
-                    channel = 1;
-                }
-                if (SettingsCache::instance().getUpdateReleaseChannelIndex() != channel) {
-                    qCInfo(WindowMainStartupShortcutsLog) << "Update has changed beta state, updating release channel.";
-                    SettingsCache::instance().setUpdateReleaseChannelIndex(channel);
-                }
-            }
-        }
-
         SettingsCache::instance().setClientVersion(VERSION_STRING);
     } else {
         // previous config from this version found
@@ -1037,13 +1021,6 @@ MainWindow::~MainWindow()
         trayIcon->deleteLater();
     }
 
-    if (cardUpdateProcess) {
-        cardUpdateProcess->disconnect(this);
-        cardUpdateProcess->terminate();
-        cardUpdateProcess->waitForFinished(1000);
-        cardUpdateProcess = nullptr;
-    }
-
     client->deleteLater();
     clientThread->wait();
 }
@@ -1103,7 +1080,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
     tip->close();
 
     event->accept();
-    SettingsCache::instance().layouts().setMainWindowGeometry(saveGeometry());
+    SettingsCache::instance().setMainWindowGeometry(saveGeometry());
     tabSupervisor->deleteLater();
 }
 
diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h
index ed6de5b0d..11f908c6f 100644
--- a/cockatrice/src/interface/window_main.h
+++ b/cockatrice/src/interface/window_main.h
@@ -17,23 +17,19 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-/**
- * @file window_main.h
- * @ingroup Core
- * @brief TODO: Document this.
- */
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "widgets/dialogs/dlg_local_game_options.h"
+#include "../server/abstract_client.h"
+#include "pb/response.pb.h"
 
 #include <QList>
+#include <QLoggingCategory>
 #include <QMainWindow>
 #include <QMessageBox>
+#include <QProcess>
 #include <QSystemTrayIcon>
 #include <QtNetwork>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
 
 inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main");
 inline Q_LOGGING_CATEGORY(WindowMainStartupLog, "window_main.startup");
@@ -135,11 +131,11 @@ private:
     inline QString getCardUpdaterBinaryName()
     {
         return "oracle";
-    }
+    };
     void createCardUpdateProcess(bool background = false);
     void exitCardDatabaseUpdate();
 
-    void startLocalGame(const LocalGameOptions &options);
+    void startLocalGame(int numberPlayers);
 
     QList<QMenu *> tabMenus;
     QMenu *cockatriceMenu, *dbMenu, *tabsMenu, *helpMenu, *trayIconMenu;
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index 7092a3fd7..3a047ef98 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -20,27 +20,31 @@
 
 #include "main.h"
 
-#include "client/network/update/card_spoiler/spoiler_background_updater.h"
-#include "client/settings/cache_settings.h"
+#include "QtNetwork/QNetworkInterface"
+#include "client/network/spoiler_background_updater.h"
 #include "client/sound_engine.h"
-#include "database/interface/settings_card_preference_provider.h"
-#include "interface/logger.h"
+#include "dialogs/dlg_settings.h"
+#include "featureset.h"
 #include "interface/pixel_map_generator.h"
 #include "interface/theme_manager.h"
-#include "interface/widgets/dialogs/dlg_settings.h"
 #include "interface/window_main.h"
+#include "rng_sfmt.h"
+#include "settings/cache_settings.h"
+#include "utility/logger.h"
 #include "version_string.h"
 
 #include <QApplication>
 #include <QCryptographicHash>
 #include <QDateTime>
 #include <QDebug>
+#include <QDir>
+#include <QFile>
 #include <QLibraryInfo>
 #include <QLocale>
 #include <QSystemTrayIcon>
+#include <QTextStream>
 #include <QTranslator>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/rng/rng_sfmt.h>
+#include <QtPlugin>
 
 QTranslator *translator, *qtTranslator;
 RNG_Abstract *rng;
@@ -246,11 +250,6 @@ int main(int argc, char *argv[])
 
     QLocale::setDefault(QLocale::English);
 
-    // Dependency Injections
-    CardDatabaseManager::setCardPreferenceProvider(new SettingsCardPreferenceProvider());
-    CardDatabaseManager::setCardDatabasePathProvider(&SettingsCache::instance());
-    CardDatabaseManager::setCardSetPriorityController(SettingsCache::instance().cardDatabase());
-
     qCInfo(MainLog) << "Starting main program";
 
     MainWindow ui;
@@ -260,8 +259,10 @@ int main(int argc, char *argv[])
     qCInfo(MainLog) << "MainWindow constructor finished";
 
     ui.setWindowIcon(QPixmap("theme:cockatrice"));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
     // set name of the app desktop file; used by wayland to load the window icon
     QGuiApplication::setDesktopFileName("cockatrice");
+#endif
 
     SettingsCache::instance().setClientID(generateClientID());
 
diff --git a/cockatrice/src/main.h b/cockatrice/src/main.h
index b6e086744..e7dccd631 100644
--- a/cockatrice/src/main.h
+++ b/cockatrice/src/main.h
@@ -1,12 +1,8 @@
-/**
- * @file main.h
- * @ingroup Core
- * @brief TODO: Document this.
- */
-
 #ifndef MAIN_H
 #define MAIN_H
 
+#include "utility/macros.h"
+
 #include <QLoggingCategory>
 
 inline Q_LOGGING_CATEGORY(MainLog, "main");
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp b/cockatrice/src/picture_loader/picture_loader.cpp
similarity index 64%
rename from cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
rename to cockatrice/src/picture_loader/picture_loader.cpp
index dbd51b973..22f81c5dd 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
+++ b/cockatrice/src/picture_loader/picture_loader.cpp
@@ -1,6 +1,6 @@
-#include "card_picture_loader.h"
+#include "picture_loader.h"
 
-#include "../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 
 #include <QApplication>
 #include <QBuffer>
@@ -9,6 +9,7 @@
 #include <QFileInfo>
 #include <QMainWindow>
 #include <QMovie>
+#include <QNetworkDiskCache>
 #include <QNetworkRequest>
 #include <QPainter>
 #include <QPixmapCache>
@@ -21,46 +22,43 @@
 // never cache more than 300 cards at once for a single deck
 #define CACHED_CARD_PER_DECK_MAX 300
 
-CardPictureLoader::CardPictureLoader() : QObject(nullptr)
+PictureLoader::PictureLoader() : QObject(nullptr)
 {
-    worker = new CardPictureLoaderWorker;
-    connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &CardPictureLoader::picsPathChanged);
-    connect(&SettingsCache::instance(), &SettingsCache::picDownloadChanged, this,
-            &CardPictureLoader::picDownloadChanged);
+    worker = new PictureLoaderWorker;
+    connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &PictureLoader::picsPathChanged);
+    connect(&SettingsCache::instance(), &SettingsCache::picDownloadChanged, this, &PictureLoader::picDownloadChanged);
 
-    qRegisterMetaType<ExactCard>();
-    connect(worker, &CardPictureLoaderWorker::imageLoaded, this, &CardPictureLoader::imageLoaded);
+    connect(worker, &PictureLoaderWorker::imageLoaded, this, &PictureLoader::imageLoaded);
 
-    statusBar = new CardPictureLoaderStatusBar(nullptr);
+    statusBar = new PictureLoaderStatusBar(nullptr);
     QMainWindow *mainWindow = qobject_cast<QMainWindow *>(QApplication::activeWindow());
     if (mainWindow) {
         mainWindow->statusBar()->addPermanentWidget(statusBar);
     }
 
-    connect(worker, &CardPictureLoaderWorker::imageRequestQueued, statusBar,
-            &CardPictureLoaderStatusBar::addQueuedImageLoad);
-    connect(worker, &CardPictureLoaderWorker::imageRequestSucceeded, statusBar,
-            &CardPictureLoaderStatusBar::addSuccessfulImageLoad);
+    connect(worker, &PictureLoaderWorker::imageRequestQueued, statusBar, &PictureLoaderStatusBar::addQueuedImageLoad);
+    connect(worker, &PictureLoaderWorker::imageRequestSucceeded, statusBar,
+            &PictureLoaderStatusBar::addSuccessfulImageLoad);
 }
 
-CardPictureLoader::~CardPictureLoader()
+PictureLoader::~PictureLoader()
 {
     worker->deleteLater();
 }
 
-void CardPictureLoader::getCardBackPixmap(QPixmap &pixmap, QSize size)
+void PictureLoader::getCardBackPixmap(QPixmap &pixmap, QSize size)
 {
     QString backCacheKey = "_trice_card_back_" + QString::number(size.width()) + "x" + QString::number(size.height());
     if (!QPixmapCache::find(backCacheKey, &pixmap)) {
-        qCDebug(CardPictureLoaderLog) << "PictureLoader: cache miss for" << backCacheKey;
+        qCDebug(PictureLoaderLog) << "PictureLoader: cache miss for" << backCacheKey;
         QPixmap tmpPixmap("theme:cardback");
 
         if (tmpPixmap.isNull()) {
-            qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback'! Using fallback pixmap.";
+            qCWarning(PictureLoaderLog) << "Failed to load 'theme:cardback'! Using fallback pixmap.";
             tmpPixmap = QPixmap(size);
             tmpPixmap.fill(Qt::gray); // Fallback to a gray pixmap
         } else {
-            qCDebug(CardPictureLoaderLog) << "Successfully loaded 'theme:cardback'.";
+            qCDebug(PictureLoaderLog) << "Successfully loaded 'theme:cardback'.";
         }
 
         pixmap = tmpPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -68,21 +66,20 @@ void CardPictureLoader::getCardBackPixmap(QPixmap &pixmap, QSize size)
     }
 }
 
-void CardPictureLoader::getCardBackLoadingInProgressPixmap(QPixmap &pixmap, QSize size)
+void PictureLoader::getCardBackLoadingInProgressPixmap(QPixmap &pixmap, QSize size)
 {
     QString backCacheKey =
         "_trice_card_back_inprogress_" + QString::number(size.width()) + "x" + QString::number(size.height());
     if (!QPixmapCache::find(backCacheKey, &pixmap)) {
-        qCDebug(CardPictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey;
+        qCDebug(PictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey;
         QPixmap tmpPixmap("theme:cardback");
 
         if (tmpPixmap.isNull()) {
-            qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback' for in-progress state! Using fallback.";
+            qCWarning(PictureLoaderLog) << "Failed to load 'theme:cardback' for in-progress state! Using fallback.";
             tmpPixmap = QPixmap(size);
             tmpPixmap.fill(Qt::blue); // Fallback with blue color
         } else {
-            qCDebug(CardPictureLoaderCardBackCacheFailLog)
-                << "Successfully loaded 'theme:cardback' for in-progress state.";
+            qCDebug(PictureLoaderCardBackCacheFailLog) << "Successfully loaded 'theme:cardback' for in-progress state.";
         }
 
         pixmap = tmpPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -90,20 +87,20 @@ void CardPictureLoader::getCardBackLoadingInProgressPixmap(QPixmap &pixmap, QSiz
     }
 }
 
-void CardPictureLoader::getCardBackLoadingFailedPixmap(QPixmap &pixmap, QSize size)
+void PictureLoader::getCardBackLoadingFailedPixmap(QPixmap &pixmap, QSize size)
 {
     QString backCacheKey =
         "_trice_card_back_failed_" + QString::number(size.width()) + "x" + QString::number(size.height());
     if (!QPixmapCache::find(backCacheKey, &pixmap)) {
-        qCDebug(CardPictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey;
+        qCDebug(PictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey;
         QPixmap tmpPixmap("theme:cardback");
 
         if (tmpPixmap.isNull()) {
-            qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback' for failed state! Using fallback.";
+            qCWarning(PictureLoaderLog) << "Failed to load 'theme:cardback' for failed state! Using fallback.";
             tmpPixmap = QPixmap(size);
             tmpPixmap.fill(Qt::red); // Fallback with red color
         } else {
-            qCDebug(CardPictureLoaderCardBackCacheFailLog) << "Successfully loaded 'theme:cardback' for failed state.";
+            qCDebug(PictureLoaderCardBackCacheFailLog) << "Successfully loaded 'theme:cardback' for failed state.";
         }
 
         pixmap = tmpPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -111,10 +108,10 @@ void CardPictureLoader::getCardBackLoadingFailedPixmap(QPixmap &pixmap, QSize si
     }
 }
 
-void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize size)
+void PictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize size)
 {
     if (!card) {
-        qCWarning(CardPictureLoaderLog) << "getPixmap called with null card!";
+        qCWarning(PictureLoaderLog) << "getPixmap called with null card!";
         return;
     }
 
@@ -129,13 +126,13 @@ void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize
     QPixmap bigPixmap;
     if (QPixmapCache::find(key, &bigPixmap)) {
         if (bigPixmap.isNull()) {
-            qCDebug(CardPictureLoaderLog) << "Cached pixmap for key" << key << "is NULL!";
+            qCDebug(PictureLoaderLog) << "Cached pixmap for key" << key << "is NULL!";
             return;
         }
 
         QScreen *screen = qApp->primaryScreen();
         qreal dpr = screen ? screen->devicePixelRatio() : 1.0;
-        qCDebug(CardPictureLoaderLog) << "Scaling cached image for" << card.getName();
+        qCDebug(PictureLoaderLog) << "Scaling cached image for" << card.getName();
 
         pixmap = bigPixmap.scaled(size * dpr, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         pixmap.setDevicePixelRatio(dpr);
@@ -144,17 +141,17 @@ void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize
     }
 
     // add the card to the load queue
-    qCDebug(CardPictureLoaderLog) << "Enqueuing " << card.getName() << " for " << card.getPixmapCacheKey();
+    qCDebug(PictureLoaderLog) << "Enqueuing " << card.getName() << " for " << card.getPixmapCacheKey();
     getInstance().worker->enqueueImageLoad(card);
 }
 
-void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image)
+void PictureLoader::imageLoaded(const ExactCard &card, const QImage &image)
 {
     if (image.isNull()) {
-        qCDebug(CardPictureLoaderLog) << "Caching NULL pixmap for" << card.getName();
+        qCDebug(PictureLoaderLog) << "Caching NULL pixmap for" << card.getName();
         QPixmapCache::insert(card.getPixmapCacheKey(), QPixmap());
     } else {
-        if (card.getInfo().getUiAttributes().upsideDownArt) {
+        if (card.getInfo().getUpsideDownArt()) {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0))
             QImage mirrorImage = image.flipped(Qt::Horizontal | Qt::Vertical);
 #else
@@ -167,7 +164,7 @@ void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image)
     }
 
     // imageLoaded should only be reached if the exactCard isn't already in cache.
-    // (plus there's a deduplication mechanism in CardPictureLoaderWorker)
+    // (plus there's a deduplication mechanism in PictureLoaderWorker)
     // It should be safe to connect the CardInfo here without worrying about redundant connections.
     connect(card.getCardPtr().data(), &QObject::destroyed, this,
             [cacheKey = card.getPixmapCacheKey()] { QPixmapCache::remove(cacheKey); });
@@ -175,17 +172,17 @@ void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image)
     card.emitPixmapUpdated();
 }
 
-void CardPictureLoader::clearPixmapCache()
+void PictureLoader::clearPixmapCache()
 {
     QPixmapCache::clear();
 }
 
-void CardPictureLoader::clearNetworkCache()
+void PictureLoader::clearNetworkCache()
 {
     getInstance().worker->clearNetworkCache();
 }
 
-void CardPictureLoader::cacheCardPixmaps(const QList<ExactCard> &cards)
+void PictureLoader::cacheCardPixmaps(const QList<ExactCard> &cards)
 {
     QPixmap tmp;
     int max = qMin(cards.size(), CACHED_CARD_PER_DECK_MAX);
@@ -204,17 +201,17 @@ void CardPictureLoader::cacheCardPixmaps(const QList<ExactCard> &cards)
     }
 }
 
-void CardPictureLoader::picDownloadChanged()
+void PictureLoader::picDownloadChanged()
 {
     QPixmapCache::clear();
 }
 
-void CardPictureLoader::picsPathChanged()
+void PictureLoader::picsPathChanged()
 {
     QPixmapCache::clear();
 }
 
-bool CardPictureLoader::hasCustomArt()
+bool PictureLoader::hasCustomArt()
 {
     auto picsPath = SettingsCache::instance().getPicsPath();
     QDirIterator it(picsPath, QDir::Dirs | QDir::NoDotAndDotDot);
diff --git a/cockatrice/src/picture_loader/picture_loader.h b/cockatrice/src/picture_loader/picture_loader.h
new file mode 100644
index 000000000..793c611de
--- /dev/null
+++ b/cockatrice/src/picture_loader/picture_loader.h
@@ -0,0 +1,52 @@
+#ifndef PICTURELOADER_H
+#define PICTURELOADER_H
+
+#include "../card/card_info.h"
+#include "picture_loader_status_bar.h"
+#include "picture_loader_worker.h"
+
+#include <QLoggingCategory>
+
+inline Q_LOGGING_CATEGORY(PictureLoaderLog, "picture_loader");
+inline Q_LOGGING_CATEGORY(PictureLoaderCardBackCacheFailLog, "picture_loader.card_back_cache_fail");
+
+class PictureLoader : public QObject
+{
+    Q_OBJECT
+public:
+    static PictureLoader &getInstance()
+    {
+        static PictureLoader instance;
+        return instance;
+    }
+
+private:
+    explicit PictureLoader();
+    ~PictureLoader() override;
+    // Singleton - Don't implement copy constructor and assign operator
+    PictureLoader(PictureLoader const &);
+    void operator=(PictureLoader const &);
+
+    PictureLoaderWorker *worker;
+    PictureLoaderStatusBar *statusBar;
+
+public:
+    static void getPixmap(QPixmap &pixmap, const ExactCard &card, QSize size);
+    static void getCardBackPixmap(QPixmap &pixmap, QSize size);
+    static void getCardBackLoadingInProgressPixmap(QPixmap &pixmap, QSize size);
+    static void getCardBackLoadingFailedPixmap(QPixmap &pixmap, QSize size);
+    static void clearPixmapCache();
+    static void cacheCardPixmaps(const QList<ExactCard> &cards);
+    static bool hasCustomArt();
+
+public slots:
+    static void clearNetworkCache();
+
+private slots:
+    void picDownloadChanged();
+    void picsPathChanged();
+
+public slots:
+    void imageLoaded(const ExactCard &card, const QImage &image);
+};
+#endif
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp b/cockatrice/src/picture_loader/picture_loader_local.cpp
similarity index 76%
rename from cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
rename to cockatrice/src/picture_loader/picture_loader_local.cpp
index dd00e6e1d..a939f2c66 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
+++ b/cockatrice/src/picture_loader/picture_loader_local.cpp
@@ -1,30 +1,29 @@
-#include "card_picture_loader_local.h"
+#include "picture_loader_local.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "card_picture_to_load.h"
+#include "../database/card_database_manager.h"
+#include "../settings/cache_settings.h"
+#include "picture_to_load.h"
 
 #include <QDirIterator>
 #include <QMovie>
-#include <libcockatrice/card/database/card_database_manager.h>
 
 static constexpr int REFRESH_INTERVAL_MS = 10 * 1000;
 
-CardPictureLoaderLocal::CardPictureLoaderLocal(QObject *parent)
+PictureLoaderLocal::PictureLoaderLocal(QObject *parent)
     : QObject(parent), picsPath(SettingsCache::instance().getPicsPath()),
       customPicsPath(SettingsCache::instance().getCustomPicsPath())
 {
     // Hook up signals to settings
-    connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this,
-            &CardPictureLoaderLocal::picsPathChanged);
+    connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &PictureLoaderLocal::picsPathChanged);
 
     refreshIndex();
 
     refreshTimer = new QTimer(this);
-    connect(refreshTimer, &QTimer::timeout, this, &CardPictureLoaderLocal::refreshIndex);
+    connect(refreshTimer, &QTimer::timeout, this, &PictureLoaderLocal::refreshIndex);
     refreshTimer->start(REFRESH_INTERVAL_MS);
 }
 
-void CardPictureLoaderLocal::refreshIndex()
+void PictureLoaderLocal::refreshIndex()
 {
     customFolderIndex.clear();
 
@@ -43,11 +42,17 @@ void CardPictureLoaderLocal::refreshIndex()
         }
     }
 
-    qCDebug(CardPictureLoaderLocalLog) << "Finished indexing local image folder CUSTOM; map now has"
-                                       << customFolderIndex.size() << "entries.";
+    qCDebug(PictureLoaderLocalLog) << "Finished indexing local image folder CUSTOM; map now has"
+                                   << customFolderIndex.size() << "entries.";
 }
 
-QImage CardPictureLoaderLocal::tryLoad(const ExactCard &toLoad) const
+/**
+ * Tries to load the card image from the local images.
+ *
+ * @param toLoad The card to load
+ * @return The loaded image, or an empty QImage if loading failed.
+ */
+QImage PictureLoaderLocal::tryLoad(const ExactCard &toLoad) const
 {
     PrintingInfo setInstance = toLoad.getPrinting();
 
@@ -62,15 +67,15 @@ QImage CardPictureLoaderLocal::tryLoad(const ExactCard &toLoad) const
         providerId = setInstance.getUuid();
     }
 
-    qCDebug(CardPictureLoaderLocalLog).nospace()
+    qCDebug(PictureLoaderLocalLog).nospace()
         << "[card: " << cardName << " set: " << setName << "]: Attempting to load picture from local";
     return tryLoadCardImageFromDisk(setName, correctedCardName, collectorNumber, providerId);
 }
 
-QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
-                                                        const QString &correctedCardName,
-                                                        const QString &collectorNumber,
-                                                        const QString &providerId) const
+QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
+                                                    const QString &correctedCardName,
+                                                    const QString &collectorNumber,
+                                                    const QString &providerId) const
 {
     QImage image;
     QImageReader imgReader;
@@ -129,7 +134,7 @@ QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
                 imgReader.setFileName(fullPath);
 
                 if (imgReader.read(&image)) {
-                    qCDebug(CardPictureLoaderLocalLog).nospace()
+                    qCDebug(PictureLoaderLocalLog).nospace()
                         << "[card: " << correctedCardName << " set: " << setName << "] Found picture at: " << fullPath;
                     return image;
                 }
@@ -137,12 +142,12 @@ QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
         }
     }
 
-    qCDebug(CardPictureLoaderLocalLog).nospace()
+    qCDebug(PictureLoaderLocalLog).nospace()
         << "[card: " << correctedCardName << " set: " << setName << "]: Picture NOT found on disk.";
     return QImage();
 }
 
-void CardPictureLoaderLocal::picsPathChanged()
+void PictureLoaderLocal::picsPathChanged()
 {
     picsPath = SettingsCache::instance().getPicsPath();
     customPicsPath = SettingsCache::instance().getCustomPicsPath();
diff --git a/cockatrice/src/picture_loader/picture_loader_local.h b/cockatrice/src/picture_loader/picture_loader_local.h
new file mode 100644
index 000000000..f78510337
--- /dev/null
+++ b/cockatrice/src/picture_loader/picture_loader_local.h
@@ -0,0 +1,42 @@
+#ifndef PICTURE_LOADER_LOCAL_H
+#define PICTURE_LOADER_LOCAL_H
+
+#include "../card/exact_card.h"
+
+#include <QLoggingCategory>
+#include <QObject>
+#include <QTimer>
+
+inline Q_LOGGING_CATEGORY(PictureLoaderLocalLog, "picture_loader.local");
+
+/**
+ * Handles searching for and loading card images from the local pics and custom image folders.
+ * This class maintains an index of the CUSTOM folder, to avoid repeatedly searching the entire directory.
+ */
+class PictureLoaderLocal : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit PictureLoaderLocal(QObject *parent);
+
+    QImage tryLoad(const ExactCard &toLoad) const;
+
+private:
+    QString picsPath, customPicsPath;
+
+    QMultiHash<QString, QString> customFolderIndex; // multimap of cardName to picPaths
+    QTimer *refreshTimer;
+
+    void refreshIndex();
+
+    QImage tryLoadCardImageFromDisk(const QString &setName,
+                                    const QString &correctedCardName,
+                                    const QString &collectorNumber,
+                                    const QString &providerId) const;
+
+private slots:
+    void picsPathChanged();
+};
+
+#endif // PICTURE_LOADER_LOCAL_H
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp b/cockatrice/src/picture_loader/picture_loader_request_status_display_widget.cpp
similarity index 74%
rename from cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
rename to cockatrice/src/picture_loader/picture_loader_request_status_display_widget.cpp
index d1895af06..6403f576c 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
+++ b/cockatrice/src/picture_loader/picture_loader_request_status_display_widget.cpp
@@ -1,9 +1,9 @@
-#include "card_picture_loader_request_status_display_widget.h"
+#include "picture_loader_request_status_display_widget.h"
 
-CardPictureLoaderRequestStatusDisplayWidget::CardPictureLoaderRequestStatusDisplayWidget(QWidget *parent,
-                                                                                         const QUrl &_url,
-                                                                                         const ExactCard &card,
-                                                                                         const QString &setName)
+PictureLoaderRequestStatusDisplayWidget::PictureLoaderRequestStatusDisplayWidget(QWidget *parent,
+                                                                                 const QUrl &_url,
+                                                                                 const ExactCard &card,
+                                                                                 const QString &setName)
     : QWidget(parent)
 {
     layout = new QHBoxLayout(this);
diff --git a/cockatrice/src/picture_loader/picture_loader_request_status_display_widget.h b/cockatrice/src/picture_loader/picture_loader_request_status_display_widget.h
new file mode 100644
index 000000000..79da7a8e4
--- /dev/null
+++ b/cockatrice/src/picture_loader/picture_loader_request_status_display_widget.h
@@ -0,0 +1,68 @@
+#ifndef PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
+#define PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
+#include "picture_loader_worker_work.h"
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QWidget>
+
+class PictureLoaderRequestStatusDisplayWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    PictureLoaderRequestStatusDisplayWidget(QWidget *parent,
+                                            const QUrl &url,
+                                            const ExactCard &card,
+                                            const QString &setName);
+
+    void setFinished()
+    {
+        finished->setText("True");
+        update();
+        repaint();
+    }
+
+    bool getFinished() const
+    {
+        return finished->text() == "True";
+    }
+
+    void setElapsedTime(const QString &_elapsedTime) const
+    {
+        elapsedTime->setText(_elapsedTime);
+    }
+
+    int queryElapsedSeconds()
+    {
+        if (!finished) {
+            int elapsedSeconds = QDateTime::fromString(startTime->text()).secsTo(QDateTime::currentDateTime());
+            elapsedTime->setText(QString::number(elapsedSeconds));
+            update();
+            repaint();
+            return elapsedSeconds;
+        }
+        return elapsedTime->text().toInt();
+    }
+
+    QString getStartTime() const
+    {
+        return startTime->text();
+    }
+
+    QString getUrl() const
+    {
+        return url->text();
+    }
+
+private:
+    QHBoxLayout *layout;
+    QLabel *name;
+    QLabel *setShortname;
+    QLabel *providerId;
+    QLabel *startTime;
+    QLabel *elapsedTime;
+    QLabel *finished;
+    QLabel *url;
+};
+
+#endif // PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp b/cockatrice/src/picture_loader/picture_loader_status_bar.cpp
similarity index 54%
rename from cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
rename to cockatrice/src/picture_loader/picture_loader_status_bar.cpp
index 9e7e645bd..40104bb23 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
+++ b/cockatrice/src/picture_loader/picture_loader_status_bar.cpp
@@ -1,8 +1,8 @@
-#include "card_picture_loader_status_bar.h"
+#include "picture_loader_status_bar.h"
 
-#include "card_picture_loader_request_status_display_widget.h"
+#include "picture_loader_request_status_display_widget.h"
 
-CardPictureLoaderStatusBar::CardPictureLoaderStatusBar(QWidget *parent) : QWidget(parent)
+PictureLoaderStatusBar::PictureLoaderStatusBar(QWidget *parent) : QWidget(parent)
 {
     layout = new QHBoxLayout(this);
     progressBar = new QProgressBar(this);
@@ -15,19 +15,19 @@ CardPictureLoaderStatusBar::CardPictureLoaderStatusBar(QWidget *parent) : QWidge
 
     cleaner = new QTimer(this);
     cleaner->setInterval(1000);
-    connect(cleaner, &QTimer::timeout, this, &CardPictureLoaderStatusBar::cleanOldEntries);
+    connect(cleaner, &QTimer::timeout, this, &PictureLoaderStatusBar::cleanOldEntries);
     cleaner->start();
 
     setLayout(layout);
 }
 
-void CardPictureLoaderStatusBar::cleanOldEntries()
+void PictureLoaderStatusBar::cleanOldEntries()
 {
     if (!loadLog || !loadLog->popup) {
         return;
     }
-    for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget :
-         loadLog->popup->findChildren<CardPictureLoaderRequestStatusDisplayWidget *>()) {
+    for (PictureLoaderRequestStatusDisplayWidget *statusDisplayWidget :
+         loadLog->popup->findChildren<PictureLoaderRequestStatusDisplayWidget *>()) {
         statusDisplayWidget->queryElapsedSeconds();
         if (statusDisplayWidget->getFinished() &&
             QDateTime::fromString(statusDisplayWidget->getStartTime()).secsTo(QDateTime::currentDateTime()) > 10) {
@@ -38,17 +38,17 @@ void CardPictureLoaderStatusBar::cleanOldEntries()
     }
 }
 
-void CardPictureLoaderStatusBar::addQueuedImageLoad(const QUrl &url, const ExactCard &card, const QString &setName)
+void PictureLoaderStatusBar::addQueuedImageLoad(const QUrl &url, const ExactCard &card, const QString &setName)
 {
-    loadLog->addSettingsWidget(new CardPictureLoaderRequestStatusDisplayWidget(loadLog, url, card, setName));
+    loadLog->addSettingsWidget(new PictureLoaderRequestStatusDisplayWidget(loadLog, url, card, setName));
     progressBar->setMaximum(progressBar->maximum() + 1);
 }
 
-void CardPictureLoaderStatusBar::addSuccessfulImageLoad(const QUrl &url)
+void PictureLoaderStatusBar::addSuccessfulImageLoad(const QUrl &url)
 {
     progressBar->setValue(progressBar->value() + 1);
-    for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget :
-         loadLog->popup->findChildren<CardPictureLoaderRequestStatusDisplayWidget *>()) {
+    for (PictureLoaderRequestStatusDisplayWidget *statusDisplayWidget :
+         loadLog->popup->findChildren<PictureLoaderRequestStatusDisplayWidget *>()) {
         if (statusDisplayWidget->getUrl() == url.toString()) {
             statusDisplayWidget->queryElapsedSeconds();
             statusDisplayWidget->setFinished();
diff --git a/cockatrice/src/picture_loader/picture_loader_status_bar.h b/cockatrice/src/picture_loader/picture_loader_status_bar.h
new file mode 100644
index 000000000..759a8b7a2
--- /dev/null
+++ b/cockatrice/src/picture_loader/picture_loader_status_bar.h
@@ -0,0 +1,29 @@
+#ifndef PICTURE_LOADER_STATUS_BAR_H
+#define PICTURE_LOADER_STATUS_BAR_H
+
+#include "../interface/widgets/quick_settings/settings_button_widget.h"
+#include "picture_loader_worker_work.h"
+
+#include <QHBoxLayout>
+#include <QProgressBar>
+#include <QWidget>
+
+class PictureLoaderStatusBar : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit PictureLoaderStatusBar(QWidget *parent);
+
+public slots:
+    void addQueuedImageLoad(const QUrl &url, const ExactCard &card, const QString &setName);
+    void addSuccessfulImageLoad(const QUrl &url);
+    void cleanOldEntries();
+
+private:
+    QHBoxLayout *layout;
+    QProgressBar *progressBar;
+    SettingsButtonWidget *loadLog;
+    QTimer *cleaner;
+};
+
+#endif // PICTURE_LOADER_STATUS_BAR_H
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp b/cockatrice/src/picture_loader/picture_loader_worker.cpp
similarity index 75%
rename from cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
rename to cockatrice/src/picture_loader/picture_loader_worker.cpp
index a246d74f2..42429d0e3 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
+++ b/cockatrice/src/picture_loader/picture_loader_worker.cpp
@@ -1,8 +1,9 @@
-#include "card_picture_loader_worker.h"
+#include "picture_loader_worker.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "card_picture_loader_local.h"
-#include "card_picture_loader_worker_work.h"
+#include "../database/card_database_manager.h"
+#include "../settings/cache_settings.h"
+#include "picture_loader_local.h"
+#include "picture_loader_worker_work.h"
 
 #include <QDirIterator>
 #include <QMovie>
@@ -10,18 +11,19 @@
 #include <QNetworkReply>
 #include <QThread>
 #include <utility>
-#include <version_string.h>
 
 static constexpr int MAX_REQUESTS_PER_SEC = 10;
 
-CardPictureLoaderWorker::CardPictureLoaderWorker()
+PictureLoaderWorker::PictureLoaderWorker()
     : QObject(nullptr), picDownload(SettingsCache::instance().getPicDownload()), requestQuota(MAX_REQUESTS_PER_SEC)
 {
     networkManager = new QNetworkAccessManager(this);
     // We need a timeout to ensure requests don't hang indefinitely in case of
     // cache corruption, see related Qt bug: https://bugreports.qt.io/browse/QTBUG-111397
     // Use Qt's default timeout (30s, as of 2023-02-22)
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
     networkManager->setTransferTimeout();
+#endif
     cache = new QNetworkDiskCache(this);
     cache->setCacheDirectory(SettingsCache::instance().getNetworkCachePath());
     cache->setMaximumCacheSize(1024L * 1024L *
@@ -39,28 +41,28 @@ CardPictureLoaderWorker::CardPictureLoaderWorker()
     cleanStaleEntries();
 
     connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this,
-            &CardPictureLoaderWorker::saveRedirectCache);
+            &PictureLoaderWorker::saveRedirectCache);
 
-    localLoader = new CardPictureLoaderLocal(this);
+    localLoader = new PictureLoaderLocal(this);
 
     pictureLoaderThread = new QThread;
     pictureLoaderThread->start(QThread::LowPriority);
     moveToThread(pictureLoaderThread);
 
-    connect(this, &CardPictureLoaderWorker::imageLoadEnqueued, this, &CardPictureLoaderWorker::handleImageLoadEnqueued);
+    connect(this, &PictureLoaderWorker::imageLoadEnqueued, this, &PictureLoaderWorker::handleImageLoadEnqueued);
 
-    connect(&requestTimer, &QTimer::timeout, this, &CardPictureLoaderWorker::resetRequestQuota);
+    connect(&requestTimer, &QTimer::timeout, this, &PictureLoaderWorker::resetRequestQuota);
     requestTimer.setInterval(1000);
     requestTimer.start();
 }
 
-CardPictureLoaderWorker::~CardPictureLoaderWorker()
+PictureLoaderWorker::~PictureLoaderWorker()
 {
     saveRedirectCache();
     pictureLoaderThread->deleteLater();
 }
 
-void CardPictureLoaderWorker::queueRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker)
+void PictureLoaderWorker::queueRequest(const QUrl &url, PictureLoaderWorkerWork *worker)
 {
     QUrl cachedRedirect = getCachedRedirect(url);
     if (!cachedRedirect.isEmpty()) {
@@ -75,7 +77,7 @@ void CardPictureLoaderWorker::queueRequest(const QUrl &url, CardPictureLoaderWor
     }
 }
 
-QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker)
+QNetworkReply *PictureLoaderWorker::makeRequest(const QUrl &url, PictureLoaderWorkerWork *worker)
 {
     // Check for cached redirects
     QUrl cachedRedirect = getCachedRedirect(url);
@@ -85,8 +87,6 @@ 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");
     if (!picDownload) {
         req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
     }
@@ -99,20 +99,27 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture
     return reply;
 }
 
-void CardPictureLoaderWorker::resetRequestQuota()
+void PictureLoaderWorker::resetRequestQuota()
 {
     requestQuota = MAX_REQUESTS_PER_SEC;
     processQueuedRequests();
 }
 
-void CardPictureLoaderWorker::processQueuedRequests()
+/**
+ * Keeps processing requests from the queue until it is empty or until the quota runs out.
+ */
+void PictureLoaderWorker::processQueuedRequests()
 {
     while (requestQuota > 0 && processSingleRequest()) {
         --requestQuota;
     }
 }
 
-bool CardPictureLoaderWorker::processSingleRequest()
+/**
+ * Immediately processes a single queued request. No-ops if the load queue is empty
+ * @return If a request was processed
+ */
+bool PictureLoaderWorker::processSingleRequest()
 {
     if (!requestLoadQueue.isEmpty()) {
         auto request = requestLoadQueue.takeFirst();
@@ -122,17 +129,17 @@ bool CardPictureLoaderWorker::processSingleRequest()
     return false;
 }
 
-void CardPictureLoaderWorker::enqueueImageLoad(const ExactCard &card)
+void PictureLoaderWorker::enqueueImageLoad(const ExactCard &card)
 {
     // Send call through a connection to ensure the handling is run on the pictureLoader thread
     emit imageLoadEnqueued(card);
 }
 
-void CardPictureLoaderWorker::handleImageLoadEnqueued(const ExactCard &card)
+void PictureLoaderWorker::handleImageLoadEnqueued(const ExactCard &card)
 {
     // deduplicate loads for the same card
     if (currentlyLoading.contains(card.getPixmapCacheKey())) {
-        qCDebug(CardPictureLoaderWorkerLog())
+        qCDebug(PictureLoaderWorkerLog())
             << "Skipping enqueued" << card.getName() << "because it's already being loaded";
         return;
     }
@@ -144,31 +151,31 @@ void CardPictureLoaderWorker::handleImageLoadEnqueued(const ExactCard &card)
         handleImageLoaded(card, image);
     } else {
         // queue up to load image from remote only after local loading failed
-        new CardPictureLoaderWorkerWork(this, card);
+        new PictureLoaderWorkerWork(this, card);
     }
 }
 
 /**
  * Called when image loading is done. Failures are indicated by an empty QImage.
  */
-void CardPictureLoaderWorker::handleImageLoaded(const ExactCard &card, const QImage &image)
+void PictureLoaderWorker::handleImageLoaded(const ExactCard &card, const QImage &image)
 {
     currentlyLoading.remove(card.getPixmapCacheKey());
     emit imageLoaded(card, image);
 }
 
-void CardPictureLoaderWorker::cacheRedirect(const QUrl &originalUrl, const QUrl &redirectUrl)
+void PictureLoaderWorker::cacheRedirect(const QUrl &originalUrl, const QUrl &redirectUrl)
 {
     redirectCache[originalUrl] = qMakePair(redirectUrl, QDateTime::currentDateTimeUtc());
     // saveRedirectCache();
 }
 
-void CardPictureLoaderWorker::removedCachedUrl(const QUrl &url)
+void PictureLoaderWorker::removedCachedUrl(const QUrl &url)
 {
     networkManager->cache()->remove(url);
 }
 
-QUrl CardPictureLoaderWorker::getCachedRedirect(const QUrl &originalUrl) const
+QUrl PictureLoaderWorker::getCachedRedirect(const QUrl &originalUrl) const
 {
     if (redirectCache.contains(originalUrl)) {
         return redirectCache[originalUrl].first;
@@ -176,7 +183,7 @@ QUrl CardPictureLoaderWorker::getCachedRedirect(const QUrl &originalUrl) const
     return {};
 }
 
-void CardPictureLoaderWorker::loadRedirectCache()
+void PictureLoaderWorker::loadRedirectCache()
 {
     QSettings settings(cacheFilePath, QSettings::IniFormat);
 
@@ -195,7 +202,7 @@ void CardPictureLoaderWorker::loadRedirectCache()
     settings.endArray();
 }
 
-void CardPictureLoaderWorker::saveRedirectCache() const
+void PictureLoaderWorker::saveRedirectCache() const
 {
     QSettings settings(cacheFilePath, QSettings::IniFormat);
 
@@ -210,7 +217,7 @@ void CardPictureLoaderWorker::saveRedirectCache() const
     settings.endArray();
 }
 
-void CardPictureLoaderWorker::cleanStaleEntries()
+void PictureLoaderWorker::cleanStaleEntries()
 {
     QDateTime now = QDateTime::currentDateTimeUtc();
 
@@ -224,7 +231,7 @@ void CardPictureLoaderWorker::cleanStaleEntries()
     }
 }
 
-void CardPictureLoaderWorker::clearNetworkCache()
+void PictureLoaderWorker::clearNetworkCache()
 {
     networkManager->cache()->clear();
     redirectCache.clear();
diff --git a/cockatrice/src/picture_loader/picture_loader_worker.h b/cockatrice/src/picture_loader/picture_loader_worker.h
new file mode 100644
index 000000000..1e9ca4be1
--- /dev/null
+++ b/cockatrice/src/picture_loader/picture_loader_worker.h
@@ -0,0 +1,78 @@
+#ifndef PICTURE_LOADER_WORKER_H
+#define PICTURE_LOADER_WORKER_H
+
+#include "../card/card_info.h"
+#include "../database/card_database.h"
+#include "picture_loader_local.h"
+#include "picture_loader_worker_work.h"
+#include "picture_to_load.h"
+
+#include <QLoggingCategory>
+#include <QMutex>
+#include <QNetworkAccessManager>
+#include <QNetworkDiskCache>
+#include <QObject>
+#include <QQueue>
+#include <QTimer>
+
+#define REDIRECT_HEADER_NAME "redirects"
+#define REDIRECT_ORIGINAL_URL "original"
+#define REDIRECT_URL "redirect"
+#define REDIRECT_TIMESTAMP "timestamp"
+#define REDIRECT_CACHE_FILENAME "cache.ini"
+
+inline Q_LOGGING_CATEGORY(PictureLoaderWorkerLog, "picture_loader.worker");
+
+class PictureLoaderWorkerWork;
+class PictureLoaderWorker : public QObject
+{
+    Q_OBJECT
+public:
+    explicit PictureLoaderWorker();
+    ~PictureLoaderWorker() override;
+
+    void enqueueImageLoad(const ExactCard &card);                        // Starts a thread for the image to be loaded
+    void queueRequest(const QUrl &url, PictureLoaderWorkerWork *worker); // Queues network requests for load threads
+    void clearNetworkCache();
+
+public slots:
+    QNetworkReply *makeRequest(const QUrl &url, PictureLoaderWorkerWork *workThread);
+    void processQueuedRequests();
+    bool processSingleRequest();
+    void handleImageLoaded(const ExactCard &card, const QImage &image);
+    void cacheRedirect(const QUrl &originalUrl, const QUrl &redirectUrl);
+    void removedCachedUrl(const QUrl &url);
+
+private:
+    QThread *pictureLoaderThread;
+    QNetworkAccessManager *networkManager;
+    QNetworkDiskCache *cache;
+    QHash<QUrl, QPair<QUrl, QDateTime>> redirectCache; // Stores redirect and timestamp
+    QString cacheFilePath;                             // Path to persistent storage
+    static constexpr int CacheTTLInDays = 30;          // TODO: Make user configurable
+    bool picDownload;
+    QQueue<QPair<QUrl, PictureLoaderWorkerWork *>> requestLoadQueue;
+
+    int requestQuota;
+    QTimer requestTimer; // Timer for refreshing request quota
+
+    PictureLoaderLocal *localLoader;
+    QSet<QString> currentlyLoading; // for deduplication purposes. Contains pixmapCacheKey
+
+    QUrl getCachedRedirect(const QUrl &originalUrl) const;
+    void loadRedirectCache();
+    void saveRedirectCache() const;
+    void cleanStaleEntries();
+
+private slots:
+    void resetRequestQuota();
+    void handleImageLoadEnqueued(const ExactCard &card);
+
+signals:
+    void imageLoadEnqueued(const ExactCard &card);
+    void imageLoaded(const ExactCard &card, const QImage &image);
+    void imageRequestQueued(const QUrl &url, const ExactCard &card, const QString &setName);
+    void imageRequestSucceeded(const QUrl &url);
+};
+
+#endif // PICTURE_LOADER_WORKER_H
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp b/cockatrice/src/picture_loader/picture_loader_worker_work.cpp
similarity index 69%
rename from cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
rename to cockatrice/src/picture_loader/picture_loader_worker_work.cpp
index 6bd57c3d5..4d9fb9354 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
+++ b/cockatrice/src/picture_loader/picture_loader_worker_work.cpp
@@ -1,34 +1,30 @@
-#include "card_picture_loader_worker_work.h"
+#include "picture_loader_worker_work.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "card_picture_loader_worker.h"
+#include "../database/card_database_manager.h"
+#include "../settings/cache_settings.h"
+#include "picture_loader_worker.h"
 
 #include <QBuffer>
 #include <QDirIterator>
 #include <QLoggingCategory>
 #include <QMovie>
+#include <QNetworkDiskCache>
 #include <QNetworkReply>
 #include <QThread>
 #include <QThreadPool>
 
 // Card back returned by gatherer when card is not found
-static const QStringList MD5_BLACKLIST = {
-    "db0c48db407a907c16ade38de048a441", // Old card back hash. Keep around just in case
-    "fbc7d763c08771c260b39e2115414eeb"  // Current card back hash
-};
+static const QStringList MD5_BLACKLIST = {"db0c48db407a907c16ade38de048a441"};
 
-CardPictureLoaderWorkerWork::CardPictureLoaderWorkerWork(const CardPictureLoaderWorker *worker, const ExactCard &toLoad)
-    : QObject(nullptr), cardToDownload(CardPictureToLoad(toLoad)),
-      picDownload(SettingsCache::instance().getPicDownload())
+PictureLoaderWorkerWork::PictureLoaderWorkerWork(const PictureLoaderWorker *worker, const ExactCard &toLoad)
+    : QObject(nullptr), cardToDownload(PictureToLoad(toLoad)), picDownload(SettingsCache::instance().getPicDownload())
 {
     // Hook up signals to the orchestrator
-    connect(this, &CardPictureLoaderWorkerWork::requestImageDownload, worker, &CardPictureLoaderWorker::queueRequest);
-    connect(this, &CardPictureLoaderWorkerWork::urlRedirected, worker, &CardPictureLoaderWorker::cacheRedirect);
-    connect(this, &CardPictureLoaderWorkerWork::cachedUrlInvalidated, worker,
-            &CardPictureLoaderWorker::removedCachedUrl);
-    connect(this, &CardPictureLoaderWorkerWork::imageLoaded, worker, &CardPictureLoaderWorker::handleImageLoaded);
-    connect(this, &CardPictureLoaderWorkerWork::requestSucceeded, worker,
-            &CardPictureLoaderWorker::imageRequestSucceeded);
+    connect(this, &PictureLoaderWorkerWork::requestImageDownload, worker, &PictureLoaderWorker::queueRequest);
+    connect(this, &PictureLoaderWorkerWork::urlRedirected, worker, &PictureLoaderWorker::cacheRedirect);
+    connect(this, &PictureLoaderWorkerWork::cachedUrlInvalidated, worker, &PictureLoaderWorker::removedCachedUrl);
+    connect(this, &PictureLoaderWorkerWork::imageLoaded, worker, &PictureLoaderWorker::handleImageLoaded);
+    connect(this, &PictureLoaderWorkerWork::requestSucceeded, worker, &PictureLoaderWorker::imageRequestSucceeded);
 
     // Hook up signals to settings
     connect(&SettingsCache::instance(), SIGNAL(picDownloadChanged()), this, SLOT(picDownloadChanged()));
@@ -36,7 +32,7 @@ CardPictureLoaderWorkerWork::CardPictureLoaderWorkerWork(const CardPictureLoader
     startNextPicDownload();
 }
 
-void CardPictureLoaderWorkerWork::startNextPicDownload()
+void PictureLoaderWorkerWork::startNextPicDownload()
 {
     QString picUrl = cardToDownload.getCurrentUrl();
 
@@ -44,7 +40,7 @@ void CardPictureLoaderWorkerWork::startNextPicDownload()
         picDownloadFailed();
     } else {
         QUrl url(picUrl);
-        qCDebug(CardPictureLoaderWorkerWorkLog).nospace()
+        qCDebug(PictureLoaderWorkerWorkLog).nospace()
             << "PictureLoader: [card: " << cardToDownload.getCard().getInfo().getCorrectedName()
             << " set: " << cardToDownload.getSetName() << "]: Trying to fetch picture from url "
             << url.toDisplayString();
@@ -52,7 +48,11 @@ void CardPictureLoaderWorkerWork::startNextPicDownload()
     }
 }
 
-void CardPictureLoaderWorkerWork::picDownloadFailed()
+/**
+ * Starts another pic download using the next possible url combination for the card.
+ * If all possibilities are exhausted, then concludes the image loading with an empty QImage.
+ */
+void PictureLoaderWorkerWork::picDownloadFailed()
 {
     /* Take advantage of short-circuiting here to call the nextUrl until one
        is not available.  Only once nextUrl evaluates to false will this move
@@ -61,7 +61,7 @@ void CardPictureLoaderWorkerWork::picDownloadFailed()
     if (cardToDownload.nextUrl() || cardToDownload.nextSet()) {
         startNextPicDownload();
     } else {
-        qCWarning(CardPictureLoaderWorkerWorkLog).nospace()
+        qCWarning(PictureLoaderWorkerWorkLog).nospace()
             << "PictureLoader: [card: " << cardToDownload.getCard().getInfo().getCorrectedName()
             << " set: " << cardToDownload.getSetName() << "]: Picture NOT found, "
             << (picDownload ? "download failed" : "downloads disabled")
@@ -70,25 +70,23 @@ void CardPictureLoaderWorkerWork::picDownloadFailed()
     }
 }
 
-void CardPictureLoaderWorkerWork::handleNetworkReply(QNetworkReply *reply)
+/**
+ *
+ * @param reply The reply. Takes ownership of the object
+ */
+void PictureLoaderWorkerWork::handleNetworkReply(QNetworkReply *reply)
 {
     QVariant redirectTarget = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
-    bool redirectFailure = false;
     if (redirectTarget.isValid()) {
         QUrl url = reply->request().url();
         QUrl redirectUrl = redirectTarget.toUrl();
         if (redirectUrl.isRelative()) {
             redirectUrl = url.resolved(redirectUrl);
         }
-        if (url == redirectUrl) {
-            qCWarning(CardPictureLoaderWorkerWorkLog) << "recursive redirect detected!";
-            redirectFailure = true;
-        } else {
-            emit urlRedirected(url, redirectUrl);
-        }
+        emit urlRedirected(url, redirectUrl);
     }
 
-    if (redirectFailure || reply->error()) {
+    if (reply->error()) {
         handleFailedReply(reply);
     } else {
         handleSuccessfulReply(reply);
@@ -104,15 +102,15 @@ static bool imageIsBlackListed(const QByteArray &picData)
     return MD5_BLACKLIST.contains(md5sum);
 }
 
-void CardPictureLoaderWorkerWork::handleFailedReply(const QNetworkReply *reply)
+void PictureLoaderWorkerWork::handleFailedReply(const QNetworkReply *reply)
 {
     if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 429) {
-        qCWarning(CardPictureLoaderWorkerWorkLog) << "Too many requests.";
+        qCWarning(PictureLoaderWorkerWorkLog) << "Too many requests.";
     } else {
         bool isFromCache = reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool();
 
         if (isFromCache) {
-            qCDebug(CardPictureLoaderWorkerWorkLog).nospace()
+            qCDebug(PictureLoaderWorkerWorkLog).nospace()
                 << "PictureLoader: [card: " << cardToDownload.getCard().getName()
                 << " set: " << cardToDownload.getSetName() << "]: Removing corrupted cache file for url "
                 << reply->url().toDisplayString() << " and retrying (" << reply->errorString() << ")";
@@ -121,7 +119,7 @@ void CardPictureLoaderWorkerWork::handleFailedReply(const QNetworkReply *reply)
 
             emit requestImageDownload(reply->url(), this);
         } else {
-            qCDebug(CardPictureLoaderWorkerWorkLog).nospace()
+            qCDebug(PictureLoaderWorkerWorkLog).nospace()
                 << "PictureLoader: [card: " << cardToDownload.getCard().getName()
                 << " set: " << cardToDownload.getSetName() << "]: " << (picDownload ? "Download" : "Cache search")
                 << " failed for url " << reply->url().toDisplayString() << " (" << reply->errorString() << ")";
@@ -131,7 +129,7 @@ void CardPictureLoaderWorkerWork::handleFailedReply(const QNetworkReply *reply)
     }
 }
 
-void CardPictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply)
+void PictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply)
 {
     bool isFromCache = reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool();
 
@@ -140,7 +138,7 @@ void CardPictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply)
     if (statusCode == 301 || statusCode == 302 || statusCode == 303 || statusCode == 305 || statusCode == 307 ||
         statusCode == 308) {
         QUrl redirectUrl = reply->header(QNetworkRequest::LocationHeader).toUrl();
-        qCDebug(CardPictureLoaderWorkerWorkLog).nospace()
+        qCDebug(PictureLoaderWorkerWorkLog).nospace()
             << "PictureLoader: [card: " << cardToDownload.getCard().getName() << " set: " << cardToDownload.getSetName()
             << "]: following " << (isFromCache ? "cached redirect" : "redirect") << " to "
             << redirectUrl.toDisplayString();
@@ -152,7 +150,7 @@ void CardPictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply)
     const QByteArray &picData = reply->peek(reply->size());
 
     if (imageIsBlackListed(picData)) {
-        qCDebug(CardPictureLoaderWorkerWorkLog).nospace()
+        qCDebug(PictureLoaderWorkerWorkLog).nospace()
             << "PictureLoader: [card: " << cardToDownload.getCard().getName() << " set: " << cardToDownload.getSetName()
             << "]: Picture found, but blacklisted, will consider it as not found";
 
@@ -163,14 +161,14 @@ void CardPictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply)
     QImage image = tryLoadImageFromReply(reply);
 
     if (image.isNull()) {
-        qCDebug(CardPictureLoaderWorkerWorkLog).nospace()
+        qCDebug(PictureLoaderWorkerWorkLog).nospace()
             << "PictureLoader: [card: " << cardToDownload.getCard().getName() << " set: " << cardToDownload.getSetName()
             << "]: Possible " << (isFromCache ? "cached" : "downloaded") << " picture at "
             << reply->url().toDisplayString() << " could not be loaded: " << reply->errorString();
 
         picDownloadFailed();
     } else {
-        qCDebug(CardPictureLoaderWorkerWorkLog).nospace()
+        qCDebug(PictureLoaderWorkerWorkLog).nospace()
             << "PictureLoader: [card: " << cardToDownload.getCard().getName() << " set: " << cardToDownload.getSetName()
             << "]: Image successfully " << (isFromCache ? "loaded from cached" : "downloaded from") << " url "
             << reply->url().toDisplayString();
@@ -179,7 +177,11 @@ void CardPictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply)
     }
 }
 
-QImage CardPictureLoaderWorkerWork::tryLoadImageFromReply(QNetworkReply *reply)
+/**
+ * @param reply The reply to load the image from
+ * @return The loaded image, or an empty QImage if loading failed
+ */
+QImage PictureLoaderWorkerWork::tryLoadImageFromReply(QNetworkReply *reply)
 {
     static constexpr int riffHeaderSize = 12; // RIFF_HEADER_SIZE from webp/format_constants.h
     auto replyHeader = reply->peek(riffHeaderSize);
@@ -202,13 +204,17 @@ QImage CardPictureLoaderWorkerWork::tryLoadImageFromReply(QNetworkReply *reply)
     return imgReader.read();
 }
 
-void CardPictureLoaderWorkerWork::concludeImageLoad(const QImage &image)
+/**
+ * Call this method when the image has finished being loaded.
+ * @param image The image that was loaded. Empty QImage indicates failure.
+ */
+void PictureLoaderWorkerWork::concludeImageLoad(const QImage &image)
 {
     emit imageLoaded(cardToDownload.getCard(), image);
     deleteLater();
 }
 
-void CardPictureLoaderWorkerWork::picDownloadChanged()
+void PictureLoaderWorkerWork::picDownloadChanged()
 {
     picDownload = SettingsCache::instance().getPicDownload();
 }
diff --git a/cockatrice/src/picture_loader/picture_loader_worker_work.h b/cockatrice/src/picture_loader/picture_loader_worker_work.h
new file mode 100644
index 000000000..aa3927c17
--- /dev/null
+++ b/cockatrice/src/picture_loader/picture_loader_worker_work.h
@@ -0,0 +1,66 @@
+#ifndef PICTURE_LOADER_WORKER_WORK_H
+#define PICTURE_LOADER_WORKER_WORK_H
+
+#include "../database/card_database.h"
+#include "picture_loader_worker.h"
+#include "picture_to_load.h"
+
+#include <QLoggingCategory>
+#include <QMutex>
+#include <QNetworkAccessManager>
+#include <QObject>
+#include <QThread>
+
+#define REDIRECT_HEADER_NAME "redirects"
+#define REDIRECT_ORIGINAL_URL "original"
+#define REDIRECT_URL "redirect"
+#define REDIRECT_TIMESTAMP "timestamp"
+#define REDIRECT_CACHE_FILENAME "cache.ini"
+
+inline Q_LOGGING_CATEGORY(PictureLoaderWorkerWorkLog, "picture_loader.worker");
+
+class PictureLoaderWorker;
+
+class PictureLoaderWorkerWork : public QObject
+{
+    Q_OBJECT
+public:
+    explicit PictureLoaderWorkerWork(const PictureLoaderWorker *worker, const ExactCard &toLoad);
+
+    PictureToLoad cardToDownload;
+
+public slots:
+    void handleNetworkReply(QNetworkReply *reply);
+
+private:
+    bool picDownload;
+
+    void startNextPicDownload();
+    void picDownloadFailed();
+    void handleFailedReply(const QNetworkReply *reply);
+    void handleSuccessfulReply(QNetworkReply *reply);
+    QImage tryLoadImageFromReply(QNetworkReply *reply);
+    void concludeImageLoad(const QImage &image);
+
+private slots:
+    void picDownloadChanged();
+
+signals:
+    /**
+     * Emitted when this worker has successfully loaded the image or has exhausted all attempts at loading the image.
+     * Failures are represented by an empty QImage.
+     * Note that this object will delete itself as this signal is emitted.
+     */
+    void imageLoaded(const ExactCard &card, const QImage &image);
+
+    /**
+     * Emitted when a request did not return a 400 or 500 response
+     */
+    void requestSucceeded(const QUrl &url);
+    void requestImageDownload(const QUrl &url, PictureLoaderWorkerWork *instance);
+
+    void urlRedirected(const QUrl &originalUrl, const QUrl &redirectUrl);
+    void cachedUrlInvalidated(const QUrl &url);
+};
+
+#endif // PICTURE_LOADER_WORKER_WORK_H
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp b/cockatrice/src/picture_loader/picture_to_load.cpp
similarity index 87%
rename from cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
rename to cockatrice/src/picture_loader/picture_to_load.cpp
index d72226aab..f70f23d33 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp
+++ b/cockatrice/src/picture_loader/picture_to_load.cpp
@@ -1,16 +1,15 @@
-#include "card_picture_to_load.h"
+#include "picture_to_load.h"
 
-#include "../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
+#include "../utility/card_set_comparator.h"
 
 #include <QCoreApplication>
 #include <QDate>
 #include <QRegularExpression>
 #include <QUrl>
 #include <algorithm>
-#include <libcockatrice/card/set/card_set_comparator.h>
-#include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 
-CardPictureToLoad::CardPictureToLoad(const ExactCard &_card)
+PictureToLoad::PictureToLoad(const ExactCard &_card)
     : card(_card), urlTemplates(SettingsCache::instance().downloads().getAllURLs())
 {
     if (card) {
@@ -20,7 +19,13 @@ CardPictureToLoad::CardPictureToLoad(const ExactCard &_card)
     }
 }
 
-QList<CardSetPtr> CardPictureToLoad::extractSetsSorted(const ExactCard &card)
+/**
+ * Extracts a list of all the sets from the card, sorted in priority order.
+ * If the card does not contain any sets, then a dummy set will be inserted into the list.
+ *
+ * @return A list of sets. Will not be empty.
+ */
+QList<CardSetPtr> PictureToLoad::extractSetsSorted(const ExactCard &card)
 {
     QList<CardSetPtr> sortedSets;
     for (const auto &printings : card.getInfo().getSets()) {
@@ -29,7 +34,7 @@ QList<CardSetPtr> CardPictureToLoad::extractSetsSorted(const ExactCard &card)
         }
     }
     if (sortedSets.empty()) {
-        sortedSets << CardSet::newInstance(new NoopCardSetPriorityController(), "", "", "", QDate());
+        sortedSets << CardSet::newInstance("", "", "", QDate());
     }
     std::sort(sortedSets.begin(), sortedSets.end(), SetPriorityComparator());
 
@@ -75,7 +80,7 @@ static PrintingInfo findPrintingForSet(const ExactCard &card, const QString &set
     return setsToPrintings[setName][0];
 }
 
-void CardPictureToLoad::populateSetUrls()
+void PictureToLoad::populateSetUrls()
 {
     /* currentSetUrls is a list, populated each time a new set is requested for a particular card
        and Urls are removed from it as a download is attempted from each one.  Custom Urls for
@@ -103,7 +108,12 @@ void CardPictureToLoad::populateSetUrls()
     (void)nextUrl();
 }
 
-bool CardPictureToLoad::nextSet()
+/**
+ * Advances the currentSet to the next set in the list. Then repopulates the url list with the urls from that set.
+ * If we are already at the end of the list, then currentSet is set to empty.
+ * @return If we are already at the end of the list
+ */
+bool PictureToLoad::nextSet()
 {
     if (!sortedSets.isEmpty()) {
         currentSet = sortedSets.takeFirst();
@@ -114,7 +124,12 @@ bool CardPictureToLoad::nextSet()
     return false;
 }
 
-bool CardPictureToLoad::nextUrl()
+/**
+ * Advances the currentUrl to the next url in the list.
+ * If we are already at the end of the list, then currentUrl is set to empty.
+ * @return If we are already at the end of the list
+ */
+bool PictureToLoad::nextUrl()
 {
     if (!currentSetUrls.isEmpty()) {
         currentUrl = currentSetUrls.takeFirst();
@@ -124,7 +139,7 @@ bool CardPictureToLoad::nextUrl()
     return false;
 }
 
-QString CardPictureToLoad::getSetName() const
+QString PictureToLoad::getSetName() const
 {
     if (currentSet) {
         return currentSet->getCorrectedShortName();
@@ -170,7 +185,7 @@ static int parse(const QString &urlTemplate,
         }
         QString propertyValue = getProperty(cardPropertyName);
         if (propertyValue.isEmpty()) {
-            qCDebug(CardPictureToLoadLog).nospace()
+            qCDebug(PictureToLoadLog).nospace()
                 << "PictureLoader: [card: " << cardName << " set: " << setName << "]: Requested " << propType
                 << "property (" << cardPropertyName << ") for Url template (" << urlTemplate << ") is not available";
             return 1;
@@ -178,7 +193,7 @@ static int parse(const QString &urlTemplate,
             int propLength = propertyValue.length();
             if (subStrLen > 0) {
                 if (subStrPos + subStrLen > propLength) {
-                    qCDebug(CardPictureToLoadLog).nospace()
+                    qCDebug(PictureToLoadLog).nospace()
                         << "PictureLoader: [card: " << cardName << " set: " << setName << "]: Requested " << propType
                         << " property (" << cardPropertyName << ") for Url template (" << urlTemplate
                         << ") is smaller than substr specification (" << subStrPos << " + " << subStrLen << " > "
@@ -193,7 +208,7 @@ static int parse(const QString &urlTemplate,
             if (!fillWith.isEmpty()) {
                 int fillLength = fillWith.length();
                 if (fillLength < propLength) {
-                    qCDebug(CardPictureToLoadLog).nospace()
+                    qCDebug(PictureToLoadLog).nospace()
                         << "PictureLoader: [card: " << cardName << " set: " << setName << "]: Requested " << propType
                         << " property (" << cardPropertyName << ") for Url template (" << urlTemplate
                         << ") is longer than fill specification (" << fillWith << ")";
@@ -210,7 +225,7 @@ static int parse(const QString &urlTemplate,
     return 0;
 }
 
-QString CardPictureToLoad::transformUrl(const QString &urlTemplate) const
+QString PictureToLoad::transformUrl(const QString &urlTemplate) const
 {
     /* This function takes Url templates and substitutes actual card details
        into the url.  This is used for making Urls with follow a predictable format
@@ -264,7 +279,7 @@ QString CardPictureToLoad::transformUrl(const QString &urlTemplate) const
                  * populated in this card, so it should return an empty string,
                  * indicating an invalid Url.
                  */
-                qCDebug(CardPictureToLoadLog).nospace()
+                qCDebug(PictureToLoadLog).nospace()
                     << "PictureLoader: [card: " << cardName << " set: " << setName << "]: Requested information ("
                     << prop << ") for Url template (" << urlTemplate << ") is not available";
                 return QString();
diff --git a/cockatrice/src/picture_loader/picture_to_load.h b/cockatrice/src/picture_loader/picture_to_load.h
new file mode 100644
index 000000000..2cfc13d59
--- /dev/null
+++ b/cockatrice/src/picture_loader/picture_to_load.h
@@ -0,0 +1,44 @@
+#ifndef PICTURE_TO_LOAD_H
+#define PICTURE_TO_LOAD_H
+
+#include "../card/exact_card.h"
+
+#include <QLoggingCategory>
+
+inline Q_LOGGING_CATEGORY(PictureToLoadLog, "picture_loader.picture_to_load");
+
+class PictureToLoad
+{
+private:
+    ExactCard card;
+    QList<CardSetPtr> sortedSets;
+    QList<QString> urlTemplates;
+    QList<QString> currentSetUrls;
+    QString currentUrl;
+    CardSetPtr currentSet;
+
+public:
+    explicit PictureToLoad(const ExactCard &_card);
+
+    const ExactCard &getCard() const
+    {
+        return card;
+    }
+    QString getCurrentUrl() const
+    {
+        return currentUrl;
+    }
+    CardSetPtr getCurrentSet() const
+    {
+        return currentSet;
+    }
+    QString getSetName() const;
+    QString transformUrl(const QString &urlTemplate) const;
+    bool nextSet();
+    bool nextUrl();
+    void populateSetUrls();
+
+    static QList<CardSetPtr> extractSetsSorted(const ExactCard &card);
+};
+
+#endif // PICTURE_TO_LOAD_H
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp b/cockatrice/src/server/abstract_client.cpp
similarity index 87%
rename from libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
rename to cockatrice/src/server/abstract_client.cpp
index 11458768d..4f3098871 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
+++ b/cockatrice/src/server/abstract_client.cpp
@@ -1,24 +1,25 @@
 #include "abstract_client.h"
 
+#include "featureset.h"
+#include "get_pb_extension.h"
+#include "pb/commands.pb.h"
+#include "pb/event_add_to_list.pb.h"
+#include "pb/event_connection_closed.pb.h"
+#include "pb/event_game_joined.pb.h"
+#include "pb/event_list_rooms.pb.h"
+#include "pb/event_notify_user.pb.h"
+#include "pb/event_remove_from_list.pb.h"
+#include "pb/event_replay_added.pb.h"
+#include "pb/event_server_identification.pb.h"
+#include "pb/event_server_message.pb.h"
+#include "pb/event_server_shutdown.pb.h"
+#include "pb/event_user_joined.pb.h"
+#include "pb/event_user_left.pb.h"
+#include "pb/event_user_message.pb.h"
+#include "pb/server_message.pb.h"
+#include "pending_command.h"
+
 #include <google/protobuf/descriptor.h>
-#include <libcockatrice/protocol/featureset.h>
-#include <libcockatrice/protocol/get_pb_extension.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
-#include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
-#include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
-#include <libcockatrice/protocol/pb/event_notify_user.pb.h>
-#include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
-#include <libcockatrice/protocol/pb/event_replay_added.pb.h>
-#include <libcockatrice/protocol/pb/event_server_identification.pb.h>
-#include <libcockatrice/protocol/pb/event_server_message.pb.h>
-#include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
-#include <libcockatrice/protocol/pb/event_user_joined.pb.h>
-#include <libcockatrice/protocol/pb/event_user_left.pb.h>
-#include <libcockatrice/protocol/pb/event_user_message.pb.h>
-#include <libcockatrice/protocol/pb/server_message.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
 
 AbstractClient::AbstractClient(QObject *parent)
     : QObject(parent), nextCmdId(0), status(StatusDisconnected), serverSupportsPasswordHash(false)
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h b/cockatrice/src/server/abstract_client.h
similarity index 95%
rename from libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
rename to cockatrice/src/server/abstract_client.h
index dc3be5a94..5e4948f5e 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
+++ b/cockatrice/src/server/abstract_client.h
@@ -1,16 +1,12 @@
-/**
- * @file abstract_client.h
- * @ingroup Client
- * @brief TODO: Document this.
- */
-
 #ifndef ABSTRACTCLIENT_H
 #define ABSTRACTCLIENT_H
 
+#include "pb/response.pb.h"
+#include "pb/serverinfo_user.pb.h"
+
 #include <QMutex>
+#include <QObject>
 #include <QVariant>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class PendingCommand;
 class CommandContainer;
diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp b/cockatrice/src/server/chat_view/chat_view.cpp
similarity index 93%
rename from cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
rename to cockatrice/src/server/chat_view/chat_view.cpp
index 731f30942..b6a6b3f98 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/server/chat_view/chat_view.cpp
@@ -1,19 +1,19 @@
 #include "chat_view.h"
 
-#include "../../../../client/settings/cache_settings.h"
 #include "../../client/sound_engine.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../../interface/widgets/tabs/tab_account.h"
+#include "../../settings/cache_settings.h"
+#include "../../tabs/tab_account.h"
 #include "../user/user_context_menu.h"
 #include "../user/user_list_manager.h"
 #include "../user/user_list_proxy.h"
+#include "user_level.h"
 
 #include <QApplication>
 #include <QDateTime>
 #include <QDesktopServices>
 #include <QMouseEvent>
 #include <QScrollBar>
-#include <libcockatrice/network/server/remote/user_level.h>
 
 const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47);
 
@@ -28,9 +28,21 @@ ChatView::ChatView(TabSupervisor *_tabSupervisor, AbstractGame *_game, bool _sho
       userListProxy(_tabSupervisor->getUserListManager()), evenNumber(true), showTimestamps(_showTimestamps),
       hoveredItemType(HoveredNothing)
 {
-    adjustColorsToPalette();
-
-    connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, &ChatView::adjustColorsToPalette);
+    if (palette().windowText().color().lightness() > 200) {
+        document()->setDefaultStyleSheet(R"(
+           a { text-decoration: none; color: rgb(71,158,252); }
+           .blue { color: rgb(71,158,252); }
+        )");
+        serverMessageColor = QColor(0xFF, 0x73, 0x83);
+        otherUserColor = otherUserColor.lighter(150);
+        linkColor = QColor(71, 158, 252);
+    } else {
+        document()->setDefaultStyleSheet(R"(
+            a { text-decoration: none; color: blue; }
+            .blue { color: blue }
+        )");
+        linkColor = palette().link().color();
+    }
 
     userContextMenu = new UserContextMenu(tabSupervisor, this, game);
     connect(userContextMenu, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool)));
@@ -51,59 +63,6 @@ ChatView::ChatView(TabSupervisor *_tabSupervisor, AbstractGame *_game, bool _sho
     connect(this, &ChatView::anchorClicked, this, &ChatView::openLink);
 }
 
-void ChatView::adjustColorsToPalette()
-{
-    if (palette().windowText().color().lightness() > 200) {
-        document()->setDefaultStyleSheet(R"(
-           a { text-decoration: none; color: rgb(71,158,252); }
-           .blue { color: rgb(71,158,252); }
-        )");
-        serverMessageColor = QColor(0xFF, 0x73, 0x83);
-        otherUserColor = otherUserColor.lighter(150);
-        linkColor = QColor(71, 158, 252);
-    } else {
-        document()->setDefaultStyleSheet(R"(
-            a { text-decoration: none; color: blue; }
-            .blue { color: blue }
-        )");
-        linkColor = palette().link().color();
-    }
-
-    QTimer::singleShot(0, this, &ChatView::refreshBlockColors);
-}
-
-void ChatView::refreshBlockColors()
-{
-    QTextDocument *doc = document();
-
-    // Empty QTextDocuments still have 1 block, so we need handle this edge case
-    if (doc->isEmpty()) {
-        evenNumber = true;
-        return;
-    }
-
-    QTextCursor cursor(doc);
-    bool even = true; // start fresh
-
-    for (QTextBlock block = doc->begin(); block.isValid(); block = block.next()) {
-        QTextBlockFormat fmt = block.blockFormat();
-
-        if (even)
-            fmt.setBackground(palette().base());
-        else
-            fmt.setBackground(palette().window());
-
-        fmt.setForeground(palette().text());
-
-        cursor.setPosition(block.position());
-        cursor.setBlockFormat(fmt);
-
-        even = !even;
-    }
-
-    evenNumber = even; // keep future rows consistent
-}
-
 void ChatView::retranslateUi()
 {
     userContextMenu->retranslateUi();
@@ -113,28 +72,20 @@ QTextCursor ChatView::prepareBlock(bool same)
 {
     lastSender.clear();
 
-    QTextDocument *doc = document();
-    QTextCursor cursor(doc);
-
+    QTextCursor cursor(document());
     cursor.movePosition(QTextCursor::End);
     if (same) {
         cursor.insertHtml("<br>");
     } else {
         QTextBlockFormat blockFormat;
-        if (evenNumber)
-            blockFormat.setBackground(palette().base());
-        else
+        if ((evenNumber = !evenNumber))
             blockFormat.setBackground(palette().window());
-
-        evenNumber = !evenNumber;
+        else
+            blockFormat.setBackground(palette().base());
 
         blockFormat.setForeground(palette().text());
         blockFormat.setBottomMargin(4);
-
-        // Empty QTextDocuments still have 1 block. Just write to that block instead of inserting a new one
-        if (!doc->isEmpty()) {
-            cursor.insertBlock(blockFormat);
-        }
+        cursor.insertBlock(blockFormat);
     }
 
     return cursor;
@@ -255,7 +206,7 @@ void ChatView::appendMessage(QString message,
     defaultFormat = QTextCharFormat();
     if (!isUserMessage) {
         if (messageType == Event_RoomSay::ChatHistory) {
-            defaultFormat.setForeground(Qt::gray); //! \todo hardcoded color
+            defaultFormat.setForeground(Qt::gray); // FIXME : hardcoded color
             defaultFormat.setFontWeight(QFont::Light);
             defaultFormat.setFontItalic(true);
             static const QRegularExpression userNameRegex("^(\\[[^\\]]*\\]\\s)(\\S+):\\s");
@@ -278,14 +229,18 @@ void ChatView::appendMessage(QString message,
                 message.remove(0, pos.relativePosition - 2); // do not remove semicolon
             }
         } else {
-            defaultFormat.setForeground(Qt::darkGreen); //! \todo hardcoded color
+            defaultFormat.setForeground(Qt::darkGreen); // FIXME : hardcoded color
             defaultFormat.setFontWeight(QFont::Bold);
         }
     }
     cursor.setCharFormat(defaultFormat);
 
     bool mentionEnabled = SettingsCache::instance().getChatMention();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     highlightedWords = SettingsCache::instance().getHighlightWords().split(' ', Qt::SkipEmptyParts);
+#else
+    highlightedWords = SettingsCache::instance().getHighlightWords().split(' ', QString::SkipEmptyParts);
+#endif
 
     // parse the message
     while (message.size()) {
diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h b/cockatrice/src/server/chat_view/chat_view.h
similarity index 89%
rename from cockatrice/src/interface/widgets/server/chat_view/chat_view.h
rename to cockatrice/src/server/chat_view/chat_view.h
index d1939fbea..1c7d2302d 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
+++ b/cockatrice/src/server/chat_view/chat_view.h
@@ -1,23 +1,16 @@
-/**
- * @file chat_view.h
- * @ingroup NetworkingWidgets
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef CHATVIEW_H
 #define CHATVIEW_H
 
-#include "../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../tabs/tab_supervisor.h"
 #include "../user/user_list_widget.h"
+#include "room_message_type.h"
+#include "user_level.h"
 
 #include <QAction>
 #include <QColor>
 #include <QTextBrowser>
 #include <QTextCursor>
 #include <QTextFragment>
-#include <libcockatrice/network/server/remote/room_message_type.h>
-#include <libcockatrice/network/server/remote/user_level.h>
 
 class AbstractGame;
 class QTextTable;
@@ -28,6 +21,9 @@ class UserListProxy;
 class UserMessagePosition
 {
 public:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+    UserMessagePosition() = default; // older qt versions require a default constructor to use in containers
+#endif
     UserMessagePosition(QTextCursor &cursor);
     int relativePosition;
     QTextBlock block;
@@ -65,7 +61,7 @@ private:
     QAction *messageClicked;
     QMap<QString, QVector<UserMessagePosition>> userMessagePositions;
 
-    [[nodiscard]] QTextFragment getFragmentUnderMouse(const QPoint &pos) const;
+    QTextFragment getFragmentUnderMouse(const QPoint &pos) const;
     QTextCursor prepareBlock(bool same = false);
     void appendCardTag(QTextCursor &cursor, const QString &cardName);
     void appendUrlTag(QTextCursor &cursor, QString url);
@@ -85,8 +81,6 @@ private:
 private slots:
     void openLink(const QUrl &link);
     void actMessageClicked();
-    void adjustColorsToPalette();
-    void refreshBlockColors();
 
 public:
     ChatView(TabSupervisor *_tabSupervisor, AbstractGame *_game, bool _showTimestamps, QWidget *parent = nullptr);
diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/server/game_selector.cpp
similarity index 74%
rename from cockatrice/src/interface/widgets/server/game_selector.cpp
rename to cockatrice/src/server/game_selector.cpp
index 0ff2a5542..3cfd3315a 100644
--- a/cockatrice/src/interface/widgets/server/game_selector.cpp
+++ b/cockatrice/src/server/game_selector.cpp
@@ -1,26 +1,31 @@
 #include "game_selector.h"
 
-#include "../interface/widgets/dialogs/dlg_create_game.h"
-#include "../interface/widgets/dialogs/dlg_filter_games.h"
-#include "../interface/widgets/tabs/tab_account.h"
-#include "../interface/widgets/tabs/tab_game.h"
-#include "../interface/widgets/tabs/tab_room.h"
-#include "../interface/widgets/tabs/tab_supervisor.h"
-#include "../interface/widgets/utility/get_text_with_max.h"
+#include "../client/get_text_with_max.h"
+#include "../dialogs/dlg_create_game.h"
+#include "../dialogs/dlg_filter_games.h"
+#include "../tabs/tab_account.h"
+#include "../tabs/tab_game.h"
+#include "../tabs/tab_room.h"
+#include "../tabs/tab_supervisor.h"
+#include "abstract_client.h"
 #include "games_model.h"
+#include "pb/response.pb.h"
+#include "pb/room_commands.pb.h"
+#include "pb/serverinfo_game.pb.h"
+#include "pending_command.h"
 #include "user/user_list_manager.h"
 
+#include <QApplication>
+#include <QCheckBox>
 #include <QDebug>
 #include <QHBoxLayout>
 #include <QHeaderView>
+#include <QInputDialog>
+#include <QLabel>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QTreeView>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/room_commands.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
+#include <QVBoxLayout>
 
 GameSelector::GameSelector(AbstractClient *_client,
                            TabSupervisor *_tabSupervisor,
@@ -71,18 +76,6 @@ GameSelector::GameSelector(AbstractClient *_client,
 
     gameListView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
 
-    if (showFilters && restoresettings) {
-        quickFilterToolBar = new GameSelectorQuickFilterToolBar(this, tabSupervisor, gameListProxyModel, gameTypeMap);
-        quickFilterToolBar->setVisible(showFilters && restoresettings &&
-                                       SettingsCache::instance().getShowGameSelectorFilterToolbar());
-
-        connect(&SettingsCache::instance(), &SettingsCache::showGameSelectorFilterToolbarChanged, this, [this] {
-            quickFilterToolBar->setVisible(SettingsCache::instance().getShowGameSelectorFilterToolbar());
-        });
-    } else {
-        quickFilterToolBar = nullptr;
-    }
-
     filterButton = new QPushButton;
     filterButton->setIcon(QPixmap("theme:icons/search"));
     connect(filterButton, &QPushButton::clicked, this, &GameSelector::actSetFilter);
@@ -91,7 +84,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;
@@ -100,9 +92,7 @@ GameSelector::GameSelector(AbstractClient *_client,
         createButton = nullptr;
     }
     joinButton = new QPushButton;
-    joinAsJudgeButton = new QPushButton;
     spectateButton = new QPushButton;
-    joinAsJudgeSpectatorButton = new QPushButton;
 
     QHBoxLayout *buttonLayout = new QHBoxLayout;
     if (showFilters) {
@@ -113,23 +103,10 @@ GameSelector::GameSelector(AbstractClient *_client,
     if (room)
         buttonLayout->addWidget(createButton);
     buttonLayout->addWidget(joinButton);
-    if (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsJudge) {
-        buttonLayout->addWidget(joinAsJudgeButton);
-    } else {
-        joinAsJudgeButton->setHidden(true);
-    }
     buttonLayout->addWidget(spectateButton);
-    if (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsJudge) {
-        buttonLayout->addWidget(joinAsJudgeSpectatorButton);
-    } else {
-        joinAsJudgeSpectatorButton->setHidden(true);
-    }
     buttonLayout->setAlignment(Qt::AlignTop);
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
-    if (showFilters && restoresettings) {
-        mainLayout->addWidget(quickFilterToolBar);
-    }
     mainLayout->addWidget(gameListView);
     mainLayout->addLayout(buttonLayout);
 
@@ -140,9 +117,7 @@ GameSelector::GameSelector(AbstractClient *_client,
     setMinimumHeight(200);
 
     connect(joinButton, &QPushButton::clicked, this, &GameSelector::actJoin);
-    connect(joinAsJudgeButton, &QPushButton::clicked, this, &GameSelector::actJoinAsJudge);
-    connect(spectateButton, &QPushButton::clicked, this, &GameSelector::actJoinAsSpectator);
-    connect(joinAsJudgeSpectatorButton, &QPushButton::clicked, this, &GameSelector::actJoinAsJudgeSpectator);
+    connect(spectateButton, &QPushButton::clicked, this, &GameSelector::actSpectate);
     connect(gameListView->selectionModel(), &QItemSelectionModel::currentRowChanged, this,
             &GameSelector::actSelectedGameChanged);
     connect(gameListView, &QTreeView::activated, this, &GameSelector::actJoin);
@@ -180,25 +155,33 @@ void GameSelector::actSetFilter()
     if (!dlg.exec())
         return;
 
-    gameListProxyModel->setGameFilters(
-        dlg.getHideBuddiesOnlyGames(), dlg.getHideIgnoredUserGames(), dlg.getHideFullGames(),
-        dlg.getHideGamesThatStarted(), dlg.getHidePasswordProtectedGames(), dlg.getHideNotBuddyCreatedGames(),
-        dlg.getHideOpenDecklistGames(), dlg.getGameNameFilter(), dlg.getCreatorNameFilters(), dlg.getGameTypeFilter(),
-        dlg.getMaxPlayersFilterMin(), dlg.getMaxPlayersFilterMax(), dlg.getMaxGameAge(),
-        dlg.getShowOnlyIfSpectatorsCanWatch(), dlg.getShowSpectatorPasswordProtected(),
-        dlg.getShowOnlyIfSpectatorsCanChat(), dlg.getShowOnlyIfSpectatorsCanSeeHands());
+    gameListProxyModel->setHideBuddiesOnlyGames(dlg.getHideBuddiesOnlyGames());
+    gameListProxyModel->setHideFullGames(dlg.getHideFullGames());
+    gameListProxyModel->setHideGamesThatStarted(dlg.getHideGamesThatStarted());
+    gameListProxyModel->setHidePasswordProtectedGames(dlg.getHidePasswordProtectedGames());
+    gameListProxyModel->setHideIgnoredUserGames(dlg.getHideIgnoredUserGames());
+    gameListProxyModel->setHideNotBuddyCreatedGames(dlg.getHideNotBuddyCreatedGames());
+    gameListProxyModel->setHideOpenDecklistGames(dlg.getHideOpenDecklistGames());
+    gameListProxyModel->setGameNameFilter(dlg.getGameNameFilter());
+    gameListProxyModel->setCreatorNameFilter(dlg.getCreatorNameFilter());
+    gameListProxyModel->setGameTypeFilter(dlg.getGameTypeFilter());
+    gameListProxyModel->setMaxPlayersFilter(dlg.getMaxPlayersFilterMin(), dlg.getMaxPlayersFilterMax());
+    gameListProxyModel->setMaxGameAge(dlg.getMaxGameAge());
+    gameListProxyModel->setShowOnlyIfSpectatorsCanWatch(dlg.getShowOnlyIfSpectatorsCanWatch());
+    gameListProxyModel->setShowSpectatorPasswordProtected(dlg.getShowSpectatorPasswordProtected());
+    gameListProxyModel->setShowOnlyIfSpectatorsCanChat(dlg.getShowOnlyIfSpectatorsCanChat());
+    gameListProxyModel->setShowOnlyIfSpectatorsCanSeeHands(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);
 
@@ -264,30 +247,12 @@ void GameSelector::checkResponse(const Response &response)
 
 void GameSelector::actJoin()
 {
-    joinGame();
+    return joinGame(false);
 }
 
-void GameSelector::actJoinAsJudge()
+void GameSelector::actSpectate()
 {
-    if (!(tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsJudge)) {
-        joinGame();
-    } else {
-        joinGame(false, true);
-    }
-}
-
-void GameSelector::actJoinAsSpectator()
-{
-    joinGame(true);
-}
-
-void GameSelector::actJoinAsJudgeSpectator()
-{
-    if (!(tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsJudge)) {
-        joinGame(true);
-    } else {
-        joinGame(true, true);
-    }
+    return joinGame(true);
 }
 
 void GameSelector::customContextMenu(const QPoint &point)
@@ -301,7 +266,7 @@ void GameSelector::customContextMenu(const QPoint &point)
     connect(&joinGame, &QAction::triggered, this, &GameSelector::actJoin);
 
     QAction spectateGame(tr("Spectate Game"));
-    connect(&spectateGame, &QAction::triggered, this, &GameSelector::actJoinAsSpectator);
+    connect(&spectateGame, &QAction::triggered, this, &GameSelector::actSpectate);
 
     QAction getGameInfo(tr("Game Information"));
     connect(&getGameInfo, &QAction::triggered, this, [=, this]() {
@@ -314,25 +279,12 @@ void GameSelector::customContextMenu(const QPoint &point)
 
     QMenu menu;
     menu.addAction(&joinGame);
-
-    if (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsJudge) {
-        QAction joinGameAsJudge(tr("Join Game as Judge"));
-        connect(&joinGameAsJudge, &QAction::triggered, this, &GameSelector::actJoinAsJudge);
-
-        menu.addAction(&joinGameAsJudge);
-
-        QAction spectateGameAsJudge(tr("Spectate Game as Judge"));
-        connect(&spectateGameAsJudge, &QAction::triggered, this, &GameSelector::actJoinAsJudgeSpectator);
-
-        menu.addAction(&spectateGameAsJudge);
-    }
-
     menu.addAction(&spectateGame);
     menu.addAction(&getGameInfo);
     menu.exec(gameListView->mapToGlobal(point));
 }
 
-void GameSelector::joinGame(const bool asSpectator, const bool asJudge)
+void GameSelector::joinGame(const bool isSpectator)
 {
     QModelIndex ind = gameListView->currentIndex();
     if (!ind.isValid()) {
@@ -344,7 +296,7 @@ void GameSelector::joinGame(const bool asSpectator, const bool asJudge)
         return;
     }
 
-    bool spectator = asSpectator || game.player_count() == game.max_players();
+    bool spectator = isSpectator || game.player_count() == game.max_players();
 
     bool overrideRestrictions = !tabSupervisor->getAdminLocked();
     QString password;
@@ -361,7 +313,7 @@ void GameSelector::joinGame(const bool asSpectator, const bool asJudge)
     cmd.set_password(password.toStdString());
     cmd.set_spectator(spectator);
     cmd.set_override_restrictions(overrideRestrictions);
-    cmd.set_join_as_judge(asJudge);
+    cmd.set_join_as_judge((QApplication::keyboardModifiers() & Qt::ShiftModifier) != 0);
 
     TabRoom *r = tabSupervisor->getRoomTabs().value(game.room_id());
     if (!r) {
@@ -413,9 +365,7 @@ void GameSelector::retranslateUi()
     if (createButton)
         createButton->setText(tr("C&reate"));
     joinButton->setText(tr("&Join"));
-    joinAsJudgeButton->setText(tr("Join as judge"));
     spectateButton->setText(tr("J&oin as spectator"));
-    joinAsJudgeSpectatorButton->setText(tr("Join as judge spectator"));
 
     updateTitle();
 }
diff --git a/cockatrice/src/server/game_selector.h b/cockatrice/src/server/game_selector.h
new file mode 100644
index 000000000..a4b8a68e2
--- /dev/null
+++ b/cockatrice/src/server/game_selector.h
@@ -0,0 +1,75 @@
+#ifndef GAMESELECTOR_H
+#define GAMESELECTOR_H
+
+#include "game_type_map.h"
+
+#include <QGroupBox>
+#include <common/pb/event_add_to_list.pb.h>
+#include <common/pb/event_remove_from_list.pb.h>
+#include <pb/commands.pb.h>
+
+class QTreeView;
+class GamesModel;
+class GamesProxyModel;
+class QPushButton;
+class QCheckBox;
+class QLabel;
+class AbstractClient;
+class TabSupervisor;
+class TabRoom;
+class ServerInfo_Game;
+class Response;
+
+class GameSelector : public QGroupBox
+{
+    Q_OBJECT
+private slots:
+    void actSetFilter();
+    void actClearFilter();
+    void actCreate();
+
+    void actJoin();
+    void actSpectate();
+    void customContextMenu(const QPoint &point);
+
+    void actSelectedGameChanged(const QModelIndex &current, const QModelIndex &previous);
+    void checkResponse(const Response &response);
+
+    void ignoreListReceived(const QList<ServerInfo_User> &_ignoreList);
+    void processAddToListEvent(const Event_AddToList &event);
+    void processRemoveFromListEvent(const Event_RemoveFromList &event);
+signals:
+    void gameJoined(int gameId);
+
+private:
+    AbstractClient *client;
+    TabSupervisor *tabSupervisor;
+    TabRoom *room;
+
+    QTreeView *gameListView;
+    GamesModel *gameListModel;
+    GamesProxyModel *gameListProxyModel;
+    QPushButton *filterButton, *clearFilterButton, *createButton, *joinButton, *spectateButton;
+    const bool showFilters;
+    GameTypeMap gameTypeMap;
+
+    void updateTitle();
+    void disableButtons();
+    void enableButtons();
+    void enableButtonsForIndex(const QModelIndex &current);
+    void joinGame(const bool isSpectator);
+
+public:
+    GameSelector(AbstractClient *_client,
+                 TabSupervisor *_tabSupervisor,
+                 TabRoom *_room,
+                 const QMap<int, QString> &_rooms,
+                 const QMap<int, GameTypeMap> &_gameTypes,
+                 const bool restoresettings,
+                 const bool _showfilters,
+                 QWidget *parent = nullptr);
+    void retranslateUi();
+    void processGameInfo(const ServerInfo_Game &info);
+};
+
+#endif
diff --git a/cockatrice/src/interface/widgets/server/game_type_map.h b/cockatrice/src/server/game_type_map.h
similarity index 100%
rename from cockatrice/src/interface/widgets/server/game_type_map.h
rename to cockatrice/src/server/game_type_map.h
diff --git a/cockatrice/src/interface/widgets/server/games_model.cpp b/cockatrice/src/server/games_model.cpp
similarity index 78%
rename from cockatrice/src/interface/widgets/server/games_model.cpp
rename to cockatrice/src/server/games_model.cpp
index 1f05308b8..5c336738c 100644
--- a/cockatrice/src/interface/widgets/server/games_model.cpp
+++ b/cockatrice/src/server/games_model.cpp
@@ -1,15 +1,18 @@
 #include "games_model.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../interface/pixel_map_generator.h"
-#include "../interface/widgets/tabs/tab_account.h"
+#include "../settings/cache_settings.h"
+#include "../tabs/tab_account.h"
+#include "pb/serverinfo_game.pb.h"
 #include "user/user_list_manager.h"
 #include "user/user_list_widget.h"
 
 #include <QDateTime>
+#include <QDebug>
 #include <QIcon>
+#include <QStringList>
+#include <QTime>
 #include <QTimeZone>
-#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 
 enum GameListColumn
 {
@@ -25,7 +28,7 @@ enum GameListColumn
 
 const int DEFAULT_MAX_PLAYERS_MIN = 1;
 const int DEFAULT_MAX_PLAYERS_MAX = 99;
-constexpr auto DEFAULT_MAX_GAME_AGE = QTime();
+constexpr QTime DEFAULT_MAX_GAME_AGE = QTime();
 
 const QString GamesModel::getGameCreatedString(const int secs)
 {
@@ -283,55 +286,106 @@ GamesProxyModel::GamesProxyModel(QObject *parent, const UserListProxy *_userList
     setDynamicSortFilter(true);
 }
 
-void GamesProxyModel::setGameFilters(bool _hideBuddiesOnlyGames,
-                                     bool _hideIgnoredUserGames,
-                                     bool _hideFullGames,
-                                     bool _hideGamesThatStarted,
-                                     bool _hidePasswordProtectedGames,
-                                     bool _hideNotBuddyCreatedGames,
-                                     bool _hideOpenDecklistGames,
-                                     const QString &_gameNameFilter,
-                                     const QStringList &_creatorNameFilters,
-                                     const QSet<int> &_gameTypeFilter,
-                                     int _maxPlayersFilterMin,
-                                     int _maxPlayersFilterMax,
-                                     const QTime &_maxGameAge,
-                                     bool _showOnlyIfSpectatorsCanWatch,
-                                     bool _showSpectatorPasswordProtected,
-                                     bool _showOnlyIfSpectatorsCanChat,
-                                     bool _showOnlyIfSpectatorsCanSeeHands)
+void GamesProxyModel::setHideBuddiesOnlyGames(bool _showBuddiesOnlyGames)
+{
+    hideBuddiesOnlyGames = _showBuddiesOnlyGames;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setHideIgnoredUserGames(bool _hideIgnoredUserGames)
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0))
-    beginFilterChange();
-#endif
-    hideBuddiesOnlyGames = _hideBuddiesOnlyGames;
     hideIgnoredUserGames = _hideIgnoredUserGames;
-    hideFullGames = _hideFullGames;
-    hideGamesThatStarted = _hideGamesThatStarted;
-    hidePasswordProtectedGames = _hidePasswordProtectedGames;
-    hideNotBuddyCreatedGames = _hideNotBuddyCreatedGames;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setHideFullGames(bool _showFullGames)
+{
+    hideFullGames = _showFullGames;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setHideGamesThatStarted(bool _showGamesThatStarted)
+{
+    hideGamesThatStarted = _showGamesThatStarted;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setHidePasswordProtectedGames(bool _showPasswordProtectedGames)
+{
+    hidePasswordProtectedGames = _showPasswordProtectedGames;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setHideNotBuddyCreatedGames(bool value)
+{
+    hideNotBuddyCreatedGames = value;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setHideOpenDecklistGames(bool _hideOpenDecklistGames)
+{
     hideOpenDecklistGames = _hideOpenDecklistGames;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setGameNameFilter(const QString &_gameNameFilter)
+{
     gameNameFilter = _gameNameFilter;
-    creatorNameFilters = _creatorNameFilters;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setCreatorNameFilter(const QString &_creatorNameFilter)
+{
+    creatorNameFilter = _creatorNameFilter;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setGameTypeFilter(const QSet<int> &_gameTypeFilter)
+{
     gameTypeFilter = _gameTypeFilter;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax)
+{
     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();
+}
+
+void GamesProxyModel::setMaxGameAge(const QTime &_maxGameAge)
+{
+    maxGameAge = _maxGameAge;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setShowOnlyIfSpectatorsCanWatch(bool _showOnlyIfSpectatorsCanWatch)
+{
+    showOnlyIfSpectatorsCanWatch = _showOnlyIfSpectatorsCanWatch;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setShowSpectatorPasswordProtected(bool _showSpectatorPasswordProtected)
+{
+    showSpectatorPasswordProtected = _showSpectatorPasswordProtected;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setShowOnlyIfSpectatorsCanChat(bool _showOnlyIfSpectatorsCanChat)
+{
+    showOnlyIfSpectatorsCanChat = _showOnlyIfSpectatorsCanChat;
+    invalidateFilter();
+}
+
+void GamesProxyModel::setShowOnlyIfSpectatorsCanSeeHands(bool _showOnlyIfSpectatorsCanSeeHands)
+{
+    showOnlyIfSpectatorsCanSeeHands = _showOnlyIfSpectatorsCanSeeHands;
+    invalidateFilter();
 }
 
 int GamesProxyModel::getNumFilteredGames() const
 {
-    auto *model = qobject_cast<GamesModel *>(sourceModel());
+    GamesModel *model = qobject_cast<GamesModel *>(sourceModel());
     if (!model)
         return 0;
 
@@ -346,15 +400,32 @@ int GamesProxyModel::getNumFilteredGames() const
 
 void GamesProxyModel::resetFilterParameters()
 {
-    setGameFilters(false, false, false, false, false, false, false, QString(), QStringList(), {},
-                   DEFAULT_MAX_PLAYERS_MIN, DEFAULT_MAX_PLAYERS_MAX, DEFAULT_MAX_GAME_AGE, false, false, false, false);
+    hideFullGames = false;
+    hideGamesThatStarted = false;
+    hidePasswordProtectedGames = false;
+    hideBuddiesOnlyGames = false;
+    hideIgnoredUserGames = false;
+    hideNotBuddyCreatedGames = false;
+    hideOpenDecklistGames = false;
+    gameNameFilter = QString();
+    creatorNameFilter = QString();
+    gameTypeFilter.clear();
+    maxPlayersFilterMin = DEFAULT_MAX_PLAYERS_MIN;
+    maxPlayersFilterMax = DEFAULT_MAX_PLAYERS_MAX;
+    maxGameAge = DEFAULT_MAX_GAME_AGE;
+    showOnlyIfSpectatorsCanWatch = false;
+    showSpectatorPasswordProtected = false;
+    showOnlyIfSpectatorsCanChat = false;
+    showOnlyIfSpectatorsCanSeeHands = false;
+
+    invalidateFilter();
 }
 
 bool GamesProxyModel::areFilterParametersSetToDefaults() const
 {
     return !hideFullGames && !hideGamesThatStarted && !hidePasswordProtectedGames && !hideBuddiesOnlyGames &&
            !hideOpenDecklistGames && !hideIgnoredUserGames && !hideNotBuddyCreatedGames && gameNameFilter.isEmpty() &&
-           creatorNameFilters.isEmpty() && gameTypeFilter.isEmpty() && maxPlayersFilterMin == DEFAULT_MAX_PLAYERS_MIN &&
+           creatorNameFilter.isEmpty() && gameTypeFilter.isEmpty() && maxPlayersFilterMin == DEFAULT_MAX_PLAYERS_MIN &&
            maxPlayersFilterMax == DEFAULT_MAX_PLAYERS_MAX && maxGameAge == DEFAULT_MAX_GAME_AGE &&
            !showOnlyIfSpectatorsCanWatch && !showSpectatorPasswordProtected && !showOnlyIfSpectatorsCanChat &&
            !showOnlyIfSpectatorsCanSeeHands;
@@ -363,24 +434,32 @@ bool GamesProxyModel::areFilterParametersSetToDefaults() const
 void GamesProxyModel::loadFilterParameters(const QMap<int, QString> &allGameTypes)
 {
     GameFiltersSettings &gameFilters = SettingsCache::instance().gameFilters();
+    hideFullGames = gameFilters.isHideFullGames();
+    hideGamesThatStarted = gameFilters.isHideGamesThatStarted();
+    hidePasswordProtectedGames = gameFilters.isHidePasswordProtectedGames();
+    hideIgnoredUserGames = gameFilters.isHideIgnoredUserGames();
+    hideBuddiesOnlyGames = gameFilters.isHideBuddiesOnlyGames();
+    hideNotBuddyCreatedGames = gameFilters.isHideNotBuddyCreatedGames();
+    hideOpenDecklistGames = gameFilters.isHideOpenDecklistGames();
+    gameNameFilter = gameFilters.getGameNameFilter();
+    creatorNameFilter = gameFilters.getCreatorNameFilter();
+    maxPlayersFilterMin = gameFilters.getMinPlayers();
+    maxPlayersFilterMax = gameFilters.getMaxPlayers();
+    maxGameAge = gameFilters.getMaxGameAge();
+    showOnlyIfSpectatorsCanWatch = gameFilters.isShowOnlyIfSpectatorsCanWatch();
+    showSpectatorPasswordProtected = gameFilters.isShowSpectatorPasswordProtected();
+    showOnlyIfSpectatorsCanChat = gameFilters.isShowOnlyIfSpectatorsCanChat();
+    showOnlyIfSpectatorsCanSeeHands = gameFilters.isShowOnlyIfSpectatorsCanSeeHands();
 
-    QSet<int> newGameTypeFilter;
     QMapIterator<int, QString> gameTypesIterator(allGameTypes);
     while (gameTypesIterator.hasNext()) {
         gameTypesIterator.next();
         if (gameFilters.isGameTypeEnabled(gameTypesIterator.value())) {
-            newGameTypeFilter.insert(gameTypesIterator.key());
+            gameTypeFilter.insert(gameTypesIterator.key());
         }
     }
 
-    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());
+    invalidateFilter();
 }
 
 void GamesProxyModel::saveFilterParameters(const QMap<int, QString> &allGameTypes)
@@ -394,7 +473,7 @@ void GamesProxyModel::saveFilterParameters(const QMap<int, QString> &allGameType
     gameFilters.setHideNotBuddyCreatedGames(hideNotBuddyCreatedGames);
     gameFilters.setHideOpenDecklistGames(hideOpenDecklistGames);
     gameFilters.setGameNameFilter(gameNameFilter);
-    gameFilters.setCreatorNameFilters(creatorNameFilters);
+    gameFilters.setCreatorNameFilter(creatorNameFilter);
 
     QMapIterator<int, QString> gameTypeIterator(allGameTypes);
     while (gameTypeIterator.hasNext()) {
@@ -422,8 +501,10 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const
 {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
     static const QDate epochDate = QDateTime::fromSecsSinceEpoch(0, QTimeZone::UTC).date();
-#else
+#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
     static const QDate epochDate = QDateTime::fromSecsSinceEpoch(0, Qt::UTC).date();
+#else
+    static const QDate epochDate = QDateTime::fromTime_t(0, Qt::UTC).date();
 #endif
     auto *model = qobject_cast<GamesModel *>(sourceModel());
     if (!model)
@@ -455,17 +536,9 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const
     if (!gameNameFilter.isEmpty())
         if (!QString::fromStdString(game.description()).contains(gameNameFilter, Qt::CaseInsensitive))
             return false;
-    if (!creatorNameFilters.isEmpty()) {
-        bool found = false;
-        for (const auto &createNameFilter : creatorNameFilters) {
-            if (QString::fromStdString(game.creator_info().name()).contains(createNameFilter, Qt::CaseInsensitive)) {
-                found = true;
-            }
-        }
-        if (!found) {
+    if (!creatorNameFilter.isEmpty())
+        if (!QString::fromStdString(game.creator_info().name()).contains(creatorNameFilter, Qt::CaseInsensitive))
             return false;
-        }
-    }
 
     QSet<int> gameTypes;
     for (int i = 0; i < game.game_types_size(); ++i)
@@ -504,9 +577,5 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const
 
 void GamesProxyModel::refresh()
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
-    endFilterChange(QSortFilterProxyModel::Direction::Rows);
-#else
     invalidateFilter();
-#endif
 }
diff --git a/cockatrice/src/server/games_model.h b/cockatrice/src/server/games_model.h
new file mode 100644
index 000000000..4b82a9056
--- /dev/null
+++ b/cockatrice/src/server/games_model.h
@@ -0,0 +1,192 @@
+#ifndef GAMESMODEL_H
+#define GAMESMODEL_H
+
+#include "game_type_map.h"
+#include "pb/serverinfo_game.pb.h"
+
+#include <QAbstractTableModel>
+#include <QList>
+#include <QSet>
+#include <QSortFilterProxyModel>
+#include <QStringList>
+#include <QTime>
+
+class UserListProxy;
+
+class GamesModel : public QAbstractTableModel
+{
+    Q_OBJECT
+private:
+    QList<ServerInfo_Game> gameList;
+    QMap<int, QString> rooms;
+    QMap<int, GameTypeMap> gameTypes;
+
+    static const int NUM_COLS = 8;
+
+public:
+    static const int SORT_ROLE = Qt::UserRole + 1;
+
+    GamesModel(const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QObject *parent = nullptr);
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override
+    {
+        return parent.isValid() ? 0 : gameList.size();
+    }
+    int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override
+    {
+        return NUM_COLS;
+    }
+    QVariant data(const QModelIndex &index, int role) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    static const QString getGameCreatedString(const int secs);
+    const ServerInfo_Game &getGame(int row);
+
+    /**
+     * Update game list with a (possibly new) game.
+     */
+    void updateGameList(const ServerInfo_Game &game);
+
+    int roomColIndex()
+    {
+        return 0;
+    }
+    int startTimeColIndex()
+    {
+        return 1;
+    }
+
+    const QMap<int, GameTypeMap> &getGameTypes()
+    {
+        return gameTypes;
+    }
+};
+
+class ServerInfo_User;
+
+class GamesProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+private:
+    const UserListProxy *userListProxy;
+
+    // If adding any additional filters, make sure to update:
+    // - GamesProxyModel()
+    // - resetFilterParameters()
+    // - areFilterParametersSetToDefaults()
+    // - loadFilterParameters()
+    // - saveFilterParameters()
+    // - filterAcceptsRow()
+    bool hideBuddiesOnlyGames;
+    bool hideIgnoredUserGames;
+    bool hideFullGames;
+    bool hideGamesThatStarted;
+    bool hidePasswordProtectedGames;
+    bool hideNotBuddyCreatedGames;
+    bool hideOpenDecklistGames;
+    QString gameNameFilter, creatorNameFilter;
+    QSet<int> gameTypeFilter;
+    quint32 maxPlayersFilterMin, maxPlayersFilterMax;
+    QTime maxGameAge;
+    bool showOnlyIfSpectatorsCanWatch, showSpectatorPasswordProtected, showOnlyIfSpectatorsCanChat,
+        showOnlyIfSpectatorsCanSeeHands;
+
+public:
+    explicit GamesProxyModel(QObject *parent = nullptr, const UserListProxy *_userListProxy = nullptr);
+
+    bool getHideBuddiesOnlyGames() const
+    {
+        return hideBuddiesOnlyGames;
+    }
+    void setHideBuddiesOnlyGames(bool _showBuddiesOnlyGames);
+    bool getHideIgnoredUserGames() const
+    {
+        return hideIgnoredUserGames;
+    }
+    void setHideIgnoredUserGames(bool _hideIgnoredUserGames);
+    bool getHideFullGames() const
+    {
+        return hideFullGames;
+    }
+    void setHideFullGames(bool _showFullGames);
+    bool getHideGamesThatStarted() const
+    {
+        return hideGamesThatStarted;
+    }
+    void setHideGamesThatStarted(bool _showGamesThatStarted);
+    bool getHidePasswordProtectedGames() const
+    {
+        return hidePasswordProtectedGames;
+    }
+    void setHidePasswordProtectedGames(bool _showPasswordProtectedGames);
+    bool getHideNotBuddyCreatedGames() const
+    {
+        return hideNotBuddyCreatedGames;
+    }
+    void setHideNotBuddyCreatedGames(bool value);
+    bool getHideOpenDecklistGames() const
+    {
+        return hideOpenDecklistGames;
+    }
+    void setHideOpenDecklistGames(bool _hideOpenDecklistGames);
+    QString getGameNameFilter() const
+    {
+        return gameNameFilter;
+    }
+    void setGameNameFilter(const QString &_gameNameFilter);
+    QString getCreatorNameFilter() const
+    {
+        return creatorNameFilter;
+    }
+    void setCreatorNameFilter(const QString &_creatorNameFilter);
+    QSet<int> getGameTypeFilter() const
+    {
+        return gameTypeFilter;
+    }
+    void setGameTypeFilter(const QSet<int> &_gameTypeFilter);
+    int getMaxPlayersFilterMin() const
+    {
+        return maxPlayersFilterMin;
+    }
+    int getMaxPlayersFilterMax() const
+    {
+        return maxPlayersFilterMax;
+    }
+    void setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax);
+    const QTime &getMaxGameAge() const
+    {
+        return maxGameAge;
+    }
+    void setMaxGameAge(const QTime &_maxGameAge);
+    bool getShowOnlyIfSpectatorsCanWatch() const
+    {
+        return showOnlyIfSpectatorsCanWatch;
+    }
+    void setShowOnlyIfSpectatorsCanWatch(bool _showOnlyIfSpectatorsCanWatch);
+    bool getShowSpectatorPasswordProtected() const
+    {
+        return showSpectatorPasswordProtected;
+    }
+    void setShowSpectatorPasswordProtected(bool _showSpectatorPasswordProtected);
+    bool getShowOnlyIfSpectatorsCanChat() const
+    {
+        return showOnlyIfSpectatorsCanChat;
+    }
+    void setShowOnlyIfSpectatorsCanChat(bool _showOnlyIfSpectatorsCanChat);
+    bool getShowOnlyIfSpectatorsCanSeeHands() const
+    {
+        return showOnlyIfSpectatorsCanSeeHands;
+    }
+    void setShowOnlyIfSpectatorsCanSeeHands(bool _showOnlyIfSpectatorsCanSeeHands);
+
+    int getNumFilteredGames() const;
+    void resetFilterParameters();
+    bool areFilterParametersSetToDefaults() const;
+    void loadFilterParameters(const QMap<int, QString> &allGameTypes);
+    void saveFilterParameters(const QMap<int, QString> &allGameTypes);
+    void refresh();
+
+protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool filterAcceptsRow(int sourceRow) const;
+};
+
+#endif
diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp b/cockatrice/src/server/handle_public_servers.cpp
similarity index 97%
rename from cockatrice/src/interface/widgets/server/handle_public_servers.cpp
rename to cockatrice/src/server/handle_public_servers.cpp
index f37c957a4..cc44ba262 100644
--- a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
+++ b/cockatrice/src/server/handle_public_servers.cpp
@@ -1,8 +1,10 @@
 #include "handle_public_servers.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 
 #include <QJsonDocument>
+#include <QMessageBox>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QUrl>
 
diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.h b/cockatrice/src/server/handle_public_servers.h
similarity index 92%
rename from cockatrice/src/interface/widgets/server/handle_public_servers.h
rename to cockatrice/src/server/handle_public_servers.h
index f06bb3ff6..430043de1 100644
--- a/cockatrice/src/interface/widgets/server/handle_public_servers.h
+++ b/cockatrice/src/server/handle_public_servers.h
@@ -1,9 +1,3 @@
-/**
- * @file handle_public_servers.h
- * @ingroup Server
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_HANDLE_PUBLIC_SERVERS_H
 #define COCKATRICE_HANDLE_PUBLIC_SERVERS_H
 
diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp b/cockatrice/src/server/local_client.cpp
similarity index 86%
rename from libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
rename to cockatrice/src/server/local_client.cpp
index eefa3a2f3..734660af1 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
+++ b/cockatrice/src/server/local_client.cpp
@@ -1,9 +1,8 @@
 #include "local_client.h"
 
-#include "../../server/local/local_server_interface.h"
-
-#include <libcockatrice/protocol/debug_pb_message.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include "debug_pb_message.h"
+#include "local_server_interface.h"
+#include "pb/session_commands.pb.h"
 
 LocalClient::LocalClient(LocalServerInterface *_lsi,
                          const QString &_playerName,
diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.h b/cockatrice/src/server/local_client.h
similarity index 83%
rename from libcockatrice_network/libcockatrice/network/client/local/local_client.h
rename to cockatrice/src/server/local_client.h
index e8c5330ac..145887ea8 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/local_client.h
+++ b/cockatrice/src/server/local_client.h
@@ -1,13 +1,7 @@
-/**
- * @file local_client.h
- * @ingroup Client
- * @brief TODO: Document this.
- */
-
 #ifndef LOCALCLIENT_H
 #define LOCALCLIENT_H
 
-#include "../abstract/abstract_client.h"
+#include "abstract_client.h"
 
 #include <QLoggingCategory>
 
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp b/cockatrice/src/server/local_server.cpp
similarity index 98%
rename from libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
rename to cockatrice/src/server/local_server.cpp
index 8f9d82aa4..74ee8601d 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
+++ b/cockatrice/src/server/local_server.cpp
@@ -1,8 +1,7 @@
 #include "local_server.h"
 
 #include "local_server_interface.h"
-
-#include <../remote/server_room.h>
+#include "server/server_room.h"
 
 LocalServer::LocalServer(QObject *parent) : Server(parent)
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server.h b/cockatrice/src/server/local_server.h
similarity index 89%
rename from libcockatrice_network/libcockatrice/network/server/local/local_server.h
rename to cockatrice/src/server/local_server.h
index 70586f6c1..93dbeb827 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server.h
+++ b/cockatrice/src/server/local_server.h
@@ -1,14 +1,8 @@
-/**
- * @file local_server.h
- * @ingroup Server
- * @brief TODO: Document this.
- */
-
 #ifndef LOCALSERVER_H
 #define LOCALSERVER_H
 
-#include <../remote/server.h>
-#include <../remote/server_database_interface.h>
+#include "server/server.h"
+#include "server/server_database_interface.h"
 
 class LocalServerInterface;
 
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp b/cockatrice/src/server/local_server_interface.cpp
similarity index 100%
rename from libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
rename to cockatrice/src/server/local_server_interface.cpp
diff --git a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h b/cockatrice/src/server/local_server_interface.h
similarity index 81%
rename from libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
rename to cockatrice/src/server/local_server_interface.h
index 4410fd65c..ebfc49719 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
+++ b/cockatrice/src/server/local_server_interface.h
@@ -1,13 +1,7 @@
-/**
- * @file local_server_interface.h
- * @ingroup Server
- * @brief TODO: Document this.
- */
-
 #ifndef LOCALSERVERINTERFACE_H
 #define LOCALSERVERINTERFACE_H
 
-#include <../remote/server_protocolhandler.h>
+#include "server/server_protocolhandler.h"
 
 class LocalServer;
 
@@ -25,7 +19,7 @@ public:
     QString getConnectionType() const override
     {
         return "local";
-    }
+    };
     void transmitProtocolItem(const ServerMessage &item) override;
 signals:
     void itemToClient(const ServerMessage &item);
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp b/cockatrice/src/server/pending_command.cpp
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
rename to cockatrice/src/server/pending_command.cpp
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pending_command.h b/cockatrice/src/server/pending_command.h
similarity index 77%
rename from libcockatrice_protocol/libcockatrice/protocol/pending_command.h
rename to cockatrice/src/server/pending_command.h
index 1d2d9ff17..d845167ac 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
+++ b/cockatrice/src/server/pending_command.h
@@ -1,15 +1,10 @@
-/**
- * @file pending_command.h
- * @ingroup Messages
- * @brief TODO: Document this.
- */
-
 #ifndef PENDING_COMMAND_H
 #define PENDING_COMMAND_H
 
+#include "pb/commands.pb.h"
+#include "pb/response.pb.h"
+
 #include <QVariant>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
 
 class PendingCommand : public QObject
 {
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp b/cockatrice/src/server/remote/remote_client.cpp
similarity index 90%
rename from libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
rename to cockatrice/src/server/remote/remote_client.cpp
index 3e3ec889d..1d8579c14 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
+++ b/cockatrice/src/server/remote/remote_client.cpp
@@ -1,5 +1,18 @@
 #include "remote_client.h"
 
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "../pending_command.h"
+#include "debug_pb_message.h"
+#include "passwordhasher.h"
+#include "pb/event_server_identification.pb.h"
+#include "pb/response_activate.pb.h"
+#include "pb/response_forgotpasswordrequest.pb.h"
+#include "pb/response_login.pb.h"
+#include "pb/response_password_salt.pb.h"
+#include "pb/response_register.pb.h"
+#include "pb/server_message.pb.h"
+#include "pb/session_commands.pb.h"
 #include "version_string.h"
 
 #include <QCryptographicHash>
@@ -10,29 +23,17 @@
 #include <QThread>
 #include <QTimer>
 #include <QWebSocket>
-#include <libcockatrice/interfaces/interface_network_settings_provider.h>
-#include <libcockatrice/protocol/debug_pb_message.h>
-#include <libcockatrice/protocol/pb/event_server_identification.pb.h>
-#include <libcockatrice/protocol/pb/response_activate.pb.h>
-#include <libcockatrice/protocol/pb/response_forgotpasswordrequest.pb.h>
-#include <libcockatrice/protocol/pb/response_login.pb.h>
-#include <libcockatrice/protocol/pb/response_password_salt.pb.h>
-#include <libcockatrice/protocol/pb/response_register.pb.h>
-#include <libcockatrice/protocol/pb/server_message.pb.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/passwordhasher.h>
 
 static const unsigned int protocolVersion = 14;
 
-RemoteClient::RemoteClient(QObject *parent, INetworkSettingsProvider *_networkSettingsProvider)
-    : AbstractClient(parent), networkSettingsProvider(_networkSettingsProvider), timeRunning(0), lastDataReceived(0),
-      messageInProgress(false), handshakeStarted(false), usingWebSocket(false), messageLength(0), hashedPassword()
+RemoteClient::RemoteClient(QObject *parent)
+    : AbstractClient(parent), timeRunning(0), lastDataReceived(0), messageInProgress(false), handshakeStarted(false),
+      usingWebSocket(false), messageLength(0), hashedPassword()
 {
 
     clearNewClientFeatures();
-    maxTimeout = networkSettingsProvider->getTimeOut();
-    int keepalive = networkSettingsProvider->getKeepAlive();
+    maxTimeout = SettingsCache::instance().getTimeOut();
+    int keepalive = SettingsCache::instance().getKeepAlive();
     timer = new QTimer(this);
     timer->setInterval(keepalive * 1000);
     connect(timer, &QTimer::timeout, this, &RemoteClient::ping);
@@ -42,7 +43,11 @@ RemoteClient::RemoteClient(QObject *parent, INetworkSettingsProvider *_networkSe
     connect(socket, &QTcpSocket::connected, this, &RemoteClient::slotConnected);
     connect(socket, &QTcpSocket::readyRead, this, &RemoteClient::readData);
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     connect(socket, &QTcpSocket::errorOccurred, this, &RemoteClient::slotSocketError);
+#else
+    connect(socket, qOverload<QAbstractSocket::SocketError>(&QTcpSocket::error), this, &RemoteClient::slotSocketError);
+#endif
 
     websocket = new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this);
     connect(websocket, &QWebSocket::binaryMessageReceived, this, &RemoteClient::websocketMessageReceived);
@@ -303,8 +308,8 @@ void RemoteClient::loginResponse(const Response &response)
         emit ignoreListReceived(ignoreList);
 
         if (newMissingFeatureFound(possibleMissingFeatures) && resp.missing_features_size() > 0 &&
-            networkSettingsProvider->getNotifyAboutUpdates()) {
-            networkSettingsProvider->setKnownMissingFeatures(possibleMissingFeatures);
+            SettingsCache::instance().getNotifyAboutUpdates()) {
+            SettingsCache::instance().setKnownMissingFeatures(possibleMissingFeatures);
             emit notifyUserAboutUpdate();
         }
 
@@ -390,18 +395,14 @@ void RemoteClient::readData()
             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);
-        } else {
-            qCDebug(RemoteClientLog) << "parsing error!";
-        }
+        processProtocolItem(newServerMessage);
 
         if (getStatus() == StatusDisconnecting) // use thread-safe getter
             doDisconnectFromServer();
@@ -412,13 +413,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)
@@ -432,27 +431,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);
     }
 }
 
@@ -595,7 +586,7 @@ void RemoteClient::disconnectFromServer()
 
 QString RemoteClient::getSrvClientID(const QString &_hostname)
 {
-    QString srvClientID = networkSettingsProvider->getClientID();
+    QString srvClientID = SettingsCache::instance().getClientID();
     QHostInfo hostInfo = QHostInfo::fromName(_hostname);
     if (!hostInfo.error()) {
         QHostAddress hostAddress = hostInfo.addresses().first();
@@ -615,7 +606,7 @@ bool RemoteClient::newMissingFeatureFound(const QString &_serversMissingFeatures
     QStringList serversMissingFeaturesList = _serversMissingFeatures.split(",");
     for (const QString &feature : serversMissingFeaturesList) {
         if (!feature.isEmpty()) {
-            if (!networkSettingsProvider->getKnownMissingFeatures().contains(feature))
+            if (!SettingsCache::instance().getKnownMissingFeatures().contains(feature))
                 return true;
         }
     }
@@ -625,14 +616,14 @@ bool RemoteClient::newMissingFeatureFound(const QString &_serversMissingFeatures
 void RemoteClient::clearNewClientFeatures()
 {
     QString newKnownMissingFeatures;
-    QStringList existingKnownMissingFeatures = networkSettingsProvider->getKnownMissingFeatures().split(",");
+    QStringList existingKnownMissingFeatures = SettingsCache::instance().getKnownMissingFeatures().split(",");
     for (const QString &existingKnownFeature : existingKnownMissingFeatures) {
         if (!existingKnownFeature.isEmpty()) {
             if (!clientFeatures.contains(existingKnownFeature))
                 newKnownMissingFeatures.append("," + existingKnownFeature);
         }
     }
-    networkSettingsProvider->setKnownMissingFeatures(newKnownMissingFeatures);
+    SettingsCache::instance().setKnownMissingFeatures(newKnownMissingFeatures);
 }
 
 void RemoteClient::requestForgotPasswordToServer(const QString &hostname, unsigned int port, const QString &_userName)
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h b/cockatrice/src/server/remote/remote_client.h
similarity index 94%
rename from libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
rename to cockatrice/src/server/remote/remote_client.h
index 15e3e8ef5..0ab24c798 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
+++ b/cockatrice/src/server/remote/remote_client.h
@@ -1,18 +1,12 @@
-/**
- * @file remote_client.h
- * @ingroup Client
- * @brief TODO: Document this.
- */
-
 #ifndef REMOTECLIENT_H
 #define REMOTECLIENT_H
 
-#include "../abstract/abstract_client.h"
+#include "../abstract_client.h"
+#include "pb/commands.pb.h"
 
 #include <QLoggingCategory>
+#include <QTcpSocket>
 #include <QWebSocket>
-#include <libcockatrice/interfaces/interface_network_settings_provider.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
 
 inline Q_LOGGING_CATEGORY(RemoteClientLog, "remote_client");
 
@@ -97,7 +91,6 @@ private slots:
     void submitForgotPasswordChallengeResponse(const Response &response);
 
 private:
-    INetworkSettingsProvider *networkSettingsProvider;
     int maxTimeout;
     int timeRunning, lastDataReceived;
     QByteArray inputBuffer;
@@ -121,7 +114,7 @@ protected slots:
     void sendCommandContainer(const CommandContainer &cont) override;
 
 public:
-    explicit RemoteClient(QObject *parent = nullptr, INetworkSettingsProvider *networkSettingsProvider = nullptr);
+    explicit RemoteClient(QObject *parent = nullptr);
     ~RemoteClient() override;
     QString peerName() const
     {
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
similarity index 97%
rename from cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
rename to cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
index 6ca680c3f..dfed741f9 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
+++ b/cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
@@ -1,13 +1,14 @@
 #include "remote_decklist_tree_widget.h"
 
+#include "../abstract_client.h"
+#include "../pending_command.h"
+#include "pb/command_deck_list.pb.h"
+#include "pb/response_deck_list.pb.h"
+#include "pb/serverinfo_deckstorage.pb.h"
+
 #include <QFileIconProvider>
 #include <QHeaderView>
 #include <QSortFilterProxyModel>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/command_deck_list.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_list.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
 
 RemoteDeckList_TreeModel::DirectoryNode::DirectoryNode(const QString &_name,
                                                        RemoteDeckList_TreeModel::DirectoryNode *_parent)
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h b/cockatrice/src/server/remote/remote_decklist_tree_widget.h
similarity index 64%
rename from cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h
rename to cockatrice/src/server/remote/remote_decklist_tree_widget.h
index 8254eb57b..f82378731 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h
+++ b/cockatrice/src/server/remote/remote_decklist_tree_widget.h
@@ -1,13 +1,7 @@
-/**
- * @file remote_decklist_tree_widget.h
- * @ingroup NetworkingWidgets
- * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef REMOTEDECKLIST_TREEWIDGET_H
 #define REMOTEDECKLIST_TREEWIDGET_H
 
+#include <QAbstractItemModel>
 #include <QDateTime>
 #include <QTreeView>
 
@@ -33,11 +27,11 @@ public:
         {
         }
         virtual ~Node() = default;
-        [[nodiscard]] DirectoryNode *getParent() const
+        DirectoryNode *getParent() const
         {
             return parent;
         }
-        [[nodiscard]] QString getName() const
+        QString getName() const
         {
             return name;
         }
@@ -48,9 +42,9 @@ public:
         explicit DirectoryNode(const QString &_name = QString(), DirectoryNode *_parent = nullptr);
         ~DirectoryNode() override;
         void clearTree();
-        [[nodiscard]] QString getPath() const;
+        QString getPath() const;
         DirectoryNode *getNodeByPath(QStringList path);
-        [[nodiscard]] FileNode *getNodeById(int id) const;
+        FileNode *getNodeById(int id) const;
     };
     class FileNode : public Node
     {
@@ -63,17 +57,17 @@ public:
             : Node(_name, _parent), id(_id), uploadTime(_uploadTime)
         {
         }
-        [[nodiscard]] int getId() const
+        int getId() const
         {
             return id;
         }
-        [[nodiscard]] QDateTime getUploadTime() const
+        QDateTime getUploadTime() const
         {
             return uploadTime;
         }
     };
 
-    template <typename T> [[nodiscard]] T getNode(const QModelIndex &index) const
+    template <typename T> T getNode(const QModelIndex &index) const
     {
         if (!index.isValid())
             return dynamic_cast<T>(root);
@@ -95,16 +89,15 @@ private slots:
 public:
     explicit RemoteDeckList_TreeModel(AbstractClient *_client, QObject *parent = nullptr);
     ~RemoteDeckList_TreeModel() override;
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-    [[nodiscard]] QVariant
-    headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-    [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] QModelIndex parent(const QModelIndex &index) const override;
-    [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &index) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
 
-    [[nodiscard]] DirectoryNode *getRoot() const
+    DirectoryNode *getRoot() const
     {
         return root;
     }
@@ -124,11 +117,11 @@ private:
 
 public:
     explicit RemoteDeckList_TreeWidget(AbstractClient *_client, QWidget *parent = nullptr);
-    [[nodiscard]] RemoteDeckList_TreeModel::Node *getNode(const QModelIndex &ind) const;
-    [[nodiscard]] RemoteDeckList_TreeModel::Node *getCurrentItem() const;
-    [[nodiscard]] QList<RemoteDeckList_TreeModel::Node *> getCurrentSelection() const;
-    [[nodiscard]] RemoteDeckList_TreeModel::DirectoryNode *getNodeByPath(const QString &path) const;
-    [[nodiscard]] RemoteDeckList_TreeModel::FileNode *getNodeById(int id) const;
+    RemoteDeckList_TreeModel::Node *getNode(const QModelIndex &ind) const;
+    RemoteDeckList_TreeModel::Node *getCurrentItem() const;
+    QList<RemoteDeckList_TreeModel::Node *> getCurrentSelection() const;
+    RemoteDeckList_TreeModel::DirectoryNode *getNodeByPath(const QString &path) const;
+    RemoteDeckList_TreeModel::FileNode *getNodeById(int id) const;
     void addFileToTree(const ServerInfo_DeckStorage_TreeItem &file, RemoteDeckList_TreeModel::DirectoryNode *parent);
     void addFolderToTree(const ServerInfo_DeckStorage_TreeItem &folder,
                          RemoteDeckList_TreeModel::DirectoryNode *parent);
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
similarity index 93%
rename from cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
rename to cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
index 5152880d9..1fa72b20c 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
+++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
@@ -1,13 +1,14 @@
 #include "remote_replay_list_tree_widget.h"
 
+#include "../abstract_client.h"
+#include "../pending_command.h"
+#include "pb/command_replay_list.pb.h"
+#include "pb/response_replay_list.pb.h"
+#include "pb/serverinfo_replay.pb.h"
+
 #include <QFileIconProvider>
 #include <QHeaderView>
 #include <QSortFilterProxyModel>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/command_replay_list.pb.h>
-#include <libcockatrice/protocol/pb/response_replay_list.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
 
 const int RemoteReplayList_TreeModel::numberOfColumns = 6;
 
@@ -48,7 +49,7 @@ int RemoteReplayList_TreeModel::rowCount(const QModelIndex &parent) const
     if (!parent.isValid())
         return replayMatches.size();
 
-    auto *matchNode = dynamic_cast<MatchNode *>(static_cast<Node *>(parent.internalPointer()));
+    MatchNode *matchNode = dynamic_cast<MatchNode *>(static_cast<Node *>(parent.internalPointer()));
     if (matchNode)
         return matchNode->size();
     else
@@ -62,7 +63,7 @@ QVariant RemoteReplayList_TreeModel::data(const QModelIndex &index, int role) co
     if (index.column() >= numberOfColumns)
         return QVariant();
 
-    auto *replayNode = dynamic_cast<ReplayNode *>(static_cast<Node *>(index.internalPointer()));
+    ReplayNode *replayNode = dynamic_cast<ReplayNode *>(static_cast<Node *>(index.internalPointer()));
     if (replayNode) {
         const ServerInfo_Replay &replayInfo = replayNode->getReplayInfo();
         switch (role) {
@@ -84,7 +85,7 @@ QVariant RemoteReplayList_TreeModel::data(const QModelIndex &index, int role) co
                 return index.column() == 0 ? fileIcon : QVariant();
         }
     } else {
-        auto *matchNode = dynamic_cast<MatchNode *>(static_cast<Node *>(index.internalPointer()));
+        MatchNode *matchNode = dynamic_cast<MatchNode *>(static_cast<Node *>(index.internalPointer()));
         const ServerInfo_ReplayMatch &matchInfo = matchNode->getMatchInfo();
         switch (role) {
             case Qt::TextAlignmentRole:
@@ -170,7 +171,7 @@ QModelIndex RemoteReplayList_TreeModel::index(int row, int column, const QModelI
     if (!hasIndex(row, column, parent))
         return QModelIndex();
 
-    auto *matchNode = dynamic_cast<MatchNode *>(static_cast<Node *>(parent.internalPointer()));
+    MatchNode *matchNode = dynamic_cast<MatchNode *>(static_cast<Node *>(parent.internalPointer()));
     if (matchNode) {
         if (row >= matchNode->size())
             return QModelIndex();
@@ -188,7 +189,7 @@ QModelIndex RemoteReplayList_TreeModel::parent(const QModelIndex &ind) const
     if (matchNode)
         return QModelIndex();
     else {
-        auto *replayNode = dynamic_cast<ReplayNode *>(static_cast<Node *>(ind.internalPointer()));
+        ReplayNode *replayNode = dynamic_cast<ReplayNode *>(static_cast<Node *>(ind.internalPointer()));
         return createIndex(replayNode->getParent()->indexOf(replayNode), 0, replayNode->getParent());
     }
 }
@@ -206,7 +207,7 @@ ServerInfo_Replay const *RemoteReplayList_TreeModel::getReplay(const QModelIndex
     if (!index.isValid())
         return 0;
 
-    auto *node = dynamic_cast<ReplayNode *>(static_cast<Node *>(index.internalPointer()));
+    ReplayNode *node = dynamic_cast<ReplayNode *>(static_cast<Node *>(index.internalPointer()));
     if (!node)
         return 0;
     return &node->getReplayInfo();
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h b/cockatrice/src/server/remote/remote_replay_list_tree_widget.h
similarity index 64%
rename from cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h
rename to cockatrice/src/server/remote/remote_replay_list_tree_widget.h
index 6d81aefca..02082046a 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h
+++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.h
@@ -1,18 +1,12 @@
-/**
- * @file remote_replay_list_tree_widget.h
- * @ingroup DeckStorageWidgets
- * @ingroup Replays
- * @ingroup NetworkingWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef REMOTEREPLAYLIST_TREEWIDGET_H
 #define REMOTEREPLAYLIST_TREEWIDGET_H
 
+#include "pb/serverinfo_replay.pb.h"
+#include "pb/serverinfo_replay_match.pb.h"
+
+#include <QAbstractItemModel>
 #include <QDateTime>
 #include <QTreeView>
-#include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_replay_match.pb.h>
 
 class Response;
 class AbstractClient;
@@ -34,7 +28,7 @@ private:
         {
         }
         virtual ~Node() = default;
-        [[nodiscard]] QString getName() const
+        QString getName() const
         {
             return name;
         }
@@ -90,22 +84,21 @@ private slots:
 public:
     explicit RemoteReplayList_TreeModel(AbstractClient *_client, QObject *parent = nullptr);
     ~RemoteReplayList_TreeModel() override;
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override
     {
         return numberOfColumns;
     }
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-    [[nodiscard]] QVariant
-    headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-    [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] QModelIndex parent(const QModelIndex &index) const override;
-    [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &index) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
     void clearTree();
     void refreshTree();
-    [[nodiscard]] ServerInfo_Replay const *getReplay(const QModelIndex &index) const;
-    [[nodiscard]] ServerInfo_ReplayMatch const *getReplayMatch(const QModelIndex &index) const;
-    [[nodiscard]] ServerInfo_ReplayMatch const *getEnclosingReplayMatch(const QModelIndex &index) const;
+    ServerInfo_Replay const *getReplay(const QModelIndex &index) const;
+    ServerInfo_ReplayMatch const *getReplayMatch(const QModelIndex &index) const;
+    ServerInfo_ReplayMatch const *getEnclosingReplayMatch(const QModelIndex &index) const;
     void addMatchInfo(const ServerInfo_ReplayMatch &matchInfo);
     void updateMatchInfo(int gameId, const ServerInfo_ReplayMatch &matchInfo);
     void removeMatchInfo(int gameId);
@@ -119,10 +112,10 @@ private:
 
 public:
     explicit RemoteReplayList_TreeWidget(AbstractClient *_client, QWidget *parent = nullptr);
-    [[nodiscard]] ServerInfo_Replay const *getReplay(const QModelIndex &ind) const;
-    [[nodiscard]] ServerInfo_ReplayMatch const *getReplayMatch(const QModelIndex &ind) const;
-    [[nodiscard]] QList<ServerInfo_Replay const *> getSelectedReplays() const;
-    [[nodiscard]] QSet<ServerInfo_ReplayMatch const *> getSelectedReplayMatches() const;
+    ServerInfo_Replay const *getReplay(const QModelIndex &ind) const;
+    ServerInfo_ReplayMatch const *getReplayMatch(const QModelIndex &ind) const;
+    QList<ServerInfo_Replay const *> getSelectedReplays() const;
+    QSet<ServerInfo_ReplayMatch const *> getSelectedReplayMatches() const;
     void clearTree()
     {
         treeModel->clearTree();
diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp
similarity index 94%
rename from cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
rename to cockatrice/src/server/user/user_context_menu.cpp
index 7083ac899..c6782ef18 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
+++ b/cockatrice/src/server/user/user_context_menu.cpp
@@ -1,10 +1,22 @@
 #include "user_context_menu.h"
 
-#include "../../interface/widgets/tabs/tab_account.h"
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../tabs/tab_account.h"
+#include "../../tabs/tab_game.h"
+#include "../../tabs/tab_supervisor.h"
+#include "../abstract_client.h"
 #include "../chat_view/chat_view.h"
 #include "../game_selector.h"
+#include "../pending_command.h"
+#include "pb/command_kick_from_game.pb.h"
+#include "pb/commands.pb.h"
+#include "pb/moderator_commands.pb.h"
+#include "pb/response_ban_history.pb.h"
+#include "pb/response_get_admin_notes.pb.h"
+#include "pb/response_get_games_of_user.pb.h"
+#include "pb/response_get_user_info.pb.h"
+#include "pb/response_warn_history.pb.h"
+#include "pb/response_warn_list.pb.h"
+#include "pb/session_commands.pb.h"
 #include "user_info_box.h"
 #include "user_list_manager.h"
 #include "user_list_proxy.h"
@@ -12,20 +24,10 @@
 
 #include <QAction>
 #include <QMenu>
+#include <QMessageBox>
+#include <QSignalMapper>
 #include <QtGui>
 #include <QtWidgets>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/moderator_commands.pb.h>
-#include <libcockatrice/protocol/pb/response_ban_history.pb.h>
-#include <libcockatrice/protocol/pb/response_get_admin_notes.pb.h>
-#include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
-#include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
-#include <libcockatrice/protocol/pb/response_warn_history.pb.h>
-#include <libcockatrice/protocol/pb/response_warn_list.pb.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
 
 UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent, AbstractGame *_game)
     : QObject(parent), client(_tabSupervisor->getClient()), tabSupervisor(_tabSupervisor),
@@ -108,7 +110,7 @@ void UserContextMenu::gamesOfUserReceived(const Response &resp, const CommandCon
         gameTypeMap.insert(roomInfo.room_id(), tempMap);
     }
 
-    auto *selector = new GameSelector(client, tabSupervisor, nullptr, roomMap, gameTypeMap, false, false);
+    GameSelector *selector = new GameSelector(client, tabSupervisor, nullptr, roomMap, gameTypeMap, false, false);
     selector->setParent(static_cast<QWidget *>(parent()), Qt::Window);
     const int gameListSize = response.game_list_size();
     for (int i = 0; i < gameListSize; ++i) {
@@ -126,7 +128,7 @@ void UserContextMenu::banUser_processUserInfoResponse(const Response &r)
     const Response_GetUserInfo &response = r.GetExtension(Response_GetUserInfo::ext);
 
     // The dialog needs to be non-modal in order to not block the event queue of the client.
-    auto *dlg = new BanDialog(response.user_info(), static_cast<QWidget *>(parent()));
+    BanDialog *dlg = new BanDialog(response.user_info(), static_cast<QWidget *>(parent()));
     connect(dlg, &QDialog::accepted, this, &UserContextMenu::banUser_dialogFinished);
     dlg->show();
 }
@@ -139,7 +141,7 @@ void UserContextMenu::warnUser_processGetWarningsListResponse(const Response &r)
     QString clientid = QString::fromStdString(response.user_clientid()).simplified();
 
     // The dialog needs to be non-modal in order to not block the event queue of the client.
-    auto *dlg = new WarningDialog(user, clientid, static_cast<QWidget *>(parent()));
+    WarningDialog *dlg = new WarningDialog(user, clientid, static_cast<QWidget *>(parent()));
     connect(dlg, &QDialog::accepted, this, &UserContextMenu::warnUser_dialogFinished);
 
     if (response.warning_size() > 0) {
@@ -169,7 +171,7 @@ void UserContextMenu::banUserHistory_processResponse(const Response &resp)
     if (resp.response_code() == Response::RespOk) {
 
         if (response.ban_list_size() > 0) {
-            auto *table = new QTableWidget();
+            QTableWidget *table = new QTableWidget();
             table->setWindowTitle(tr("Ban History"));
             table->setRowCount(response.ban_list_size());
             table->setColumnCount(5);
@@ -207,7 +209,7 @@ void UserContextMenu::warnUserHistory_processResponse(const Response &resp)
     if (resp.response_code() == Response::RespOk) {
 
         if (response.warn_list_size() > 0) {
-            auto *table = new QTableWidget();
+            QTableWidget *table = new QTableWidget();
             table->setWindowTitle(tr("Warning History"));
             table->setRowCount(response.warn_list_size());
             table->setColumnCount(4);
@@ -276,7 +278,7 @@ void UserContextMenu::adjustMod_processUserResponse(const Response &resp, const
 
 void UserContextMenu::banUser_dialogFinished()
 {
-    auto *dlg = static_cast<BanDialog *>(sender());
+    BanDialog *dlg = static_cast<BanDialog *>(sender());
 
     Command_BanFromServer cmd;
     cmd.set_user_name(dlg->getBanName().toStdString());
@@ -295,7 +297,7 @@ void UserContextMenu::banUser_dialogFinished()
 
 void UserContextMenu::warnUser_dialogFinished()
 {
-    auto *dlg = static_cast<WarningDialog *>(sender());
+    WarningDialog *dlg = static_cast<WarningDialog *>(sender());
 
     if (dlg->getName().isEmpty() || userListProxy->getOwnUsername().simplified().isEmpty())
         return;
@@ -431,7 +433,7 @@ void UserContextMenu::showContextMenu(const QPoint &pos,
     QAction *actionClicked = menu->exec(pos);
     if (actionClicked == nullptr) {
     } else if (actionClicked == aDetails) {
-        auto *infoWidget =
+        UserInfoBox *infoWidget =
             new UserInfoBox(client, false, static_cast<QWidget *>(parent()),
                             Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint);
         infoWidget->setAttribute(Qt::WA_DeleteOnClose);
diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.h b/cockatrice/src/server/user/user_context_menu.h
similarity index 94%
rename from cockatrice/src/interface/widgets/server/user/user_context_menu.h
rename to cockatrice/src/server/user/user_context_menu.h
index 0056d74ae..730cfd185 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.h
+++ b/cockatrice/src/server/user/user_context_menu.h
@@ -1,14 +1,9 @@
-/**
- * @file user_context_menu.h
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef USER_CONTEXT_MENU_H
 #define USER_CONTEXT_MENU_H
 
+#include "user_level.h"
+
 #include <QObject>
-#include <libcockatrice/network/server/remote/user_level.h>
 
 class AbstractGame;
 class UserListProxy;
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp
similarity index 95%
rename from cockatrice/src/interface/widgets/server/user/user_info_box.cpp
rename to cockatrice/src/server/user/user_info_box.cpp
index 9ae4a42c2..cec0c38e8 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
+++ b/cockatrice/src/server/user/user_info_box.cpp
@@ -1,10 +1,16 @@
 #include "user_info_box.h"
 
+#include "../../client/get_text_with_max.h"
+#include "../../dialogs/dlg_edit_avatar.h"
+#include "../../dialogs/dlg_edit_password.h"
+#include "../../dialogs/dlg_edit_user.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../../interface/widgets/dialogs/dlg_edit_avatar.h"
-#include "../../interface/widgets/dialogs/dlg_edit_password.h"
-#include "../../interface/widgets/dialogs/dlg_edit_user.h"
-#include "../../interface/widgets/utility/get_text_with_max.h"
+#include "../abstract_client.h"
+#include "../pending_command.h"
+#include "passwordhasher.h"
+#include "pb/response_get_user_info.pb.h"
+#include "pb/serverinfo_user.pb.h"
+#include "pb/session_commands.pb.h"
 
 #include <QDateTime>
 #include <QGridLayout>
@@ -12,12 +18,6 @@
 #include <QInputDialog>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/passwordhasher.h>
 
 UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *parent, Qt::WindowFlags flags)
     : QWidget(parent, flags), client(_client), editable(_editable)
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.h b/cockatrice/src/server/user/user_info_box.h
similarity index 95%
rename from cockatrice/src/interface/widgets/server/user/user_info_box.h
rename to cockatrice/src/server/user/user_info_box.h
index d3d926bed..170c27bb2 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.h
+++ b/cockatrice/src/server/user/user_info_box.h
@@ -1,9 +1,3 @@
-/**
- * @file user_info_box.h
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef USERINFOBOX_H
 #define USERINFOBOX_H
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp b/cockatrice/src/server/user/user_info_connection.cpp
similarity index 98%
rename from cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
rename to cockatrice/src/server/user/user_info_connection.cpp
index 069e438a9..50ac129a8 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
+++ b/cockatrice/src/server/user/user_info_connection.cpp
@@ -1,6 +1,6 @@
 #include "user_info_connection.h"
 
-#include "../../../../client/settings/cache_settings.h"
+#include "../../settings/cache_settings.h"
 
 #include <QDebug>
 #include <utility>
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_connection.h b/cockatrice/src/server/user/user_info_connection.h
similarity index 71%
rename from cockatrice/src/interface/widgets/server/user/user_info_connection.h
rename to cockatrice/src/server/user/user_info_connection.h
index cfba22346..b2abf65ac 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.h
+++ b/cockatrice/src/server/user/user_info_connection.h
@@ -1,9 +1,3 @@
-/**
- * @file user_info_connection.h
- * @ingroup Client
- * @brief TODO: Document this.
- */
-
 #ifndef USERCONNECTION_INFORMATION_H
 #define USERCONNECTION_INFORMATION_H
 
@@ -30,31 +24,31 @@ private:
 public:
     UserConnection_Information();
     UserConnection_Information(QString, QString, QString, QString, QString, bool, QString);
-    [[nodiscard]] QString getSaveName() const
+    QString getSaveName() const
     {
         return saveName;
     }
-    [[nodiscard]] QString getServer() const
+    QString getServer() const
     {
         return server;
     }
-    [[nodiscard]] QString getPort() const
+    QString getPort() const
     {
         return port;
     }
-    [[nodiscard]] QString getUsername() const
+    QString getUsername() const
     {
         return username;
     }
-    [[nodiscard]] QString getPassword() const
+    QString getPassword() const
     {
         return password;
     }
-    [[nodiscard]] bool getSavePassword() const
+    bool getSavePassword() const
     {
         return savePassword;
     }
-    [[nodiscard]] QString getSite() const
+    QString getSite() const
     {
         return site;
     }
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp b/cockatrice/src/server/user/user_list_manager.cpp
similarity index 91%
rename from cockatrice/src/interface/widgets/server/user/user_list_manager.cpp
rename to cockatrice/src/server/user/user_list_manager.cpp
index 4bc2c84d6..c74706955 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp
+++ b/cockatrice/src/server/user/user_list_manager.cpp
@@ -1,17 +1,16 @@
 #include "user_list_manager.h"
 
 #include "../../client/sound_engine.h"
+#include "../abstract_client.h"
+#include "../pending_command.h"
+#include "pb/event_add_to_list.pb.h"
+#include "pb/event_remove_from_list.pb.h"
+#include "pb/event_user_joined.pb.h"
+#include "pb/event_user_left.pb.h"
+#include "pb/response_list_users.pb.h"
+#include "pb/session_commands.pb.h"
 #include "user_info_box.h"
 
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
-#include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
-#include <libcockatrice/protocol/pb/event_user_joined.pb.h>
-#include <libcockatrice/protocol/pb/event_user_left.pb.h>
-#include <libcockatrice/protocol/pb/response_list_users.pb.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-
 UserListManager::UserListManager(AbstractClient *_client, QObject *parent)
     : QObject(parent), client(_client), ownUserInfo(nullptr)
 {
@@ -167,4 +166,4 @@ const ServerInfo_User *UserListManager::getOnlineUser(const QString &userName) c
     }
 
     return nullptr;
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_manager.h b/cockatrice/src/server/user/user_list_manager.h
similarity index 78%
rename from cockatrice/src/interface/widgets/server/user/user_list_manager.h
rename to cockatrice/src/server/user/user_list_manager.h
index f378bd08d..d83ec45ef 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_manager.h
+++ b/cockatrice/src/server/user/user_list_manager.h
@@ -1,17 +1,11 @@
-/**
- * @file user_list_manager.h
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_USER_LIST_MANAGER_H
 #define COCKATRICE_USER_LIST_MANAGER_H
 
+#include "pb/serverinfo_user.pb.h"
 #include "user_list_proxy.h"
 
 #include <QMap>
 #include <QWidget>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class AbstractClient;
 class Event_AddToList;
@@ -60,11 +54,11 @@ public:
         return ignoredUsers;
     }
 
-    [[nodiscard]] bool isOwnUserRegistered() const override;
-    [[nodiscard]] QString getOwnUsername() const override;
-    [[nodiscard]] bool isUserBuddy(const QString &userName) const override;
-    [[nodiscard]] bool isUserIgnored(const QString &userName) const override;
-    [[nodiscard]] const ServerInfo_User *getOnlineUser(const QString &userName) const override;
+    bool isOwnUserRegistered() const override;
+    QString getOwnUsername() const override;
+    bool isUserBuddy(const QString &userName) const override;
+    bool isUserIgnored(const QString &userName) const override;
+    const ServerInfo_User *getOnlineUser(const QString &userName) const override;
 
 public slots:
     void handleConnect();
diff --git a/cockatrice/src/server/user/user_list_proxy.h b/cockatrice/src/server/user/user_list_proxy.h
new file mode 100644
index 000000000..7fa92770c
--- /dev/null
+++ b/cockatrice/src/server/user/user_list_proxy.h
@@ -0,0 +1,21 @@
+#ifndef COCKATRICE_USERLISTPROXY_H
+#define COCKATRICE_USERLISTPROXY_H
+
+class QString;
+class ServerInfo_User;
+
+/**
+ * Responsible for providing a bare-bones minimal interface into userlist information,
+ * including your current connection to the server as well as buddy/ignore/alluser lists.
+ */
+class UserListProxy
+{
+public:
+    virtual bool isOwnUserRegistered() const = 0;
+    virtual QString getOwnUsername() const = 0;
+    virtual bool isUserBuddy(const QString &userName) const = 0;
+    virtual bool isUserIgnored(const QString &userName) const = 0;
+    virtual const ServerInfo_User *getOnlineUser(const QString &userName) const = 0; // Can return nullptr
+};
+
+#endif // COCKATRICE_USERLISTPROXY_H
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp b/cockatrice/src/server/user/user_list_widget.cpp
similarity index 97%
rename from cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
rename to cockatrice/src/server/user/user_list_widget.cpp
index 852743479..d4dad5919 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
+++ b/cockatrice/src/server/user/user_list_widget.cpp
@@ -1,10 +1,18 @@
 #include "user_list_widget.h"
 
 #include "../../interface/pixel_map_generator.h"
-#include "../../interface/widgets/tabs/tab_account.h"
-#include "../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../tabs/tab_account.h"
+#include "../../tabs/tab_supervisor.h"
+#include "../abstract_client.h"
 #include "../game_selector.h"
+#include "../pending_command.h"
+#include "pb/moderator_commands.pb.h"
+#include "pb/response_get_games_of_user.pb.h"
+#include "pb/response_get_user_info.pb.h"
+#include "pb/session_commands.pb.h"
+#include "trice_limits.h"
 #include "user_context_menu.h"
+#include "user_list_manager.h"
 
 #include <QApplication>
 #include <QCheckBox>
@@ -13,16 +21,15 @@
 #include <QInputDialog>
 #include <QLabel>
 #include <QLineEdit>
+#include <QMenu>
 #include <QMessageBox>
 #include <QMouseEvent>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QSpinBox>
+#include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
-#include <libcockatrice/utility/trice_limits.h>
 
 BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.h b/cockatrice/src/server/user/user_list_widget.h
similarity index 81%
rename from cockatrice/src/interface/widgets/server/user/user_list_widget.h
rename to cockatrice/src/server/user/user_list_widget.h
index 036837673..561d91e77 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.h
+++ b/cockatrice/src/server/user/user_list_widget.h
@@ -1,20 +1,15 @@
-/**
- * @file user_list_widget.h
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef USERLIST_H
 #define USERLIST_H
 
+#include "pb/moderator_commands.pb.h"
+#include "user_level.h"
+
 #include <QComboBox>
 #include <QDialog>
 #include <QGroupBox>
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 #include <QTreeWidgetItem>
-#include <libcockatrice/network/server/remote/user_level.h>
-#include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 
 class QTreeWidget;
 class ServerInfo_User;
@@ -45,13 +40,13 @@ private slots:
 
 public:
     explicit BanDialog(const ServerInfo_User &info, QWidget *parent = nullptr);
-    [[nodiscard]] QString getBanName() const;
-    [[nodiscard]] QString getBanIP() const;
-    [[nodiscard]] QString getBanId() const;
-    [[nodiscard]] int getMinutes() const;
-    [[nodiscard]] QString getReason() const;
-    [[nodiscard]] QString getVisibleReason() const;
-    [[nodiscard]] int getDeleteMessages() const;
+    QString getBanName() const;
+    QString getBanIP() const;
+    QString getBanId() const;
+    int getMinutes() const;
+    QString getReason() const;
+    QString getVisibleReason() const;
+    int getDeleteMessages() const;
 };
 
 class WarningDialog : public QDialog
@@ -68,10 +63,10 @@ private slots:
 
 public:
     WarningDialog(const QString userName, const QString clientID, QWidget *parent = nullptr);
-    [[nodiscard]] QString getName() const;
-    [[nodiscard]] QString getWarnID() const;
-    [[nodiscard]] QString getReason() const;
-    [[nodiscard]] int getDeleteMessages() const;
+    QString getName() const;
+    QString getWarnID() const;
+    QString getReason() const;
+    int getDeleteMessages() const;
     void addWarningOption(const QString warning);
 };
 
@@ -85,11 +80,11 @@ private:
 
 public:
     explicit AdminNotesDialog(const QString &_userName, const QString &_notes, QWidget *_parent = nullptr);
-    [[nodiscard]] QString getName() const
+    QString getName() const
     {
         return userName;
     }
-    [[nodiscard]] QString getNotes() const;
+    QString getNotes() const;
 };
 
 class UserListItemDelegate : public QStyledItemDelegate
@@ -159,7 +154,7 @@ public:
     void processUserInfo(const ServerInfo_User &user, bool online);
     bool deleteUser(const QString &userName);
     void setUserOnline(const QString &userName, bool online);
-    [[nodiscard]] const QMap<QString, UserListTWI *> &getUsers() const
+    const QMap<QString, UserListTWI *> &getUsers() const
     {
         return users;
     }
diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/settings/cache_settings.cpp
similarity index 75%
rename from cockatrice/src/client/settings/cache_settings.cpp
rename to cockatrice/src/settings/cache_settings.cpp
index a66897b4a..942881958 100644
--- a/cockatrice/src/client/settings/cache_settings.cpp
+++ b/cockatrice/src/settings/cache_settings.cpp
@@ -1,8 +1,8 @@
 #include "cache_settings.h"
 
-#include "../network/update/client/release_channel.h"
+#include "../client/network/release_channel.h"
 #include "card_counter_settings.h"
-#include "version_string.h"
+#include "card_override_settings.h"
 
 #include <QAbstractListModel>
 #include <QApplication>
@@ -12,15 +12,9 @@
 #include <QGlobalStatic>
 #include <QSettings>
 #include <QStandardPaths>
-#include <libcockatrice/settings/card_override_settings.h>
 #include <utility>
 
-Q_GLOBAL_STATIC(SettingsCache, settingsCache)
-
-SettingsCache &SettingsCache::instance()
-{
-    return *settingsCache; // returns a QT managed singleton reference
-}
+Q_GLOBAL_STATIC(SettingsCache, settingsCache);
 
 QString SettingsCache::getDataPath()
 {
@@ -67,9 +61,9 @@ void SettingsCache::translateLegacySettings()
     QStringList setsGroups = legacySetting.childGroups();
     for (int i = 0; i < setsGroups.size(); i++) {
         legacySetting.beginGroup(setsGroups.at(i));
-        cardDatabase()->setEnabled(setsGroups.at(i), legacySetting.value("enabled").toBool());
-        cardDatabase()->setIsKnown(setsGroups.at(i), legacySetting.value("isknown").toBool());
-        cardDatabase()->setSortKey(setsGroups.at(i), legacySetting.value("sortkey").toUInt());
+        cardDatabase().setEnabled(setsGroups.at(i), legacySetting.value("enabled").toBool());
+        cardDatabase().setIsKnown(setsGroups.at(i), legacySetting.value("isknown").toBool());
+        cardDatabase().setSortKey(setsGroups.at(i), legacySetting.value("sortkey").toUInt());
         legacySetting.endGroup();
     }
     QStringList setsKeys = legacySetting.allKeys();
@@ -199,13 +193,7 @@ SettingsCache::SettingsCache()
 
     mbDownloadSpoilers = settings->value("personal/downloadspoilers", false).toBool();
 
-    if (settings->contains("personal/startupUpdateCheck")) {
-        checkUpdatesOnStartup = settings->value("personal/startupUpdateCheck", true).toBool();
-    } else if (QString(VERSION_STRING).contains("custom", Qt::CaseInsensitive)) {
-        checkUpdatesOnStartup = false; // do not run auto updater on custom version
-    } else {
-        checkUpdatesOnStartup = true; // default to run auto updater
-    }
+    checkUpdatesOnStartup = settings->value("personal/startupUpdateCheck", true).toBool();
     startupCardUpdateCheckPromptForUpdate =
         settings->value("personal/startupCardUpdateCheckPromptForUpdate", true).toBool();
     startupCardUpdateCheckAlwaysUpdate = settings->value("personal/startupCardUpdateCheckAlwaysUpdate", false).toBool();
@@ -213,15 +201,7 @@ SettingsCache::SettingsCache()
     lastCardUpdateCheck = settings->value("personal/lastCardUpdateCheck", QDateTime::currentDateTime().date()).toDate();
     notifyAboutUpdates = settings->value("personal/updatenotification", true).toBool();
     notifyAboutNewVersion = settings->value("personal/newversionnotification", true).toBool();
-
-    if (settings->contains("personal/updatereleasechannel")) {
-        updateReleaseChannel = settings->value("personal/updatereleasechannel").toInt();
-    } else if (QString(VERSION_STRING).contains("beta", Qt::CaseInsensitive)) {
-        // default to beta if this is a beta release
-        updateReleaseChannel = 1;
-    } else {
-        updateReleaseChannel = 0; // stable
-    }
+    updateReleaseChannel = settings->value("personal/updatereleasechannel", 0).toInt();
 
     lang = settings->value("personal/lang").toString();
     keepalive = settings->value("personal/keepalive", 3).toInt();
@@ -239,7 +219,6 @@ SettingsCache::SettingsCache()
 
     homeTabBackgroundSource = settings->value("home/background", "themed").toString();
     homeTabBackgroundShuffleFrequency = settings->value("home/background/shuffleTimer", 0).toInt();
-    homeTabDisplayCardName = settings->value("home/background/displayCardName", true).toBool();
 
     tabVisualDeckStorageOpen = settings->value("tabs/visualDeckStorage", true).toBool();
     tabServerOpen = settings->value("tabs/server", true).toBool();
@@ -268,15 +247,18 @@ SettingsCache::SettingsCache()
     picDownload = settings->value("personal/picturedownload", true).toBool();
     showStatusBar = settings->value("personal/showStatusBar", false).toBool();
 
+    mainWindowGeometry = settings->value("interface/main_window_geometry").toByteArray();
+    tokenDialogGeometry = settings->value("interface/token_dialog_geometry").toByteArray();
+    setsDialogGeometry = settings->value("interface/sets_dialog_geometry").toByteArray();
     notificationsEnabled = settings->value("interface/notificationsenabled", true).toBool();
     spectatorNotificationsEnabled = settings->value("interface/specnotificationsenabled", false).toBool();
     buddyConnectNotificationsEnabled = settings->value("interface/buddyconnectnotificationsenabled", true).toBool();
     doubleClickToPlay = settings->value("interface/doubleclicktoplay", true).toBool();
     clickPlaysAllSelected = settings->value("interface/clickPlaysAllSelected", true).toBool();
     playToStack = settings->value("interface/playtostack", true).toBool();
-    doNotDeleteArrowsInSubPhases = settings->value("interface/doNotDeleteArrowsInSubPhases", true).toBool();
     startingHandSize = settings->value("interface/startinghandsize", 7).toInt();
     annotateTokens = settings->value("interface/annotatetokens", false).toBool();
+    tabGameSplitterSizes = settings->value("interface/tabgame_splittersizes").toByteArray();
     knownMissingFeatures = settings->value("interface/knownmissingfeatures", "").toString();
     useTearOffMenus = settings->value("interface/usetearoffmenus", true).toBool();
     cardViewInitialRowsMax = settings->value("interface/cardViewInitialRowsMax", 14).toInt();
@@ -284,11 +266,7 @@ SettingsCache::SettingsCache()
     closeEmptyCardView = settings->value("interface/closeEmptyCardView", true).toBool();
     focusCardViewSearchBar = settings->value("interface/focusCardViewSearchBar", true).toBool();
 
-    showDragSelectionCount = settings->value("interface/showlassoselectioncount", true).toBool();
-    showTotalSelectionCount = settings->value("interface/showpersistentselectioncount", true).toBool();
-
     showShortcuts = settings->value("menu/showshortcuts", true).toBool();
-    showGameSelectorFilterToolbar = settings->value("menu/showgameselectorfiltertoolbar", true).toBool();
     displayCardNames = settings->value("cards/displaycardnames", true).toBool();
     roundCardCorners = settings->value("cards/roundcardcorners", true).toBool();
     overrideAllCardArtWithPersonalPreference =
@@ -309,7 +287,6 @@ SettingsCache::SettingsCache()
     visualDeckStorageDefaultTagsList =
         settings->value("interface/visualdeckstoragedefaulttagslist", defaultTags).toStringList();
     visualDeckStorageSearchFolderNames = settings->value("interface/visualdeckstoragesearchfoldernames", true).toBool();
-    visualDeckStorageShowColorIdentity = settings->value("interface/visualdeckstorageshowcoloridentity", true).toBool();
     visualDeckStorageShowBannerCardComboBox =
         settings->value("interface/visualdeckstorageshowbannercardcombobox", true).toBool();
     visualDeckStorageShowTagsOnDeckPreviews =
@@ -327,15 +304,10 @@ SettingsCache::SettingsCache()
         settings->value("interface/visualdeckstorageselectionanimation", true).toBool();
     defaultDeckEditorType = settings->value("interface/defaultDeckEditorType", 1).toInt();
     visualDatabaseDisplayFilterToMostRecentSetsEnabled =
-        settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsenabled", false).toBool();
+        settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsenabled", true).toBool();
     visualDatabaseDisplayFilterToMostRecentSetsAmount =
         settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsamount", 10).toInt();
     visualDeckEditorSampleHandSize = settings->value("interface/visualdeckeditorsamplehandsize", 7).toInt();
-    visualDeckEditorCardSize = settings->value("interface/visualdeckeditorcardsize", 100).toInt();
-    visualDatabaseDisplayCardSize = settings->value("interface/visualdatabasedisplaycardsize", 100).toInt();
-    edhrecCardSize = settings->value("interface/edhreccardsize", 100).toInt();
-    archidektPreviewSize = settings->value("interface/archidektpreviewsize", 100).toInt();
-
     horizontalHand = settings->value("hand/horizontal", true).toBool();
     invertVerticalCoordinate = settings->value("table/invert_vertical", false).toBool();
     minPlayersForMultiColumnLayout = settings->value("interface/min_players_multicolumn", 4).toInt();
@@ -388,13 +360,6 @@ SettingsCache::SettingsCache()
     defaultStartingLifeTotal = settings->value("game/defaultstartinglifetotal", 20).toInt();
     shareDecklistsOnLoad = settings->value("game/sharedecklistsonload", false).toBool();
     rememberGameSettings = settings->value("game/remembergamesettings", true).toBool();
-
-    // Local game settings use "localgameoptions/" prefix to keep them separate
-    // from server game settings which use "game/" prefix
-    localGameRememberSettings = settings->value("localgameoptions/remembersettings", false).toBool();
-    localGameMaxPlayers = settings->value("localgameoptions/maxplayers", 1).toInt();
-    localGameStartingLifeTotal = settings->value("localgameoptions/startinglifetotal", 20).toInt();
-
     clientID = settings->value("personal/clientid", CLIENT_INFO_NOT_SET).toString();
     clientVersion = settings->value("personal/clientversion", CLIENT_INFO_NOT_SET).toString();
 }
@@ -602,13 +567,6 @@ void SettingsCache::setHomeTabBackgroundShuffleFrequency(int _frequency)
     emit homeTabBackgroundShuffleFrequencyChanged();
 }
 
-void SettingsCache::setHomeTabDisplayCardName(QT_STATE_CHANGED_T _displayCardName)
-{
-    homeTabDisplayCardName = static_cast<bool>(_displayCardName);
-    settings->setValue("home/background/displayCardName", homeTabDisplayCardName);
-    emit homeTabDisplayCardNameChanged();
-}
-
 void SettingsCache::setTabVisualDeckStorageOpen(bool value)
 {
     tabVisualDeckStorageOpen = value;
@@ -701,12 +659,6 @@ void SettingsCache::setPlayToStack(QT_STATE_CHANGED_T _playToStack)
     settings->setValue("interface/playtostack", playToStack);
 }
 
-void SettingsCache::setDoNotDeleteArrowsInSubPhases(QT_STATE_CHANGED_T _doNotDeleteArrowsInSubPhases)
-{
-    doNotDeleteArrowsInSubPhases = static_cast<bool>(_doNotDeleteArrowsInSubPhases);
-    settings->setValue("interface/doNotDeleteArrowsInSubPhases", doNotDeleteArrowsInSubPhases);
-}
-
 void SettingsCache::setStartingHandSize(int _startingHandSize)
 {
     startingHandSize = _startingHandSize;
@@ -719,19 +671,18 @@ void SettingsCache::setAnnotateTokens(QT_STATE_CHANGED_T _annotateTokens)
     settings->setValue("interface/annotatetokens", annotateTokens);
 }
 
+void SettingsCache::setTabGameSplitterSizes(const QByteArray &_tabGameSplitterSizes)
+{
+    tabGameSplitterSizes = _tabGameSplitterSizes;
+    settings->setValue("interface/tabgame_splittersizes", tabGameSplitterSizes);
+}
+
 void SettingsCache::setShowShortcuts(QT_STATE_CHANGED_T _showShortcuts)
 {
     showShortcuts = static_cast<bool>(_showShortcuts);
     settings->setValue("menu/showshortcuts", showShortcuts);
 }
 
-void SettingsCache::setShowGameSelectorFilterToolbar(QT_STATE_CHANGED_T _showGameSelectorFilterToolbar)
-{
-    showGameSelectorFilterToolbar = static_cast<bool>(_showGameSelectorFilterToolbar);
-    settings->setValue("menu/showgameselectorfiltertoolbar", showGameSelectorFilterToolbar);
-    emit showGameSelectorFilterToolbarChanged(showGameSelectorFilterToolbar);
-}
-
 void SettingsCache::setDisplayCardNames(QT_STATE_CHANGED_T _displayCardNames)
 {
     displayCardNames = static_cast<bool>(_displayCardNames);
@@ -830,13 +781,6 @@ void SettingsCache::setVisualDeckStorageSearchFolderNames(QT_STATE_CHANGED_T val
     settings->setValue("interface/visualdeckstoragesearchfoldernames", visualDeckStorageSearchFolderNames);
 }
 
-void SettingsCache::setVisualDeckStorageShowColorIdentity(QT_STATE_CHANGED_T value)
-{
-    visualDeckStorageShowColorIdentity = value;
-    settings->setValue("interface/visualdeckstorageshowcoloridentity", visualDeckStorageShowColorIdentity);
-    emit visualDeckStorageShowColorIdentityChanged(visualDeckStorageShowColorIdentity);
-}
-
 void SettingsCache::setVisualDeckStorageShowBannerCardComboBox(QT_STATE_CHANGED_T _showBannerCardComboBox)
 {
     visualDeckStorageShowBannerCardComboBox = _showBannerCardComboBox;
@@ -907,34 +851,6 @@ void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T va
     emit visualDeckStorageSelectionAnimationChanged(visualDeckStorageSelectionAnimation);
 }
 
-void SettingsCache::setVisualDeckEditorCardSize(int _visualDeckEditorCardSize)
-{
-    visualDeckEditorCardSize = _visualDeckEditorCardSize;
-    settings->setValue("interface/visualdeckeditorcardsize", visualDeckEditorCardSize);
-    emit visualDeckEditorCardSizeChanged();
-}
-
-void SettingsCache::setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize)
-{
-    visualDatabaseDisplayCardSize = _visualDatabaseDisplayCardSize;
-    settings->setValue("interface/visualdatabasedisplaycardsize", visualDatabaseDisplayCardSize);
-    emit visualDatabaseDisplayCardSizeChanged();
-}
-
-void SettingsCache::setEDHRecCardSize(int _edhrecCardSize)
-{
-    edhrecCardSize = _edhrecCardSize;
-    settings->setValue("interface/edhreccardsize", edhrecCardSize);
-    emit edhRecCardSizeChanged();
-}
-
-void SettingsCache::setArchidektPreviewCardSize(int _archidektPreviewCardSize)
-{
-    archidektPreviewSize = _archidektPreviewCardSize;
-    settings->setValue("interface/archidektpreviewsize", archidektPreviewSize);
-    emit archidektPreviewSizeChanged();
-}
-
 void SettingsCache::setDefaultDeckEditorType(int value)
 {
     defaultDeckEditorType = value;
@@ -1090,6 +1006,24 @@ void SettingsCache::setIgnoreUnregisteredUserMessages(QT_STATE_CHANGED_T _ignore
     settings->setValue("chat/ignore_unregistered_messages", ignoreUnregisteredUserMessages);
 }
 
+void SettingsCache::setMainWindowGeometry(const QByteArray &_mainWindowGeometry)
+{
+    mainWindowGeometry = _mainWindowGeometry;
+    settings->setValue("interface/main_window_geometry", mainWindowGeometry);
+}
+
+void SettingsCache::setTokenDialogGeometry(const QByteArray &_tokenDialogGeometry)
+{
+    tokenDialogGeometry = _tokenDialogGeometry;
+    settings->setValue("interface/token_dialog_geometry", tokenDialogGeometry);
+}
+
+void SettingsCache::setSetsDialogGeometry(const QByteArray &_setsDialogGeometry)
+{
+    setsDialogGeometry = _setsDialogGeometry;
+    settings->setValue("interface/sets_dialog_geometry", setsDialogGeometry);
+}
+
 void SettingsCache::setPixmapCacheSize(const int _pixmapCacheSize)
 {
     pixmapCacheSize = _pixmapCacheSize;
@@ -1125,21 +1059,257 @@ void SettingsCache::setClientVersion(const QString &_clientVersion)
 
 QStringList SettingsCache::getCountries() const
 {
-    static const QStringList countries = {
-        "ad", "ae", "af", "ag", "ai", "al", "am", "ao", "aq", "ar", "as", "at", "au", "aw", "ax", "az", "ba", "bb",
-        "bd", "be", "bf", "bg", "bh", "bi", "bj", "bl", "bm", "bn", "bo", "bq", "br", "bs", "bt", "bv", "bw", "by",
-        "bz", "ca", "cc", "cd", "cf", "cg", "ch", "ci", "ck", "cl", "cm", "cn", "co", "cr", "cu", "cv", "cw", "cx",
-        "cy", "cz", "de", "dj", "dk", "dm", "do", "dz", "ec", "ee", "eg", "eh", "er", "es", "et", "eu", "fi", "fj",
-        "fk", "fm", "fo", "fr", "ga", "gb", "gd", "ge", "gf", "gg", "gh", "gi", "gl", "gm", "gn", "gp", "gq", "gr",
-        "gs", "gt", "gu", "gw", "gy", "hk", "hm", "hn", "hr", "ht", "hu", "id", "ie", "il", "im", "in", "io", "iq",
-        "ir", "is", "it", "je", "jm", "jo", "jp", "ke", "kg", "kh", "ki", "km", "kn", "kp", "kr", "kw", "ky", "kz",
-        "la", "lb", "lc", "li", "lk", "lr", "ls", "lt", "lu", "lv", "ly", "ma", "mc", "md", "me", "mf", "mg", "mh",
-        "mk", "ml", "mm", "mn", "mo", "mp", "mq", "mr", "ms", "mt", "mu", "mv", "mw", "mx", "my", "mz", "na", "nc",
-        "ne", "nf", "ng", "ni", "nl", "no", "np", "nr", "nu", "nz", "om", "pa", "pe", "pf", "pg", "ph", "pk", "pl",
-        "pm", "pn", "pr", "ps", "pt", "pw", "py", "qa", "re", "ro", "rs", "ru", "rw", "sa", "sb", "sc", "sd", "se",
-        "sg", "sh", "si", "sj", "sk", "sl", "sm", "sn", "so", "sr", "ss", "st", "sv", "sx", "sy", "sz", "tc", "td",
-        "tf", "tg", "th", "tj", "tk", "tl", "tm", "tn", "to", "tr", "tt", "tv", "tw", "tz", "ua", "ug", "um", "us",
-        "uy", "uz", "va", "vc", "ve", "vg", "vi", "vn", "vu", "wf", "ws", "xk", "ye", "yt", "za", "zm", "zw"};
+    static QStringList countries = QStringList() << "ad"
+                                                 << "ae"
+                                                 << "af"
+                                                 << "ag"
+                                                 << "ai"
+                                                 << "al"
+                                                 << "am"
+                                                 << "ao"
+                                                 << "aq"
+                                                 << "ar"
+                                                 << "as"
+                                                 << "at"
+                                                 << "au"
+                                                 << "aw"
+                                                 << "ax"
+                                                 << "az"
+                                                 << "ba"
+                                                 << "bb"
+                                                 << "bd"
+                                                 << "be"
+                                                 << "bf"
+                                                 << "bg"
+                                                 << "bh"
+                                                 << "bi"
+                                                 << "bj"
+                                                 << "bl"
+                                                 << "bm"
+                                                 << "bn"
+                                                 << "bo"
+                                                 << "bq"
+                                                 << "br"
+                                                 << "bs"
+                                                 << "bt"
+                                                 << "bv"
+                                                 << "bw"
+                                                 << "by"
+                                                 << "bz"
+                                                 << "ca"
+                                                 << "cc"
+                                                 << "cd"
+                                                 << "cf"
+                                                 << "cg"
+                                                 << "ch"
+                                                 << "ci"
+                                                 << "ck"
+                                                 << "cl"
+                                                 << "cm"
+                                                 << "cn"
+                                                 << "co"
+                                                 << "cr"
+                                                 << "cu"
+                                                 << "cv"
+                                                 << "cw"
+                                                 << "cx"
+                                                 << "cy"
+                                                 << "cz"
+                                                 << "de"
+                                                 << "dj"
+                                                 << "dk"
+                                                 << "dm"
+                                                 << "do"
+                                                 << "dz"
+                                                 << "ec"
+                                                 << "ee"
+                                                 << "eg"
+                                                 << "eh"
+                                                 << "er"
+                                                 << "es"
+                                                 << "et"
+                                                 << "eu"
+                                                 << "fi"
+                                                 << "fj"
+                                                 << "fk"
+                                                 << "fm"
+                                                 << "fo"
+                                                 << "fr"
+                                                 << "ga"
+                                                 << "gb"
+                                                 << "gd"
+                                                 << "ge"
+                                                 << "gf"
+                                                 << "gg"
+                                                 << "gh"
+                                                 << "gi"
+                                                 << "gl"
+                                                 << "gm"
+                                                 << "gn"
+                                                 << "gp"
+                                                 << "gq"
+                                                 << "gr"
+                                                 << "gs"
+                                                 << "gt"
+                                                 << "gu"
+                                                 << "gw"
+                                                 << "gy"
+                                                 << "hk"
+                                                 << "hm"
+                                                 << "hn"
+                                                 << "hr"
+                                                 << "ht"
+                                                 << "hu"
+                                                 << "id"
+                                                 << "ie"
+                                                 << "il"
+                                                 << "im"
+                                                 << "in"
+                                                 << "io"
+                                                 << "iq"
+                                                 << "ir"
+                                                 << "is"
+                                                 << "it"
+                                                 << "je"
+                                                 << "jm"
+                                                 << "jo"
+                                                 << "jp"
+                                                 << "ke"
+                                                 << "kg"
+                                                 << "kh"
+                                                 << "ki"
+                                                 << "km"
+                                                 << "kn"
+                                                 << "kp"
+                                                 << "kr"
+                                                 << "kw"
+                                                 << "ky"
+                                                 << "kz"
+                                                 << "la"
+                                                 << "lb"
+                                                 << "lc"
+                                                 << "li"
+                                                 << "lk"
+                                                 << "lr"
+                                                 << "ls"
+                                                 << "lt"
+                                                 << "lu"
+                                                 << "lv"
+                                                 << "ly"
+                                                 << "ma"
+                                                 << "mc"
+                                                 << "md"
+                                                 << "me"
+                                                 << "mf"
+                                                 << "mg"
+                                                 << "mh"
+                                                 << "mk"
+                                                 << "ml"
+                                                 << "mm"
+                                                 << "mn"
+                                                 << "mo"
+                                                 << "mp"
+                                                 << "mq"
+                                                 << "mr"
+                                                 << "ms"
+                                                 << "mt"
+                                                 << "mu"
+                                                 << "mv"
+                                                 << "mw"
+                                                 << "mx"
+                                                 << "my"
+                                                 << "mz"
+                                                 << "na"
+                                                 << "nc"
+                                                 << "ne"
+                                                 << "nf"
+                                                 << "ng"
+                                                 << "ni"
+                                                 << "nl"
+                                                 << "no"
+                                                 << "np"
+                                                 << "nr"
+                                                 << "nu"
+                                                 << "nz"
+                                                 << "om"
+                                                 << "pa"
+                                                 << "pe"
+                                                 << "pf"
+                                                 << "pg"
+                                                 << "ph"
+                                                 << "pk"
+                                                 << "pl"
+                                                 << "pm"
+                                                 << "pn"
+                                                 << "pr"
+                                                 << "ps"
+                                                 << "pt"
+                                                 << "pw"
+                                                 << "py"
+                                                 << "qa"
+                                                 << "re"
+                                                 << "ro"
+                                                 << "rs"
+                                                 << "ru"
+                                                 << "rw"
+                                                 << "sa"
+                                                 << "sb"
+                                                 << "sc"
+                                                 << "sd"
+                                                 << "se"
+                                                 << "sg"
+                                                 << "sh"
+                                                 << "si"
+                                                 << "sj"
+                                                 << "sk"
+                                                 << "sl"
+                                                 << "sm"
+                                                 << "sn"
+                                                 << "so"
+                                                 << "sr"
+                                                 << "ss"
+                                                 << "st"
+                                                 << "sv"
+                                                 << "sx"
+                                                 << "sy"
+                                                 << "sz"
+                                                 << "tc"
+                                                 << "td"
+                                                 << "tf"
+                                                 << "tg"
+                                                 << "th"
+                                                 << "tj"
+                                                 << "tk"
+                                                 << "tl"
+                                                 << "tm"
+                                                 << "tn"
+                                                 << "to"
+                                                 << "tr"
+                                                 << "tt"
+                                                 << "tv"
+                                                 << "tw"
+                                                 << "tz"
+                                                 << "ua"
+                                                 << "ug"
+                                                 << "um"
+                                                 << "us"
+                                                 << "uy"
+                                                 << "uz"
+                                                 << "va"
+                                                 << "vc"
+                                                 << "ve"
+                                                 << "vg"
+                                                 << "vi"
+                                                 << "vn"
+                                                 << "vu"
+                                                 << "wf"
+                                                 << "ws"
+                                                 << "xk"
+                                                 << "ye"
+                                                 << "yt"
+                                                 << "za"
+                                                 << "zm"
+                                                 << "zw";
 
     return countries;
 }
@@ -1252,24 +1422,6 @@ void SettingsCache::setRememberGameSettings(const bool _rememberGameSettings)
     settings->setValue("game/remembergamesettings", rememberGameSettings);
 }
 
-void SettingsCache::setLocalGameRememberSettings(bool value)
-{
-    localGameRememberSettings = value;
-    settings->setValue("localgameoptions/remembersettings", value);
-}
-
-void SettingsCache::setLocalGameMaxPlayers(int value)
-{
-    localGameMaxPlayers = value;
-    settings->setValue("localgameoptions/maxplayers", value);
-}
-
-void SettingsCache::setLocalGameStartingLifeTotal(int value)
-{
-    localGameStartingLifeTotal = value;
-    settings->setValue("localgameoptions/startinglifetotal", value);
-}
-
 void SettingsCache::setNotifyAboutUpdate(QT_STATE_CHANGED_T _notifyaboutupdate)
 {
     notifyAboutUpdates = static_cast<bool>(_notifyaboutupdate);
@@ -1311,18 +1463,6 @@ void SettingsCache::setRoundCardCorners(bool _roundCardCorners)
     emit roundCardCornersChanged(roundCardCorners);
 }
 
-void SettingsCache::setShowDragSelectionCount(QT_STATE_CHANGED_T _showDragSelectionCount)
-{
-    showDragSelectionCount = static_cast<bool>(_showDragSelectionCount);
-    settings->setValue("interface/showlassoselectioncount", showDragSelectionCount);
-}
-
-void SettingsCache::setShowTotalSelectionCount(QT_STATE_CHANGED_T _showTotalSelectionCount)
-{
-    showTotalSelectionCount = static_cast<bool>(_showTotalSelectionCount);
-    settings->setValue("interface/showpersistentselectioncount", showTotalSelectionCount);
-}
-
 void SettingsCache::loadPaths()
 {
     QString dataPath = getDataPath();
@@ -1360,6 +1500,11 @@ void SettingsCache::resetPaths()
     }
 }
 
+SettingsCache &SettingsCache::instance()
+{
+    return *settingsCache;
+}
+
 CardCounterSettings &SettingsCache::cardCounters() const
 {
     return *cardCounterSettings;
diff --git a/cockatrice/src/client/settings/cache_settings.h b/cockatrice/src/settings/cache_settings.h
similarity index 67%
rename from cockatrice/src/client/settings/cache_settings.h
rename to cockatrice/src/settings/cache_settings.h
index ece61487f..c73149d3a 100644
--- a/cockatrice/src/client/settings/cache_settings.h
+++ b/cockatrice/src/settings/cache_settings.h
@@ -1,30 +1,23 @@
-/**
- * @file cache_settings.h
- * @ingroup Settings
- * @brief TODO: Document this.
- */
-
 #ifndef SETTINGSCACHE_H
 #define SETTINGSCACHE_H
 
+#include "../utility/macros.h"
+#include "card_database_settings.h"
+#include "card_override_settings.h"
+#include "debug_settings.h"
+#include "download_settings.h"
+#include "game_filters_settings.h"
+#include "layouts_settings.h"
+#include "message_settings.h"
+#include "recents_settings.h"
+#include "servers_settings.h"
 #include "shortcuts_settings.h"
 
 #include <QDate>
 #include <QLoggingCategory>
+#include <QObject>
 #include <QSize>
 #include <QStringList>
-#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
-#include <libcockatrice/interfaces/interface_network_settings_provider.h>
-#include <libcockatrice/settings/card_database_settings.h>
-#include <libcockatrice/settings/card_override_settings.h>
-#include <libcockatrice/settings/debug_settings.h>
-#include <libcockatrice/settings/download_settings.h>
-#include <libcockatrice/settings/game_filters_settings.h>
-#include <libcockatrice/settings/layouts_settings.h>
-#include <libcockatrice/settings/message_settings.h>
-#include <libcockatrice/settings/recents_settings.h>
-#include <libcockatrice/settings/servers_settings.h>
-#include <libcockatrice/utility/macros.h>
 
 inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache");
 
@@ -133,20 +126,19 @@ inline QStringList defaultTags = {
 class QSettings;
 class CardCounterSettings;
 
-class SettingsCache : public ICardDatabasePathProvider, public INetworkSettingsProvider
+class SettingsCache : public QObject
 {
     Q_OBJECT
 
 signals:
     void langChanged();
     void picsPathChanged();
+    void cardDatabasePathChanged();
     void themeChanged();
     void homeTabBackgroundSourceChanged();
     void homeTabBackgroundShuffleFrequencyChanged();
-    void homeTabDisplayCardNameChanged();
     void picDownloadChanged();
     void showStatusBarChanged(bool state);
-    void showGameSelectorFilterToolbarChanged(bool state);
     void displayCardNamesChanged();
     void overrideAllCardArtWithPersonalPreferenceChanged(bool _overrideAllCardArtWithPersonalPreference);
     void bumpSetsWithCardsInDeckToTopChanged();
@@ -158,7 +150,6 @@ signals:
     void deckEditorTagsWidgetVisibleChanged(bool _visible);
     void visualDeckStorageShowTagFilterChanged(bool _visible);
     void visualDeckStorageDefaultTagsListChanged();
-    void visualDeckStorageShowColorIdentityChanged(bool _visible);
     void visualDeckStorageShowBannerCardComboBoxChanged(bool _visible);
     void visualDeckStorageShowTagsOnDeckPreviewsChanged(bool _visible);
     void visualDeckStorageCardSizeChanged();
@@ -169,10 +160,6 @@ signals:
     void visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged(bool enabled);
     void visualDatabaseDisplayFilterToMostRecentSetsAmountChanged(int amount);
     void visualDeckEditorSampleHandSizeAmountChanged(int amount);
-    void visualDeckEditorCardSizeChanged();
-    void visualDatabaseDisplayCardSizeChanged();
-    void edhRecCardSizeChanged();
-    void archidektPreviewSizeChanged();
     void horizontalHandChanged();
     void handJustificationChanged();
     void invertVerticalCoordinateChanged();
@@ -205,6 +192,9 @@ private:
     DebugSettings *debugSettings;
     CardCounterSettings *cardCounterSettings;
 
+    QByteArray mainWindowGeometry;
+    QByteArray tokenDialogGeometry;
+    QByteArray setsDialogGeometry;
     QString lang;
     QString deckPath, filtersPath, replaysPath, picsPath, redirectCachePath, customPicsPath, cardDatabasePath,
         customCardDatabasePath, themesPath, spoilerDatabasePath, tokenDatabasePath, themeName, homeTabBackgroundSource;
@@ -221,7 +211,6 @@ private:
     bool showTipsOnStartup;
     QList<int> seenTips;
     int homeTabBackgroundShuffleFrequency;
-    bool homeTabDisplayCardName;
     bool mbDownloadSpoilers;
     int updateReleaseChannel;
     int maxFontSize;
@@ -232,11 +221,10 @@ private:
     bool doubleClickToPlay;
     bool clickPlaysAllSelected;
     bool playToStack;
-    bool doNotDeleteArrowsInSubPhases;
     int startingHandSize;
     bool annotateTokens;
+    QByteArray tabGameSplitterSizes;
     bool showShortcuts;
-    bool showGameSelectorFilterToolbar;
     bool displayCardNames;
     bool overrideAllCardArtWithPersonalPreference;
     bool bumpSetsWithCardsInDeckToTop;
@@ -248,17 +236,12 @@ private:
     bool deckEditorTagsWidgetVisible;
     int visualDeckStorageSortingOrder;
     bool visualDeckStorageShowFolders;
-    bool visualDeckStorageShowColorIdentity;
     bool visualDeckStorageShowBannerCardComboBox;
     bool visualDeckStorageShowTagsOnDeckPreviews;
     bool visualDeckStorageShowTagFilter;
     QStringList visualDeckStorageDefaultTagsList;
     bool visualDeckStorageSearchFolderNames;
     int visualDeckStorageCardSize;
-    int visualDeckEditorCardSize;
-    int visualDatabaseDisplayCardSize;
-    int edhrecCardSize;
-    int archidektPreviewSize;
     bool visualDeckStorageDrawUnusedColorIdentities;
     int visualDeckStorageUnusedColorIdentitiesOpacity;
     int visualDeckStorageTooltipType;
@@ -326,158 +309,150 @@ private:
     int keepalive;
     int timeout;
     void translateLegacySettings();
-    [[nodiscard]] QString getSafeConfigPath(QString configEntry, QString defaultPath) const;
-    [[nodiscard]] QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const;
+    QString getSafeConfigPath(QString configEntry, QString defaultPath) const;
+    QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const;
     void loadPaths();
     bool rememberGameSettings;
-
-    // Local game settings (separate from server game settings in game/*)
-    bool localGameRememberSettings;
-    int localGameMaxPlayers;
-    int localGameStartingLifeTotal;
-
     QList<ReleaseChannel *> releaseChannels;
     bool isPortableBuild;
     bool roundCardCorners;
     bool showStatusBar;
-    bool showDragSelectionCount;
-    bool showTotalSelectionCount;
 
 public:
     SettingsCache();
     QString getDataPath();
     QString getSettingsPath();
-    [[nodiscard]] QString getCachePath() const;
-    [[nodiscard]] QString getNetworkCachePath() const;
-    [[nodiscard]] QString getLang() const
+    QString getCachePath() const;
+    QString getNetworkCachePath() const;
+    const QByteArray &getMainWindowGeometry() const
+    {
+        return mainWindowGeometry;
+    }
+    const QByteArray &getTokenDialogGeometry() const
+    {
+        return tokenDialogGeometry;
+    }
+    const QByteArray &getSetsDialogGeometry() const
+    {
+        return setsDialogGeometry;
+    }
+    QString getLang() const
     {
         return lang;
     }
-    [[nodiscard]] QString getDeckPath() const
+    QString getDeckPath() const
     {
         return deckPath;
     }
-    [[nodiscard]] QString getFiltersPath() const
+    QString getFiltersPath() const
     {
         return filtersPath;
     }
-    [[nodiscard]] QString getReplaysPath() const
+    QString getReplaysPath() const
     {
         return replaysPath;
     }
-    [[nodiscard]] QString getThemesPath() const
+    QString getThemesPath() const
     {
         return themesPath;
     }
-    [[nodiscard]] QString getPicsPath() const
+    QString getPicsPath() const
     {
         return picsPath;
     }
-    [[nodiscard]] QString getRedirectCachePath() const
+    QString getRedirectCachePath() const
     {
         return redirectCachePath;
     }
-    [[nodiscard]] QString getCustomPicsPath() const
+    QString getCustomPicsPath() const
     {
         return customPicsPath;
     }
-    [[nodiscard]] QString getCustomCardDatabasePath() const override
+    QString getCustomCardDatabasePath() const
     {
         return customCardDatabasePath;
     }
-    [[nodiscard]] QString getCardDatabasePath() const override
+    QString getCardDatabasePath() const
     {
         return cardDatabasePath;
     }
-    [[nodiscard]] QString getSpoilerCardDatabasePath() const override
+    QString getSpoilerCardDatabasePath() const
     {
         return spoilerDatabasePath;
     }
-    [[nodiscard]] QString getTokenDatabasePath() const override
+    QString getTokenDatabasePath() const
     {
         return tokenDatabasePath;
     }
-    [[nodiscard]] QString getThemeName() const
+    QString getThemeName() const
     {
         return themeName;
     }
-    [[nodiscard]] QString getHomeTabBackgroundSource() const
+    QString getHomeTabBackgroundSource() const
     {
         return homeTabBackgroundSource;
     }
-    [[nodiscard]] int getHomeTabBackgroundShuffleFrequency() const
+    int getHomeTabBackgroundShuffleFrequency() const
     {
         return homeTabBackgroundShuffleFrequency;
     }
-    [[nodiscard]] bool getHomeTabDisplayCardName() const
-    {
-        return homeTabDisplayCardName;
-    }
-    [[nodiscard]] bool getTabVisualDeckStorageOpen() const
+    bool getTabVisualDeckStorageOpen() const
     {
         return tabVisualDeckStorageOpen;
     }
-    [[nodiscard]] bool getTabServerOpen() const
+    bool getTabServerOpen() const
     {
         return tabServerOpen;
     }
-    [[nodiscard]] bool getTabAccountOpen() const
+    bool getTabAccountOpen() const
     {
         return tabAccountOpen;
     }
-    [[nodiscard]] bool getTabDeckStorageOpen() const
+    bool getTabDeckStorageOpen() const
     {
         return tabDeckStorageOpen;
     }
-    [[nodiscard]] bool getTabReplaysOpen() const
+    bool getTabReplaysOpen() const
     {
         return tabReplaysOpen;
     }
-    [[nodiscard]] bool getTabAdminOpen() const
+    bool getTabAdminOpen() const
     {
         return tabAdminOpen;
     }
-    [[nodiscard]] bool getTabLogOpen() const
+    bool getTabLogOpen() const
     {
         return tabLogOpen;
     }
-    [[nodiscard]] QString getChatMentionColor() const
+    QString getChatMentionColor() const
     {
         return chatMentionColor;
     }
-    [[nodiscard]] QString getChatHighlightColor() const
+    QString getChatHighlightColor() const
     {
         return chatHighlightColor;
     }
-    [[nodiscard]] bool getPicDownload() const
+    bool getPicDownload() const
     {
         return picDownload;
     }
-    [[nodiscard]] bool getShowStatusBar() const
+    bool getShowStatusBar() const
     {
         return showStatusBar;
     }
-    [[nodiscard]] bool getShowDragSelectionCount() const
-    {
-        return showDragSelectionCount;
-    }
-    [[nodiscard]] bool getShowTotalSelectionCount() const
-    {
-        return showTotalSelectionCount;
-    }
-    [[nodiscard]] bool getNotificationsEnabled() const
+    bool getNotificationsEnabled() const
     {
         return notificationsEnabled;
     }
-    [[nodiscard]] bool getSpectatorNotificationsEnabled() const
+    bool getSpectatorNotificationsEnabled() const
     {
         return spectatorNotificationsEnabled;
     }
-    [[nodiscard]] bool getBuddyConnectNotificationsEnabled() const
+    bool getBuddyConnectNotificationsEnabled() const
     {
         return buddyConnectNotificationsEnabled;
     }
-    [[nodiscard]] bool getCheckUpdatesOnStartup() const
+    bool getCheckUpdatesOnStartup() const
     {
         return checkUpdatesOnStartup;
     }
@@ -489,267 +464,243 @@ public:
     {
         return startupCardUpdateCheckAlwaysUpdate;
     }
-    [[nodiscard]] int getCardUpdateCheckInterval() const
+    int getCardUpdateCheckInterval() const
     {
         return cardUpdateCheckInterval;
     }
-    [[nodiscard]] QDate getLastCardUpdateCheck() const
+    QDate getLastCardUpdateCheck() const
     {
         return lastCardUpdateCheck;
     }
-    [[nodiscard]] bool getCardUpdateCheckRequired() const
+    bool getCardUpdateCheckRequired() const
     {
         return getLastCardUpdateCheck().daysTo(QDateTime::currentDateTime().date()) >= getCardUpdateCheckInterval() &&
                getLastCardUpdateCheck() != QDateTime::currentDateTime().date();
     }
-    [[nodiscard]] bool getNotifyAboutUpdates() const override
+    bool getNotifyAboutUpdates() const
     {
         return notifyAboutUpdates;
     }
-    [[nodiscard]] bool getNotifyAboutNewVersion() const
+    bool getNotifyAboutNewVersion() const
     {
         return notifyAboutNewVersion;
     }
-    [[nodiscard]] bool getShowTipsOnStartup() const
+    bool getShowTipsOnStartup() const
     {
         return showTipsOnStartup;
     }
-    [[nodiscard]] QList<int> getSeenTips() const
+    QList<int> getSeenTips() const
     {
         return seenTips;
     }
-    [[nodiscard]] int getUpdateReleaseChannelIndex() const
+    int getUpdateReleaseChannelIndex() const
     {
         return updateReleaseChannel;
     }
-    [[nodiscard]] ReleaseChannel *getUpdateReleaseChannel() const
+    ReleaseChannel *getUpdateReleaseChannel() const
     {
         return releaseChannels.at(qMax(0, updateReleaseChannel));
     }
-    [[nodiscard]] QList<ReleaseChannel *> getUpdateReleaseChannels() const
+    QList<ReleaseChannel *> getUpdateReleaseChannels() const
     {
         return releaseChannels;
     }
 
-    [[nodiscard]] bool getDoubleClickToPlay() const
+    bool getDoubleClickToPlay() const
     {
         return doubleClickToPlay;
     }
-    [[nodiscard]] bool getClickPlaysAllSelected() const
+    bool getClickPlaysAllSelected() const
     {
         return clickPlaysAllSelected;
     }
-    [[nodiscard]] bool getPlayToStack() const
+    bool getPlayToStack() const
     {
         return playToStack;
     }
-    [[nodiscard]] bool getDoNotDeleteArrowsInSubPhases() const
-    {
-        return doNotDeleteArrowsInSubPhases;
-    }
-    [[nodiscard]] int getStartingHandSize() const
+    int getStartingHandSize() const
     {
         return startingHandSize;
     }
-    [[nodiscard]] bool getAnnotateTokens() const
+    bool getAnnotateTokens() const
     {
         return annotateTokens;
     }
-    [[nodiscard]] bool getShowShortcuts() const
+    QByteArray getTabGameSplitterSizes() const
+    {
+        return tabGameSplitterSizes;
+    }
+    bool getShowShortcuts() const
     {
         return showShortcuts;
     }
-    [[nodiscard]] bool getShowGameSelectorFilterToolbar() const
-    {
-        return showGameSelectorFilterToolbar;
-    }
-    [[nodiscard]] bool getDisplayCardNames() const
+    bool getDisplayCardNames() const
     {
         return displayCardNames;
     }
-    [[nodiscard]] bool getOverrideAllCardArtWithPersonalPreference() const
+    bool getOverrideAllCardArtWithPersonalPreference() const
     {
         return overrideAllCardArtWithPersonalPreference;
     }
-    [[nodiscard]] bool getBumpSetsWithCardsInDeckToTop() const
+    bool getBumpSetsWithCardsInDeckToTop() const
     {
         return bumpSetsWithCardsInDeckToTop;
     }
-    [[nodiscard]] int getPrintingSelectorSortOrder() const
+    int getPrintingSelectorSortOrder() const
     {
         return printingSelectorSortOrder;
     }
-    [[nodiscard]] int getPrintingSelectorCardSize() const
+    int getPrintingSelectorCardSize() const
     {
         return printingSelectorCardSize;
     }
-    [[nodiscard]] bool getIncludeRebalancedCards() const
+    bool getIncludeRebalancedCards() const
     {
         return includeRebalancedCards;
     }
-    [[nodiscard]] bool getPrintingSelectorNavigationButtonsVisible() const
+    bool getPrintingSelectorNavigationButtonsVisible() const
     {
         return printingSelectorNavigationButtonsVisible;
     }
-    [[nodiscard]] bool getDeckEditorBannerCardComboBoxVisible() const
+    bool getDeckEditorBannerCardComboBoxVisible() const
     {
         return deckEditorBannerCardComboBoxVisible;
     }
-    [[nodiscard]] bool getDeckEditorTagsWidgetVisible() const
+    bool getDeckEditorTagsWidgetVisible() const
     {
         return deckEditorTagsWidgetVisible;
     }
-    [[nodiscard]] int getVisualDeckStorageSortingOrder() const
+    int getVisualDeckStorageSortingOrder() const
     {
         return visualDeckStorageSortingOrder;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowFolders() const
+    bool getVisualDeckStorageShowFolders() const
     {
         return visualDeckStorageShowFolders;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowTagFilter() const
+    bool getVisualDeckStorageShowTagFilter() const
     {
         return visualDeckStorageShowTagFilter;
     }
-    [[nodiscard]] QStringList getVisualDeckStorageDefaultTagsList() const
+    QStringList getVisualDeckStorageDefaultTagsList() const
     {
         return visualDeckStorageDefaultTagsList;
     }
-    [[nodiscard]] bool getVisualDeckStorageSearchFolderNames() const
+    bool getVisualDeckStorageSearchFolderNames() const
     {
         return visualDeckStorageSearchFolderNames;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowColorIdentity() const
-    {
-        return visualDeckStorageShowColorIdentity;
-    }
-    [[nodiscard]] bool getVisualDeckStorageShowBannerCardComboBox() const
+    bool getVisualDeckStorageShowBannerCardComboBox() const
     {
         return visualDeckStorageShowBannerCardComboBox;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowTagsOnDeckPreviews() const
+    bool getVisualDeckStorageShowTagsOnDeckPreviews() const
     {
         return visualDeckStorageShowTagsOnDeckPreviews;
     }
-    [[nodiscard]] int getVisualDeckStorageCardSize() const
+    int getVisualDeckStorageCardSize() const
     {
         return visualDeckStorageCardSize;
     }
-    [[nodiscard]] bool getVisualDeckStorageDrawUnusedColorIdentities() const
+    bool getVisualDeckStorageDrawUnusedColorIdentities() const
     {
         return visualDeckStorageDrawUnusedColorIdentities;
     }
-    [[nodiscard]] int getVisualDeckStorageUnusedColorIdentitiesOpacity() const
+    int getVisualDeckStorageUnusedColorIdentitiesOpacity() const
     {
         return visualDeckStorageUnusedColorIdentitiesOpacity;
     }
-    [[nodiscard]] int getVisualDeckStorageTooltipType() const
+    int getVisualDeckStorageTooltipType() const
     {
         return visualDeckStorageTooltipType;
     }
-    [[nodiscard]] bool getVisualDeckStoragePromptForConversion() const
+    bool getVisualDeckStoragePromptForConversion() const
     {
         return visualDeckStoragePromptForConversion;
     }
-    [[nodiscard]] bool getVisualDeckStorageAlwaysConvert() const
+    bool getVisualDeckStorageAlwaysConvert() const
     {
         return visualDeckStorageAlwaysConvert;
     }
-    [[nodiscard]] bool getVisualDeckStorageInGame() const
+    bool getVisualDeckStorageInGame() const
     {
         return visualDeckStorageInGame;
     }
-    [[nodiscard]] bool getVisualDeckStorageSelectionAnimation() const
+    bool getVisualDeckStorageSelectionAnimation() const
     {
         return visualDeckStorageSelectionAnimation;
     }
-    [[nodiscard]] int getVisualDeckEditorCardSize() const
-    {
-        return visualDeckEditorCardSize;
-    }
-    [[nodiscard]] int getVisualDatabaseDisplayCardSize() const
-    {
-        return visualDatabaseDisplayCardSize;
-    }
-    [[nodiscard]] int getEDHRecCardSize() const
-    {
-        return edhrecCardSize;
-    }
-    [[nodiscard]] int getArchidektPreviewSize() const
-    {
-        return archidektPreviewSize;
-    }
-    [[nodiscard]] int getDefaultDeckEditorType() const
+    int getDefaultDeckEditorType() const
     {
         return defaultDeckEditorType;
     }
-    [[nodiscard]] bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
+    bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
     {
         return visualDatabaseDisplayFilterToMostRecentSetsEnabled;
     }
-    [[nodiscard]] int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const
+    int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const
     {
         return visualDatabaseDisplayFilterToMostRecentSetsAmount;
     }
-    [[nodiscard]] int getVisualDeckEditorSampleHandSize() const
+    int getVisualDeckEditorSampleHandSize() const
     {
         return visualDeckEditorSampleHandSize;
     }
-    [[nodiscard]] bool getHorizontalHand() const
+    bool getHorizontalHand() const
     {
         return horizontalHand;
     }
-    [[nodiscard]] bool getInvertVerticalCoordinate() const
+    bool getInvertVerticalCoordinate() const
     {
         return invertVerticalCoordinate;
     }
-    [[nodiscard]] int getMinPlayersForMultiColumnLayout() const
+    int getMinPlayersForMultiColumnLayout() const
     {
         return minPlayersForMultiColumnLayout;
     }
-    [[nodiscard]] bool getTapAnimation() const
+    bool getTapAnimation() const
     {
         return tapAnimation;
     }
-    [[nodiscard]] bool getAutoRotateSidewaysLayoutCards() const
+    bool getAutoRotateSidewaysLayoutCards() const
     {
         return autoRotateSidewaysLayoutCards;
     }
-    [[nodiscard]] bool getOpenDeckInNewTab() const
+    bool getOpenDeckInNewTab() const
     {
         return openDeckInNewTab;
     }
-    [[nodiscard]] int getRewindBufferingMs() const
+    int getRewindBufferingMs() const
     {
         return rewindBufferingMs;
     }
-    [[nodiscard]] bool getChatMention() const
+    bool getChatMention() const
     {
         return chatMention;
     }
-    [[nodiscard]] bool getChatMentionCompleter() const
+    bool getChatMentionCompleter() const
     {
         return chatMentionCompleter;
     }
-    [[nodiscard]] bool getChatMentionForeground() const
+    bool getChatMentionForeground() const
     {
         return chatMentionForeground;
     }
-    [[nodiscard]] bool getChatHighlightForeground() const
+    bool getChatHighlightForeground() const
     {
         return chatHighlightForeground;
     }
     /**
      * Currently selected index for the `Group by X` QComboBox
      */
-    [[nodiscard]] int getZoneViewGroupByIndex() const
+    int getZoneViewGroupByIndex() const
     {
         return zoneViewGroupByIndex;
     }
     /**
      * Currently selected index for the `Sort by X` QComboBox
      */
-    [[nodiscard]] int getZoneViewSortByIndex() const
+    int getZoneViewSortByIndex() const
     {
         return zoneViewSortByIndex;
     }
@@ -757,160 +708,148 @@ public:
        Returns if the view should be sorted into pile view.
        @return zoneViewPileView if the view should be sorted into pile view.
      */
-    [[nodiscard]] bool getZoneViewPileView() const
+    bool getZoneViewPileView() const
     {
         return zoneViewPileView;
     }
-    [[nodiscard]] bool getSoundEnabled() const
+    bool getSoundEnabled() const
     {
         return soundEnabled;
     }
-    [[nodiscard]] QString getSoundThemeName() const
+    QString getSoundThemeName() const
     {
         return soundThemeName;
     }
-    [[nodiscard]] bool getIgnoreUnregisteredUsers() const
+    bool getIgnoreUnregisteredUsers() const
     {
         return ignoreUnregisteredUsers;
     }
-    [[nodiscard]] bool getIgnoreUnregisteredUserMessages() const
+    bool getIgnoreUnregisteredUserMessages() const
     {
         return ignoreUnregisteredUserMessages;
     }
-    [[nodiscard]] int getPixmapCacheSize() const
+    int getPixmapCacheSize() const
     {
         return pixmapCacheSize;
     }
-    [[nodiscard]] int getNetworkCacheSizeInMB() const
+    int getNetworkCacheSizeInMB() const
     {
         return networkCacheSize;
     }
-    [[nodiscard]] int getRedirectCacheTtl() const
+    int getRedirectCacheTtl() const
     {
         return redirectCacheTtl;
     }
-    [[nodiscard]] bool getScaleCards() const
+    bool getScaleCards() const
     {
         return scaleCards;
     }
-    [[nodiscard]] int getStackCardOverlapPercent() const
+    int getStackCardOverlapPercent() const
     {
         return verticalCardOverlapPercent;
     }
-    [[nodiscard]] bool getShowMessagePopup() const
+    bool getShowMessagePopup() const
     {
         return showMessagePopups;
     }
-    [[nodiscard]] bool getShowMentionPopup() const
+    bool getShowMentionPopup() const
     {
         return showMentionPopups;
     }
-    [[nodiscard]] bool getRoomHistory() const
+    bool getRoomHistory() const
     {
         return roomHistory;
     }
-    [[nodiscard]] bool getLeftJustified() const
+    bool getLeftJustified() const
     {
         return leftJustified;
     }
-    [[nodiscard]] int getMasterVolume() const
+    int getMasterVolume() const
     {
         return masterVolume;
     }
-    [[nodiscard]] int getCardInfoViewMode() const
+    int getCardInfoViewMode() const
     {
         return cardInfoViewMode;
     }
-    [[nodiscard]] QStringList getCountries() const;
-    [[nodiscard]] QString getHighlightWords() const
+    QStringList getCountries() const;
+    QString getHighlightWords() const
     {
         return highlightWords;
     }
-    [[nodiscard]] QString getGameDescription() const
+    QString getGameDescription() const
     {
         return gameDescription;
     }
-    [[nodiscard]] int getMaxPlayers() const
+    int getMaxPlayers() const
     {
         return maxPlayers;
     }
-    [[nodiscard]] QString getGameTypes() const
+    QString getGameTypes() const
     {
         return gameTypes;
     }
-    [[nodiscard]] bool getOnlyBuddies() const
+    bool getOnlyBuddies() const
     {
         return onlyBuddies;
     }
-    [[nodiscard]] bool getOnlyRegistered() const
+    bool getOnlyRegistered() const
     {
         return onlyRegistered;
     }
-    [[nodiscard]] bool getSpectatorsAllowed() const
+    bool getSpectatorsAllowed() const
     {
         return spectatorsAllowed;
     }
-    [[nodiscard]] bool getSpectatorsNeedPassword() const
+    bool getSpectatorsNeedPassword() const
     {
         return spectatorsNeedPassword;
     }
-    [[nodiscard]] bool getSpectatorsCanTalk() const
+    bool getSpectatorsCanTalk() const
     {
         return spectatorsCanTalk;
     }
-    [[nodiscard]] bool getSpectatorsCanSeeEverything() const
+    bool getSpectatorsCanSeeEverything() const
     {
         return spectatorsCanSeeEverything;
     }
-    [[nodiscard]] int getDefaultStartingLifeTotal() const
+    int getDefaultStartingLifeTotal() const
     {
         return defaultStartingLifeTotal;
     }
-    [[nodiscard]] bool getShareDecklistsOnLoad() const
+    bool getShareDecklistsOnLoad() const
     {
         return shareDecklistsOnLoad;
     }
-    [[nodiscard]] bool getCreateGameAsSpectator() const
+    bool getCreateGameAsSpectator() const
     {
         return createGameAsSpectator;
     }
-    [[nodiscard]] bool getRememberGameSettings() const
+    bool getRememberGameSettings() const
     {
         return rememberGameSettings;
     }
-    [[nodiscard]] bool getLocalGameRememberSettings() const
-    {
-        return localGameRememberSettings;
-    }
-    [[nodiscard]] int getLocalGameMaxPlayers() const
-    {
-        return localGameMaxPlayers;
-    }
-    [[nodiscard]] int getLocalGameStartingLifeTotal() const
-    {
-        return localGameStartingLifeTotal;
-    }
-    [[nodiscard]] int getKeepAlive() const override
+    int getKeepAlive() const
     {
         return keepalive;
     }
-    [[nodiscard]] int getTimeOut() const override
+    int getTimeOut() const
     {
         return timeout;
     }
-    [[nodiscard]] int getMaxFontSize() const
+    int getMaxFontSize() const
     {
         return maxFontSize;
     }
     void setClientID(const QString &clientID);
     void setClientVersion(const QString &clientVersion);
-    void setKnownMissingFeatures(const QString &_knownMissingFeatures) override;
+    void setKnownMissingFeatures(const QString &_knownMissingFeatures);
     void setUseTearOffMenus(bool _useTearOffMenus);
     void setCardViewInitialRowsMax(int _cardViewInitialRowsMax);
     void setCardViewExpandedRowsMax(int value);
     void setCloseEmptyCardView(QT_STATE_CHANGED_T value);
     void setFocusCardViewSearchBar(QT_STATE_CHANGED_T value);
-    QString getClientID() override
+    QString getClientID()
     {
         return clientID;
     }
@@ -918,7 +857,7 @@ public:
     {
         return clientVersion;
     }
-    QString getKnownMissingFeatures() override
+    QString getKnownMissingFeatures()
     {
         return knownMissingFeatures;
     }
@@ -926,73 +865,73 @@ public:
     {
         return useTearOffMenus;
     }
-    [[nodiscard]] int getCardViewInitialRowsMax() const
+    int getCardViewInitialRowsMax() const
     {
         return cardViewInitialRowsMax;
     }
-    [[nodiscard]] int getCardViewExpandedRowsMax() const
+    int getCardViewExpandedRowsMax() const
     {
         return cardViewExpandedRowsMax;
     }
-    [[nodiscard]] bool getCloseEmptyCardView() const
+    bool getCloseEmptyCardView() const
     {
         return closeEmptyCardView;
     }
-    [[nodiscard]] bool getFocusCardViewSearchBar() const
+    bool getFocusCardViewSearchBar() const
     {
         return focusCardViewSearchBar;
     }
-    [[nodiscard]] ShortcutsSettings &shortcuts() const
+    ShortcutsSettings &shortcuts() const
     {
         return *shortcutsSettings;
     }
-    [[nodiscard]] CardDatabaseSettings *cardDatabase() const
+    CardDatabaseSettings &cardDatabase() const
     {
-        return cardDatabaseSettings;
+        return *cardDatabaseSettings;
     }
-    [[nodiscard]] ServersSettings &servers() const
+    ServersSettings &servers() const
     {
         return *serversSettings;
     }
-    [[nodiscard]] MessageSettings &messages() const
+    MessageSettings &messages() const
     {
         return *messageSettings;
     }
-    [[nodiscard]] GameFiltersSettings &gameFilters() const
+    GameFiltersSettings &gameFilters() const
     {
         return *gameFiltersSettings;
     }
-    [[nodiscard]] LayoutsSettings &layouts() const
+    LayoutsSettings &layouts() const
     {
         return *layoutsSettings;
     }
-    [[nodiscard]] DownloadSettings &downloads() const
+    DownloadSettings &downloads() const
     {
         return *downloadSettings;
     }
-    [[nodiscard]] RecentsSettings &recents() const
+    RecentsSettings &recents() const
     {
         return *recentsSettings;
     }
-    [[nodiscard]] CardOverrideSettings &cardOverrides() const
+    CardOverrideSettings &cardOverrides() const
     {
         return *cardOverrideSettings;
     }
-    [[nodiscard]] DebugSettings &debug() const
+    DebugSettings &debug() const
     {
         return *debugSettings;
     }
-    [[nodiscard]] CardCounterSettings &cardCounters() const;
+    CardCounterSettings &cardCounters() const;
 
-    [[nodiscard]] bool getIsPortableBuild() const
+    bool getIsPortableBuild() const
     {
         return isPortableBuild;
     }
-    [[nodiscard]] bool getDownloadSpoilersStatus() const
+    bool getDownloadSpoilersStatus() const
     {
         return mbDownloadSpoilers;
     }
-    [[nodiscard]] bool getRoundCardCorners() const
+    bool getRoundCardCorners() const
     {
         return roundCardCorners;
     }
@@ -1003,6 +942,9 @@ public:
 public slots:
     void setDownloadSpoilerStatus(bool _spoilerStatus);
 
+    void setMainWindowGeometry(const QByteArray &_mainWindowGeometry);
+    void setTokenDialogGeometry(const QByteArray &_tokenDialog);
+    void setSetsDialogGeometry(const QByteArray &_setsDialog);
     void setLang(const QString &_lang);
     void setShowTipsOnStartup(bool _showTipsOnStartup);
     void setSeenTips(const QList<int> &_seenTips);
@@ -1018,7 +960,6 @@ public slots:
     void setThemeName(const QString &_themeName);
     void setHomeTabBackgroundSource(const QString &_backgroundSource);
     void setHomeTabBackgroundShuffleFrequency(int _frequency);
-    void setHomeTabDisplayCardName(QT_STATE_CHANGED_T _displayCardName);
     void setTabVisualDeckStorageOpen(bool value);
     void setTabServerOpen(bool value);
     void setTabAccountOpen(bool value);
@@ -1036,11 +977,10 @@ public slots:
     void setDoubleClickToPlay(QT_STATE_CHANGED_T _doubleClickToPlay);
     void setClickPlaysAllSelected(QT_STATE_CHANGED_T _clickPlaysAllSelected);
     void setPlayToStack(QT_STATE_CHANGED_T _playToStack);
-    void setDoNotDeleteArrowsInSubPhases(QT_STATE_CHANGED_T _doNotDeleteArrowsInSubPhases);
     void setStartingHandSize(int _startingHandSize);
     void setAnnotateTokens(QT_STATE_CHANGED_T _annotateTokens);
+    void setTabGameSplitterSizes(const QByteArray &_tabGameSplitterSizes);
     void setShowShortcuts(QT_STATE_CHANGED_T _showShortcuts);
-    void setShowGameSelectorFilterToolbar(QT_STATE_CHANGED_T _showGameSelectorFilterToolbar);
     void setDisplayCardNames(QT_STATE_CHANGED_T _displayCardNames);
     void setOverrideAllCardArtWithPersonalPreference(QT_STATE_CHANGED_T _overrideAllCardArt);
     void setBumpSetsWithCardsInDeckToTop(QT_STATE_CHANGED_T _bumpSetsWithCardsInDeckToTop);
@@ -1055,7 +995,6 @@ public slots:
     void setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T _showTags);
     void setVisualDeckStorageDefaultTagsList(QStringList _defaultTagsList);
     void setVisualDeckStorageSearchFolderNames(QT_STATE_CHANGED_T value);
-    void setVisualDeckStorageShowColorIdentity(QT_STATE_CHANGED_T value);
     void setVisualDeckStorageShowBannerCardComboBox(QT_STATE_CHANGED_T _showBannerCardComboBox);
     void setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T _showTags);
     void setVisualDeckStorageCardSize(int _visualDeckStorageCardSize);
@@ -1066,10 +1005,6 @@ public slots:
     void setVisualDeckStorageAlwaysConvert(bool _visualDeckStorageAlwaysConvert);
     void setVisualDeckStorageInGame(QT_STATE_CHANGED_T value);
     void setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T value);
-    void setVisualDeckEditorCardSize(int _visualDeckEditorCardSize);
-    void setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize);
-    void setEDHRecCardSize(int _EDHRecCardSize);
-    void setArchidektPreviewCardSize(int _archidektPreviewCardSize);
     void setDefaultDeckEditorType(int value);
     void setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T _enabled);
     void setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount);
@@ -1117,9 +1052,6 @@ public slots:
     void setDefaultStartingLifeTotal(const int _defaultStartingLifeTotal);
     void setShareDecklistsOnLoad(const bool _shareDecklistsOnLoad);
     void setRememberGameSettings(const bool _rememberGameSettings);
-    void setLocalGameRememberSettings(bool value);
-    void setLocalGameMaxPlayers(int value);
-    void setLocalGameStartingLifeTotal(int value);
     void setCheckUpdatesOnStartup(QT_STATE_CHANGED_T value);
     void setStartupCardUpdateCheckPromptForUpdate(bool value);
     void setStartupCardUpdateCheckAlwaysUpdate(bool value);
@@ -1130,7 +1062,6 @@ public slots:
     void setUpdateReleaseChannelIndex(int value);
     void setMaxFontSize(int _max);
     void setRoundCardCorners(bool _roundCardCorners);
-    void setShowDragSelectionCount(QT_STATE_CHANGED_T _showDragSelectionCount);
-    void setShowTotalSelectionCount(QT_STATE_CHANGED_T _showTotalSelectionCount);
 };
+
 #endif
diff --git a/cockatrice/src/client/settings/card_counter_settings.cpp b/cockatrice/src/settings/card_counter_settings.cpp
similarity index 85%
rename from cockatrice/src/client/settings/card_counter_settings.cpp
rename to cockatrice/src/settings/card_counter_settings.cpp
index 399365c99..d22eb239f 100644
--- a/cockatrice/src/client/settings/card_counter_settings.cpp
+++ b/cockatrice/src/settings/card_counter_settings.cpp
@@ -5,14 +5,12 @@
 #include <QtMath>
 
 CardCounterSettings::CardCounterSettings(const QString &settingsPath, QObject *parent)
-    : SettingsManager(settingsPath + "global.ini", "cards", "counters", parent)
+    : SettingsManager(settingsPath + "global.ini", parent)
 {
 }
 
 void CardCounterSettings::setColor(int counterId, const QColor &color)
 {
-    QSettings settings = getSettings();
-
     QString key = QString("cards/counters/%1/color").arg(counterId);
 
     if (settings.value(key).value<QColor>() == color)
@@ -38,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/settings/card_counter_settings.h
similarity index 62%
rename from cockatrice/src/client/settings/card_counter_settings.h
rename to cockatrice/src/settings/card_counter_settings.h
index b1d467d67..bb3a9bd57 100644
--- a/cockatrice/src/client/settings/card_counter_settings.h
+++ b/cockatrice/src/settings/card_counter_settings.h
@@ -1,13 +1,9 @@
-/**
- * @file card_counter_settings.h
- * @ingroup GameSettings
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_COUNTER_SETTINGS_H
 #define CARD_COUNTER_SETTINGS_H
 
-#include <libcockatrice/settings/settings_manager.h>
+#include "settings_manager.h"
+
+#include <QObject>
 
 class QSettings;
 class QColor;
@@ -19,9 +15,9 @@ class CardCounterSettings : public SettingsManager
 public:
     CardCounterSettings(const QString &settingsPath, QObject *parent = nullptr);
 
-    [[nodiscard]] QColor color(int counterId) const;
+    QColor color(int counterId) const;
 
-    [[nodiscard]] QString displayName(int counterId) const;
+    QString displayName(int counterId) const;
 
 public slots:
     void setColor(int counterId, const QColor &color);
diff --git a/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp b/cockatrice/src/settings/card_database_settings.cpp
similarity index 79%
rename from libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
rename to cockatrice/src/settings/card_database_settings.cpp
index 26a91a4dd..f0b8d58b1 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
+++ b/cockatrice/src/settings/card_database_settings.cpp
@@ -1,7 +1,7 @@
 #include "card_database_settings.h"
 
 CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent)
-    : SettingsManager(settingPath + "cardDatabase.ini", QString(), QString(), parent)
+    : SettingsManager(settingPath + "cardDatabase.ini", parent)
 {
 }
 
@@ -20,17 +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();
 }
diff --git a/cockatrice/src/settings/card_database_settings.h b/cockatrice/src/settings/card_database_settings.h
new file mode 100644
index 000000000..421fb60bb
--- /dev/null
+++ b/cockatrice/src/settings/card_database_settings.h
@@ -0,0 +1,32 @@
+#ifndef CARDDATABASESETTINGS_H
+#define CARDDATABASESETTINGS_H
+
+#include "settings_manager.h"
+
+#include <QObject>
+#include <QSettings>
+#include <QVariant>
+
+class CardDatabaseSettings : public SettingsManager
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    void setSortKey(QString shortName, unsigned int sortKey);
+    void setEnabled(QString shortName, bool enabled);
+    void setIsKnown(QString shortName, bool isknown);
+
+    unsigned int getSortKey(QString shortName);
+    bool isEnabled(QString shortName);
+    bool isKnown(QString shortName);
+signals:
+
+public slots:
+
+private:
+    explicit CardDatabaseSettings(const QString &settingPath, QObject *parent = nullptr);
+    CardDatabaseSettings(const CardDatabaseSettings & /*other*/);
+};
+
+#endif // CARDDATABASESETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp b/cockatrice/src/settings/card_override_settings.cpp
similarity index 71%
rename from libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
rename to cockatrice/src/settings/card_override_settings.cpp
index a61a4693b..2e2c7607d 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
+++ b/cockatrice/src/settings/card_override_settings.cpp
@@ -1,21 +1,21 @@
 #include "card_override_settings.h"
 
 CardOverrideSettings::CardOverrideSettings(const QString &settingPath, QObject *parent)
-    : SettingsManager(settingPath + "cardPreferenceOverrides.ini", "cards", QString(), parent)
+    : SettingsManager(settingPath + "cardPreferenceOverrides.ini", parent)
 {
 }
 
 void CardOverrideSettings::setCardPreferenceOverride(const CardRef &cardRef)
 {
-    setValue(cardRef.providerId, cardRef.name);
+    setValue(cardRef.providerId, cardRef.name, "cards");
 }
 
 void CardOverrideSettings::deleteCardPreferenceOverride(const QString &cardName)
 {
-    deleteValue(cardName);
+    deleteValue(cardName, "cards");
 }
 
-QString CardOverrideSettings::getCardPreferenceOverride(const QString &cardName) const
+QString CardOverrideSettings::getCardPreferenceOverride(const QString &cardName)
 {
-    return getValue(cardName).toString();
+    return getValue(cardName, "cards").toString();
 }
\ No newline at end of file
diff --git a/libcockatrice_settings/libcockatrice/settings/card_override_settings.h b/cockatrice/src/settings/card_override_settings.h
similarity index 73%
rename from libcockatrice_settings/libcockatrice/settings/card_override_settings.h
rename to cockatrice/src/settings/card_override_settings.h
index 3d9db4e65..520d9f65f 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
+++ b/cockatrice/src/settings/card_override_settings.h
@@ -1,16 +1,10 @@
-/**
- * @file card_override_settings.h
- * @ingroup CardSettings
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_CARD_OVERRIDE_SETTINGS_H
 #define COCKATRICE_CARD_OVERRIDE_SETTINGS_H
 
+#include "../common/card_ref.h"
 #include "settings_manager.h"
 
 #include <QObject>
-#include <libcockatrice/utility/card_ref.h>
 
 class CardOverrideSettings : public SettingsManager
 {
@@ -22,7 +16,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/cockatrice/src/settings/debug_settings.cpp
similarity index 68%
rename from libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
rename to cockatrice/src/settings/debug_settings.cpp
index 5bf6eca30..f6f12f60e 100644
--- a/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
+++ b/cockatrice/src/settings/debug_settings.cpp
@@ -3,7 +3,7 @@
 #include <QtCore/QFile>
 
 DebugSettings::DebugSettings(const QString &settingPath, QObject *parent)
-    : SettingsManager(settingPath + "debug.ini", "debug", QString(), parent)
+    : SettingsManager(settingPath + "debug.ini", parent)
 {
     // Create the default debug.ini if it doesn't exist yet
     if (!QFile(settingPath + "debug.ini").exists()) {
@@ -11,22 +11,22 @@ DebugSettings::DebugSettings(const QString &settingPath, QObject *parent)
     }
 }
 
-bool DebugSettings::getShowCardId() const
+bool DebugSettings::getShowCardId()
 {
-    return getValue("showCardId").toBool();
+    return getValue("showCardId", "debug").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/cockatrice/src/settings/debug_settings.h
similarity index 56%
rename from libcockatrice_settings/libcockatrice/settings/debug_settings.h
rename to cockatrice/src/settings/debug_settings.h
index 30cdd5fa5..89ea33e4e 100644
--- a/libcockatrice_settings/libcockatrice/settings/debug_settings.h
+++ b/cockatrice/src/settings/debug_settings.h
@@ -1,9 +1,3 @@
-/**
- * @file debug_settings.h
- * @ingroup CoreSettings
- * @brief TODO: Document this.
- */
-
 #ifndef DEBUG_SETTINGS_H
 #define DEBUG_SETTINGS_H
 #include "settings_manager.h"
@@ -17,12 +11,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/cockatrice/src/settings/download_settings.cpp
similarity index 68%
rename from libcockatrice_settings/libcockatrice/settings/download_settings.cpp
rename to cockatrice/src/settings/download_settings.cpp
index 66525a598..adbe26363 100644
--- a/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
+++ b/cockatrice/src/settings/download_settings.cpp
@@ -9,21 +9,21 @@ const QStringList DownloadSettings::DEFAULT_DOWNLOAD_URLS = {
     "https://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"};
 
 DownloadSettings::DownloadSettings(const QString &settingPath, QObject *parent = nullptr)
-    : SettingsManager(settingPath + "downloads.ini", "downloads", QString(), parent)
+    : SettingsManager(settingPath + "downloads.ini", parent)
 {
 }
 
 void DownloadSettings::setDownloadUrls(const QStringList &downloadURLs)
 {
-    setValue(QVariant::fromValue(downloadURLs), "urls");
+    setValue(QVariant::fromValue(downloadURLs), "urls", "downloads");
 }
 
-QStringList DownloadSettings::getAllURLs() const
+QStringList DownloadSettings::getAllURLs()
 {
-    return getValue("urls").toStringList();
+    return getValue("urls", "downloads").toStringList();
 }
 
 void DownloadSettings::resetToDefaultURLs()
 {
-    setValue(QVariant::fromValue(DEFAULT_DOWNLOAD_URLS), "urls");
+    setValue(QVariant::fromValue(DEFAULT_DOWNLOAD_URLS), "urls", "downloads");
 }
diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.h b/cockatrice/src/settings/download_settings.h
similarity index 77%
rename from libcockatrice_settings/libcockatrice/settings/download_settings.h
rename to cockatrice/src/settings/download_settings.h
index b7442301e..a961199b3 100644
--- a/libcockatrice_settings/libcockatrice/settings/download_settings.h
+++ b/cockatrice/src/settings/download_settings.h
@@ -1,14 +1,10 @@
-/**
- * @file download_settings.h
- * @ingroup NetworkSettings
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_DOWNLOADSETTINGS_H
 #define COCKATRICE_DOWNLOADSETTINGS_H
 
 #include "settings_manager.h"
 
+#include <QObject>
+
 class DownloadSettings : public SettingsManager
 {
     Q_OBJECT
@@ -19,7 +15,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/cockatrice/src/settings/game_filters_settings.cpp b/cockatrice/src/settings/game_filters_settings.cpp
new file mode 100644
index 000000000..e82b18a47
--- /dev/null
+++ b/cockatrice/src/settings/game_filters_settings.cpp
@@ -0,0 +1,208 @@
+#include "game_filters_settings.h"
+
+#include <QCryptographicHash>
+#include <QTime>
+
+GameFiltersSettings::GameFiltersSettings(const QString &settingPath, QObject *parent)
+    : SettingsManager(settingPath + "gamefilters.ini", parent)
+{
+}
+
+/*
+ * The game type might contain special characters, so to use it in
+ * QSettings we just hash it.
+ */
+QString GameFiltersSettings::hashGameType(const QString &gameType) const
+{
+    return QCryptographicHash::hash(gameType.toUtf8(), QCryptographicHash::Md5).toHex();
+}
+
+void GameFiltersSettings::setHideBuddiesOnlyGames(bool hide)
+{
+    setValue(hide, "hide_buddies_only_games", "filter_games");
+}
+
+bool GameFiltersSettings::isHideBuddiesOnlyGames()
+{
+    QVariant previous = getValue("hide_buddies_only_games", "filter_games");
+    return previous == QVariant() || previous.toBool();
+}
+
+void GameFiltersSettings::setHideFullGames(bool hide)
+{
+    setValue(hide, "hide_full_games", "filter_games");
+}
+
+bool GameFiltersSettings::isHideFullGames()
+{
+    QVariant previous = getValue("hide_full_games", "filter_games");
+    return !(previous == QVariant()) && previous.toBool();
+}
+
+void GameFiltersSettings::setHideGamesThatStarted(bool hide)
+{
+    setValue(hide, "hide_games_that_started", "filter_games");
+}
+
+bool GameFiltersSettings::isHideGamesThatStarted()
+{
+    QVariant previous = getValue("hide_games_that_started", "filter_games");
+    return !(previous == QVariant()) && previous.toBool();
+}
+
+void GameFiltersSettings::setHidePasswordProtectedGames(bool hide)
+{
+    setValue(hide, "hide_password_protected_games", "filter_games");
+}
+
+bool GameFiltersSettings::isHidePasswordProtectedGames()
+{
+    QVariant previous = getValue("hide_password_protected_games", "filter_games");
+    return previous == QVariant() || previous.toBool();
+}
+
+void GameFiltersSettings::setHideIgnoredUserGames(bool hide)
+{
+    setValue(hide, "hide_ignored_user_games", "filter_games");
+}
+
+bool GameFiltersSettings::isHideIgnoredUserGames()
+{
+    QVariant previous = getValue("hide_ignored_user_games", "filter_games");
+    return !(previous == QVariant()) && previous.toBool();
+}
+
+void GameFiltersSettings::setHideNotBuddyCreatedGames(bool hide)
+{
+    setValue(hide, "hide_not_buddy_created_games", "filter_games");
+}
+
+bool GameFiltersSettings::isHideNotBuddyCreatedGames()
+{
+    QVariant previous = getValue("hide_not_buddy_created_games", "filter_games");
+    return !(previous == QVariant()) && previous.toBool();
+}
+
+void GameFiltersSettings::setHideOpenDecklistGames(bool hide)
+{
+    setValue(hide, "hide_open_decklist_games", "filter_games");
+}
+
+bool GameFiltersSettings::isHideOpenDecklistGames()
+{
+    QVariant previous = getValue("hide_open_decklist_games", "filter_games");
+    return !(previous == QVariant()) && previous.toBool();
+}
+
+void GameFiltersSettings::setGameNameFilter(QString gameName)
+{
+    setValue(gameName, "game_name_filter", "filter_games");
+}
+
+QString GameFiltersSettings::getGameNameFilter()
+{
+    return getValue("game_name_filter", "filter_games").toString();
+}
+
+void GameFiltersSettings::setCreatorNameFilter(QString creatorName)
+{
+    setValue(creatorName, "creator_name_filter", "filter_games");
+}
+
+QString GameFiltersSettings::getCreatorNameFilter()
+{
+    return getValue("creator_name_filter", "filter_games").toString();
+}
+
+void GameFiltersSettings::setMinPlayers(int min)
+{
+    setValue(min, "min_players", "filter_games");
+}
+
+int GameFiltersSettings::getMinPlayers()
+{
+    QVariant previous = getValue("min_players", "filter_games");
+    return previous == QVariant() ? 1 : previous.toInt();
+}
+
+void GameFiltersSettings::setMaxPlayers(int max)
+{
+    setValue(max, "max_players", "filter_games");
+}
+
+int GameFiltersSettings::getMaxPlayers()
+{
+    QVariant previous = getValue("max_players", "filter_games");
+    return previous == QVariant() ? 99 : previous.toInt();
+}
+
+void GameFiltersSettings::setMaxGameAge(const QTime &maxGameAge)
+{
+    setValue(maxGameAge, "max_game_age_time", "filter_games");
+}
+
+QTime GameFiltersSettings::getMaxGameAge()
+{
+    QVariant previous = getValue("max_game_age_time", "filter_games");
+    return previous.toTime();
+}
+
+void GameFiltersSettings::setGameTypeEnabled(QString gametype, bool enabled)
+{
+    setValue(enabled, "game_type/" + hashGameType(gametype), "filter_games");
+}
+
+void GameFiltersSettings::setGameHashedTypeEnabled(QString gametypeHASHED, bool enabled)
+{
+    setValue(enabled, gametypeHASHED, "filter_games");
+}
+
+bool GameFiltersSettings::isGameTypeEnabled(QString gametype)
+{
+    QVariant previous = getValue("game_type/" + hashGameType(gametype), "filter_games");
+    return previous == QVariant() ? false : previous.toBool();
+}
+
+void GameFiltersSettings::setShowOnlyIfSpectatorsCanWatch(bool show)
+{
+    setValue(show, "show_only_if_spectators_can_watch", "filter_games");
+}
+
+bool GameFiltersSettings::isShowOnlyIfSpectatorsCanWatch()
+{
+    QVariant previous = getValue("show_only_if_spectators_can_watch", "filter_games");
+    return previous == QVariant() ? false : previous.toBool();
+}
+
+void GameFiltersSettings::setShowSpectatorPasswordProtected(bool show)
+{
+    setValue(show, "show_spectator_password_protected", "filter_games");
+}
+
+bool GameFiltersSettings::isShowSpectatorPasswordProtected()
+{
+    QVariant previous = getValue("show_spectator_password_protected", "filter_games");
+    return previous == QVariant() ? true : previous.toBool();
+}
+
+void GameFiltersSettings::setShowOnlyIfSpectatorsCanChat(bool show)
+{
+    setValue(show, "show_only_if_spectators_can_chat", "filter_games");
+}
+
+bool GameFiltersSettings::isShowOnlyIfSpectatorsCanChat()
+{
+    QVariant previous = getValue("show_only_if_spectators_can_chat", "filter_games");
+    return previous == QVariant() ? true : previous.toBool();
+}
+
+void GameFiltersSettings::setShowOnlyIfSpectatorsCanSeeHands(bool show)
+{
+    setValue(show, "show_only_if_spectators_can_see_hands", "filter_games");
+}
+
+bool GameFiltersSettings::isShowOnlyIfSpectatorsCanSeeHands()
+{
+    QVariant previous = getValue("show_only_if_spectators_can_see_hands", "filter_games");
+    return previous == QVariant() ? true : previous.toBool();
+}
\ No newline at end of file
diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h b/cockatrice/src/settings/game_filters_settings.h
similarity index 57%
rename from libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
rename to cockatrice/src/settings/game_filters_settings.h
index c0e60551a..a243c74e9 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
+++ b/cockatrice/src/settings/game_filters_settings.h
@@ -1,10 +1,3 @@
-/**
- * @file game_filters_settings.h
- * @ingroup Lobby
- * @ingroup GameSettings
- * @brief TODO: Document this.
- */
-
 #ifndef GAMEFILTERSSETTINGS_H
 #define GAMEFILTERSSETTINGS_H
 
@@ -16,33 +9,33 @@ 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();
+    void setHideOpenDecklistGames(bool hide);
+    bool isHideOpenDecklistGames();
+    QString getGameNameFilter();
+    QString getCreatorNameFilter();
+    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);
-    void setHideOpenDecklistGames(bool hide);
     void setHideFullGames(bool hide);
     void setHideGamesThatStarted(bool hide);
     void setHidePasswordProtectedGames(bool hide);
     void setHideNotBuddyCreatedGames(bool hide);
     void setGameNameFilter(QString gameName);
-    void setCreatorNameFilters(QStringList creatorName);
+    void setCreatorNameFilter(QString creatorName);
     void setMinPlayers(int min);
     void setMaxPlayers(int max);
     void setMaxGameAge(const QTime &maxGameAge);
@@ -52,10 +45,15 @@ public:
     void setShowSpectatorPasswordProtected(bool show);
     void setShowOnlyIfSpectatorsCanChat(bool show);
     void setShowOnlyIfSpectatorsCanSeeHands(bool show);
+signals:
+
+public slots:
 
 private:
     explicit GameFiltersSettings(const QString &settingPath, QObject *parent = nullptr);
     GameFiltersSettings(const GameFiltersSettings & /*other*/);
+
+    QString hashGameType(const QString &gameType) const;
 };
 
 #endif // GAMEFILTERSSETTINGS_H
diff --git a/cockatrice/src/settings/layouts_settings.cpp b/cockatrice/src/settings/layouts_settings.cpp
new file mode 100644
index 000000000..5791cbfe9
--- /dev/null
+++ b/cockatrice/src/settings/layouts_settings.cpp
@@ -0,0 +1,207 @@
+#include "layouts_settings.h"
+
+LayoutsSettings::LayoutsSettings(const QString &settingPath, QObject *parent)
+    : SettingsManager(settingPath + "layouts.ini", parent)
+{
+}
+
+const QByteArray LayoutsSettings::getDeckEditorLayoutState()
+{
+    return getValue("layouts/deckEditor_state").toByteArray();
+}
+
+void LayoutsSettings::setDeckEditorLayoutState(const QByteArray &value)
+{
+    setValue(value, "layouts/deckEditor_state");
+}
+
+const QByteArray LayoutsSettings::getDeckEditorGeometry()
+{
+    return getValue("layouts/deckEditor_geometry").toByteArray();
+}
+
+void LayoutsSettings::setDeckEditorGeometry(const QByteArray &value)
+{
+    setValue(value, "layouts/deckEditor_geometry");
+}
+
+QSize LayoutsSettings::getDeckEditorCardSize()
+{
+    QVariant previous = getValue("layouts/deckEditor_CardSize");
+    return previous == QVariant() ? QSize(250, 500) : previous.toSize();
+}
+
+void LayoutsSettings::setDeckEditorCardSize(const QSize &value)
+{
+    setValue(value, "layouts/deckEditor_CardSize");
+}
+
+QSize LayoutsSettings::getDeckEditorDeckSize()
+{
+    QVariant previous = getValue("layouts/deckEditor_DeckSize");
+    return previous == QVariant() ? QSize(250, 360) : previous.toSize();
+}
+
+void LayoutsSettings::setDeckEditorDeckSize(const QSize &value)
+{
+    setValue(value, "layouts/deckEditor_DeckSize");
+}
+
+QSize LayoutsSettings::getDeckEditorPrintingSelectorSize()
+{
+    QVariant previous = getValue("layouts/deckEditor_PrintingSelectorSize");
+    return previous == QVariant() ? QSize(525, 250) : previous.toSize();
+}
+
+void LayoutsSettings::setDeckEditorPrintingSelectorSize(const QSize &value)
+{
+    setValue(value, "layouts/deckEditor_PrintingSelectorSize");
+}
+
+QSize LayoutsSettings::getDeckEditorFilterSize()
+{
+    QVariant previous = getValue("layouts/deckEditor_FilterSize");
+    return previous == QVariant() ? QSize(250, 250) : previous.toSize();
+}
+
+void LayoutsSettings::setDeckEditorFilterSize(const QSize &value)
+{
+    setValue(value, "layouts/deckEditor_FilterSize");
+}
+
+const QByteArray LayoutsSettings::getDeckEditorDbHeaderState()
+{
+    return getValue("layouts/deckEditorDbHeader_state").toByteArray();
+}
+
+void LayoutsSettings::setDeckEditorDbHeaderState(const QByteArray &value)
+{
+    setValue(value, "layouts/deckEditorDbHeader_state");
+}
+
+const QByteArray LayoutsSettings::getSetsDialogHeaderState()
+{
+    return getValue("layouts/setsDialogHeader_state").toByteArray();
+}
+
+void LayoutsSettings::setSetsDialogHeaderState(const QByteArray &value)
+{
+    setValue(value, "layouts/setsDialogHeader_state");
+}
+
+void LayoutsSettings::setGamePlayAreaGeometry(const QByteArray &value)
+{
+    setValue(value, "layouts/gameplayarea_geometry");
+}
+
+void LayoutsSettings::setGamePlayAreaState(const QByteArray &value)
+{
+    setValue(value, "layouts/gameplayarea_state");
+}
+
+const QByteArray LayoutsSettings::getGamePlayAreaLayoutState()
+{
+    return getValue("layouts/gameplayarea_state").toByteArray();
+}
+
+const QByteArray LayoutsSettings::getGamePlayAreaGeometry()
+{
+    return getValue("layouts/gameplayarea_geometry").toByteArray();
+}
+
+const QSize LayoutsSettings::getGameCardInfoSize()
+{
+    QVariant previous = getValue("layouts/gameplayarea_CardInfoSize");
+    return previous == QVariant() ? QSize(250, 360) : previous.toSize();
+}
+
+void LayoutsSettings::setGameCardInfoSize(const QSize &value)
+{
+    setValue(value, "layouts/gameplayarea_CardInfoSize");
+}
+
+const QSize LayoutsSettings::getGameMessageLayoutSize()
+{
+    QVariant previous = getValue("layouts/gameplayarea_MessageLayoutSize");
+    return previous == QVariant() ? QSize(250, 250) : previous.toSize();
+}
+
+void LayoutsSettings::setGameMessageLayoutSize(const QSize &value)
+{
+    setValue(value, "layouts/gameplayarea_MessageLayoutSize");
+}
+
+const QSize LayoutsSettings::getGamePlayerListSize()
+{
+    QVariant previous = getValue("layouts/gameplayarea_PlayerListSize");
+    return previous == QVariant() ? QSize(250, 50) : previous.toSize();
+}
+
+void LayoutsSettings::setGamePlayerListSize(const QSize &value)
+{
+    setValue(value, "layouts/gameplayarea_PlayerListSize");
+}
+
+void LayoutsSettings::setReplayPlayAreaGeometry(const QByteArray &value)
+{
+    setValue(value, "layouts/replayplayarea_geometry");
+}
+
+void LayoutsSettings::setReplayPlayAreaState(const QByteArray &value)
+{
+    setValue(value, "layouts/replayplayarea_state");
+}
+
+const QByteArray LayoutsSettings::getReplayPlayAreaLayoutState()
+{
+    return getValue("layouts/replayplayarea_state").toByteArray();
+}
+
+const QByteArray LayoutsSettings::getReplayPlayAreaGeometry()
+{
+    return getValue("layouts/replayplayarea_geometry").toByteArray();
+}
+
+const QSize LayoutsSettings::getReplayCardInfoSize()
+{
+    QVariant previous = getValue("layouts/replayplayarea_CardInfoSize");
+    return previous == QVariant() ? QSize(250, 360) : previous.toSize();
+}
+
+void LayoutsSettings::setReplayCardInfoSize(const QSize &value)
+{
+    setValue(value, "layouts/replayplayarea_CardInfoSize");
+}
+
+const QSize LayoutsSettings::getReplayMessageLayoutSize()
+{
+    QVariant previous = getValue("layouts/replayplayarea_MessageLayoutSize");
+    return previous == QVariant() ? QSize(250, 200) : previous.toSize();
+}
+
+void LayoutsSettings::setReplayMessageLayoutSize(const QSize &value)
+{
+    setValue(value, "layouts/replayplayarea_MessageLayoutSize");
+}
+
+const QSize LayoutsSettings::getReplayPlayerListSize()
+{
+    QVariant previous = getValue("layouts/replayplayarea_PlayerListSize");
+    return previous == QVariant() ? QSize(250, 50) : previous.toSize();
+}
+
+void LayoutsSettings::setReplayPlayerListSize(const QSize &value)
+{
+    setValue(value, "layouts/replayplayarea_PlayerListSize");
+}
+
+const QSize LayoutsSettings::getReplayReplaySize()
+{
+    QVariant previous = getValue("layouts/replayplayarea_ReplaySize");
+    return previous == QVariant() ? QSize(900, 100) : previous.toSize();
+}
+
+void LayoutsSettings::setReplayReplaySize(const QSize &value)
+{
+    setValue(value, "layouts/replayplayarea_ReplaySize");
+}
diff --git a/cockatrice/src/settings/layouts_settings.h b/cockatrice/src/settings/layouts_settings.h
new file mode 100644
index 000000000..0464bec01
--- /dev/null
+++ b/cockatrice/src/settings/layouts_settings.h
@@ -0,0 +1,66 @@
+#ifndef LAYOUTSSETTINGS_H
+#define LAYOUTSSETTINGS_H
+
+#include "settings_manager.h"
+
+#include <QSize>
+
+class LayoutsSettings : public SettingsManager
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    void setDeckEditorLayoutState(const QByteArray &value);
+    void setDeckEditorGeometry(const QByteArray &value);
+    void setDeckEditorCardSize(const QSize &value);
+    void setDeckEditorDeckSize(const QSize &value);
+    void setDeckEditorPrintingSelectorSize(const QSize &value);
+    void setDeckEditorFilterSize(const QSize &value);
+    void setDeckEditorDbHeaderState(const QByteArray &value);
+    void setSetsDialogHeaderState(const QByteArray &value);
+
+    void setGamePlayAreaGeometry(const QByteArray &value);
+    void setGamePlayAreaState(const QByteArray &value);
+    void setGameCardInfoSize(const QSize &value);
+    void setGameMessageLayoutSize(const QSize &value);
+    void setGamePlayerListSize(const QSize &value);
+
+    void setReplayPlayAreaGeometry(const QByteArray &value);
+    void setReplayPlayAreaState(const QByteArray &value);
+    void setReplayCardInfoSize(const QSize &value);
+    void setReplayMessageLayoutSize(const QSize &value);
+    void setReplayPlayerListSize(const QSize &value);
+    void setReplayReplaySize(const QSize &value);
+
+    const QByteArray getDeckEditorLayoutState();
+    const QByteArray getDeckEditorGeometry();
+    QSize getDeckEditorCardSize();
+    QSize getDeckEditorDeckSize();
+    QSize getDeckEditorPrintingSelectorSize();
+    QSize getDeckEditorFilterSize();
+    const QByteArray getDeckEditorDbHeaderState();
+    const QByteArray getSetsDialogHeaderState();
+
+    const QByteArray getGamePlayAreaLayoutState();
+    const QByteArray getGamePlayAreaGeometry();
+    const QSize getGameCardInfoSize();
+    const QSize getGameMessageLayoutSize();
+    const QSize getGamePlayerListSize();
+
+    const QByteArray getReplayPlayAreaLayoutState();
+    const QByteArray getReplayPlayAreaGeometry();
+    const QSize getReplayCardInfoSize();
+    const QSize getReplayMessageLayoutSize();
+    const QSize getReplayPlayerListSize();
+    const QSize getReplayReplaySize();
+signals:
+
+public slots:
+
+private:
+    explicit LayoutsSettings(const QString &settingPath, QObject *parent = nullptr);
+    LayoutsSettings(const LayoutsSettings & /*other*/);
+};
+
+#endif // LAYOUTSSETTINGS_H
diff --git a/cockatrice/src/settings/message_settings.cpp b/cockatrice/src/settings/message_settings.cpp
new file mode 100644
index 000000000..786ea9cd1
--- /dev/null
+++ b/cockatrice/src/settings/message_settings.cpp
@@ -0,0 +1,26 @@
+#include "message_settings.h"
+
+MessageSettings::MessageSettings(const QString &settingPath, QObject *parent)
+    : SettingsManager(settingPath + "messages.ini", parent)
+{
+}
+
+QString MessageSettings::getMessageAt(int index)
+{
+    return getValue(QString("msg%1").arg(index), "messages").toString();
+}
+
+int MessageSettings::getCount()
+{
+    return getValue("count", "messages").toInt();
+}
+
+void MessageSettings::setCount(int count)
+{
+    setValue(count, "count", "messages");
+}
+
+void MessageSettings::setMessageAt(int index, QString message)
+{
+    setValue(message, QString("msg%1").arg(index), "messages");
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/message_settings.h b/cockatrice/src/settings/message_settings.h
similarity index 75%
rename from libcockatrice_settings/libcockatrice/settings/message_settings.h
rename to cockatrice/src/settings/message_settings.h
index ec70027af..6d65ce6e8 100644
--- a/libcockatrice_settings/libcockatrice/settings/message_settings.h
+++ b/cockatrice/src/settings/message_settings.h
@@ -1,9 +1,3 @@
-/**
- * @file message_settings.h
- * @ingroup NetworkSettings
- * @brief TODO: Document this.
- */
-
 #ifndef MESSAGESETTINGS_H
 #define MESSAGESETTINGS_H
 
@@ -15,8 +9,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/cockatrice/src/settings/recents_settings.cpp
similarity index 64%
rename from libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
rename to cockatrice/src/settings/recents_settings.cpp
index 76bc4069e..5bbec3c8c 100644
--- a/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
+++ b/cockatrice/src/settings/recents_settings.cpp
@@ -3,22 +3,22 @@
 #define MAX_RECENT_DECK_COUNT 10
 
 RecentsSettings::RecentsSettings(const QString &settingPath, QObject *parent)
-    : SettingsManager(settingPath + "recents.ini", "deckbuilder", QString(), parent)
+    : SettingsManager(settingPath + "recents.ini", parent)
 {
 }
 
-QStringList RecentsSettings::getRecentlyOpenedDeckPaths() const
+QStringList RecentsSettings::getRecentlyOpenedDeckPaths()
 {
-    return getValue("deckpaths").toStringList();
+    return getValue("deckpaths", "deckbuilder").toStringList();
 }
 void RecentsSettings::clearRecentlyOpenedDeckPaths()
 {
-    deleteValue("deckpaths");
+    deleteValue("deckpaths", "deckbuilder");
     emit recentlyOpenedDeckPathsChanged();
 }
 void RecentsSettings::updateRecentlyOpenedDeckPaths(const QString &deckPath)
 {
-    auto deckPaths = getValue("deckpaths").toStringList();
+    auto deckPaths = getValue("deckpaths", "deckbuilder").toStringList();
     deckPaths.removeAll(deckPath);
 
     deckPaths.prepend(deckPath);
@@ -27,11 +27,11 @@ void RecentsSettings::updateRecentlyOpenedDeckPaths(const QString &deckPath)
         deckPaths.removeLast();
     }
 
-    setValue(deckPaths, "deckpaths");
+    setValue(deckPaths, "deckpaths", "deckbuilder");
     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/cockatrice/src/settings/recents_settings.h
similarity index 75%
rename from libcockatrice_settings/libcockatrice/settings/recents_settings.h
rename to cockatrice/src/settings/recents_settings.h
index 3aebff334..6e91cd2f0 100644
--- a/libcockatrice_settings/libcockatrice/settings/recents_settings.h
+++ b/cockatrice/src/settings/recents_settings.h
@@ -1,9 +1,3 @@
-/**
- * @file recents_settings.h
- * @ingroup DeckSettings
- * @brief TODO: Document this.
- */
-
 #ifndef RECENTS_SETTINGS_H
 #define RECENTS_SETTINGS_H
 
@@ -18,11 +12,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/cockatrice/src/settings/servers_settings.cpp
similarity index 86%
rename from libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
rename to cockatrice/src/settings/servers_settings.cpp
index 0140182be..01a6c795b 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
+++ b/cockatrice/src/settings/servers_settings.cpp
@@ -4,34 +4,34 @@
 #include <utility>
 
 ServersSettings::ServersSettings(const QString &settingPath, QObject *parent)
-    : SettingsManager(settingPath + "servers.ini", "server", QString(), parent)
+    : SettingsManager(settingPath + "servers.ini", parent)
 {
 }
 
 void ServersSettings::setPreviousHostLogin(int previous)
 {
-    setValue(previous, "previoushostlogin");
+    setValue(previous, "previoushostlogin", "server");
 }
 
-int ServersSettings::getPreviousHostLogin() const
+int ServersSettings::getPreviousHostLogin()
 {
-    QVariant previous = getValue("previoushostlogin");
+    QVariant previous = getValue("previoushostlogin", "server");
     return previous == QVariant() ? 1 : previous.toInt();
 }
 
 void ServersSettings::setPreviousHostList(QStringList list)
 {
-    setValue(list, "previoushosts");
+    setValue(list, "previoushosts", "server");
 }
 
-QStringList ServersSettings::getPreviousHostList() const
+QStringList ServersSettings::getPreviousHostList()
 {
-    return getValue("previoushosts").toStringList();
+    return getValue("previoushosts", "server").toStringList();
 }
 
 void ServersSettings::setPrevioushostName(const QString &name)
 {
-    setValue(name, "previoushostName");
+    setValue(name, "previoushostName", "server");
 }
 
 QString ServersSettings::getSaveName(QString defaultname)
@@ -48,13 +48,13 @@ QString ServersSettings::getSite(QString defaultSite)
     return site == QVariant() ? std::move(defaultSite) : site.toString();
 }
 
-QString ServersSettings::getPrevioushostName() const
+QString ServersSettings::getPrevioushostName()
 {
-    QVariant value = getValue("previoushostName");
+    QVariant value = getValue("previoushostName", "server");
     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();
 
@@ -65,14 +65,14 @@ int ServersSettings::getPrevioushostindex(const QString &saveName) const
     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");
@@ -80,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");
@@ -98,7 +98,7 @@ QString ServersSettings::getPassword()
     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();
@@ -107,56 +107,56 @@ bool ServersSettings::getSavePassword() const
 
 void ServersSettings::setAutoConnect(int autoconnect)
 {
-    setValue(autoconnect, "auto_connect");
+    setValue(autoconnect, "auto_connect", "server");
 }
 
-int ServersSettings::getAutoConnect() const
+int ServersSettings::getAutoConnect()
 {
-    QVariant autoconnect = getValue("auto_connect");
+    QVariant autoconnect = getValue("auto_connect", "server");
     return autoconnect == QVariant() ? 0 : autoconnect.toInt();
 }
 
 void ServersSettings::setFPHostName(QString hostname)
 {
-    setValue(hostname, "fphostname");
+    setValue(hostname, "fphostname", "server");
 }
 
-QString ServersSettings::getFPHostname(QString defaultHost) const
+QString ServersSettings::getFPHostname(QString defaultHost)
 {
-    QVariant hostname = getValue("fphostname");
+    QVariant hostname = getValue("fphostname", "server");
     return hostname == QVariant() ? std::move(defaultHost) : hostname.toString();
 }
 
 void ServersSettings::setFPPort(QString port)
 {
-    setValue(port, "fpport");
+    setValue(port, "fpport", "server");
 }
 
-QString ServersSettings::getFPPort(QString defaultPort) const
+QString ServersSettings::getFPPort(QString defaultPort)
 {
-    QVariant port = getValue("fpport");
+    QVariant port = getValue("fpport", "server");
     return port == QVariant() ? std::move(defaultPort) : port.toString();
 }
 
 void ServersSettings::setFPPlayerName(QString playerName)
 {
-    setValue(playerName, "fpplayername");
+    setValue(playerName, "fpplayername", "server");
 }
 
-QString ServersSettings::getFPPlayerName(QString defaultName) const
+QString ServersSettings::getFPPlayerName(QString defaultName)
 {
-    QVariant name = getValue("fpplayername");
+    QVariant name = getValue("fpplayername", "server");
     return name == QVariant() ? std::move(defaultName) : name.toString();
 }
 
 void ServersSettings::setClearDebugLogStatus(bool abIsChecked)
 {
-    setValue(abIsChecked, "save_debug_log");
+    setValue(abIsChecked, "save_debug_log", "server");
 }
 
-bool ServersSettings::getClearDebugLogStatus(bool abDefaultValue) const
+bool ServersSettings::getClearDebugLogStatus(bool abDefaultValue)
 {
-    QVariant cbFlushLog = getValue("save_debug_log");
+    QVariant cbFlushLog = getValue("save_debug_log", "server");
     return cbFlushLog == QVariant() ? abDefaultValue : cbFlushLog.toBool();
 }
 
diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.h b/cockatrice/src/settings/servers_settings.h
similarity index 79%
rename from libcockatrice_settings/libcockatrice/settings/servers_settings.h
rename to cockatrice/src/settings/servers_settings.h
index 22603a356..9bf5c47d7 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.h
+++ b/cockatrice/src/settings/servers_settings.h
@@ -1,9 +1,3 @@
-/**
- * @file servers_settings.h
- * @ingroup NetworkSettings
- * @brief TODO: Document this.
- */
-
 #ifndef SERVERSSETTINGS_H
 #define SERVERSSETTINGS_H
 
@@ -22,21 +16,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 +61,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/cockatrice/src/settings/settings_manager.cpp b/cockatrice/src/settings/settings_manager.cpp
new file mode 100644
index 000000000..dc2da741e
--- /dev/null
+++ b/cockatrice/src/settings/settings_manager.cpp
@@ -0,0 +1,82 @@
+#include "settings_manager.h"
+
+SettingsManager::SettingsManager(const QString &settingPath, QObject *parent)
+    : QObject(parent), settings(settingPath, QSettings::IniFormat)
+{
+}
+
+void SettingsManager::setValue(const QVariant &value,
+                               const QString &name,
+                               const QString &group,
+                               const QString &subGroup)
+{
+    if (!group.isEmpty()) {
+        settings.beginGroup(group);
+    }
+
+    if (!subGroup.isEmpty()) {
+        settings.beginGroup(subGroup);
+    }
+
+    settings.setValue(name, value);
+
+    if (!subGroup.isEmpty()) {
+        settings.endGroup();
+    }
+
+    if (!group.isEmpty()) {
+        settings.endGroup();
+    }
+}
+
+void SettingsManager::deleteValue(const QString &name, const QString &group, const QString &subGroup)
+{
+    if (!group.isEmpty()) {
+        settings.beginGroup(group);
+    }
+
+    if (!subGroup.isEmpty()) {
+        settings.beginGroup(subGroup);
+    }
+
+    settings.remove(name);
+
+    if (!subGroup.isEmpty()) {
+        settings.endGroup();
+    }
+
+    if (!group.isEmpty()) {
+        settings.endGroup();
+    }
+}
+
+QVariant SettingsManager::getValue(const QString &name, const QString &group, const QString &subGroup)
+{
+    if (!group.isEmpty()) {
+        settings.beginGroup(group);
+    }
+
+    if (!subGroup.isEmpty()) {
+        settings.beginGroup(subGroup);
+    }
+
+    QVariant value = settings.value(name);
+
+    if (!subGroup.isEmpty()) {
+        settings.endGroup();
+    }
+
+    if (!group.isEmpty()) {
+        settings.endGroup();
+    }
+
+    return value;
+}
+
+/**
+ * Calls sync on the underlying QSettings object
+ */
+void SettingsManager::sync()
+{
+    settings.sync();
+}
\ No newline at end of file
diff --git a/cockatrice/src/settings/settings_manager.h b/cockatrice/src/settings/settings_manager.h
new file mode 100644
index 000000000..cd1242962
--- /dev/null
+++ b/cockatrice/src/settings/settings_manager.h
@@ -0,0 +1,23 @@
+#ifndef SETTINGSMANAGER_H
+#define SETTINGSMANAGER_H
+
+#include <QObject>
+#include <QSettings>
+#include <QStringList>
+#include <QVariant>
+
+class SettingsManager : public QObject
+{
+    Q_OBJECT
+public:
+    explicit SettingsManager(const QString &settingPath, QObject *parent = nullptr);
+    QVariant getValue(const QString &name, const QString &group = "", const QString &subGroup = "");
+    void sync();
+
+protected:
+    QSettings settings;
+    void setValue(const QVariant &value, const QString &name, const QString &group = "", const QString &subGroup = "");
+    void deleteValue(const QString &name, const QString &group = "", const QString &subGroup = "");
+};
+
+#endif // SETTINGSMANAGER_H
diff --git a/cockatrice/src/client/settings/shortcut_treeview.cpp b/cockatrice/src/settings/shortcut_treeview.cpp
similarity index 96%
rename from cockatrice/src/client/settings/shortcut_treeview.cpp
rename to cockatrice/src/settings/shortcut_treeview.cpp
index b909d47ac..6b329b23d 100644
--- a/cockatrice/src/client/settings/shortcut_treeview.cpp
+++ b/cockatrice/src/settings/shortcut_treeview.cpp
@@ -150,7 +150,12 @@ void ShortcutTreeView::currentChanged(const QModelIndex &current, const QModelIn
  */
 void ShortcutTreeView::updateSearchString(const QString &searchString)
 {
-    QStringList searchWords = searchString.split(" ", Qt::SkipEmptyParts);
+#if QT_VERSION > QT_VERSION_CHECK(5, 14, 0)
+    const auto skipEmptyParts = Qt::SkipEmptyParts;
+#else
+    const auto skipEmptyParts = QString::SkipEmptyParts;
+#endif
+    QStringList searchWords = searchString.split(" ", skipEmptyParts);
 
     auto escapeRegex = [](const QString &s) { return QRegularExpression::escape(s); };
     std::transform(searchWords.begin(), searchWords.end(), searchWords.begin(), escapeRegex);
diff --git a/cockatrice/src/client/settings/shortcut_treeview.h b/cockatrice/src/settings/shortcut_treeview.h
similarity index 83%
rename from cockatrice/src/client/settings/shortcut_treeview.h
rename to cockatrice/src/settings/shortcut_treeview.h
index 8d74a6f1e..dc96d0360 100644
--- a/cockatrice/src/client/settings/shortcut_treeview.h
+++ b/cockatrice/src/settings/shortcut_treeview.h
@@ -1,12 +1,7 @@
-/**
- * @file shortcut_treeview.h
- * @ingroup CoreSettings
- * @brief TODO: Document this.
- */
-
 #ifndef SHORTCUT_TREEVIEW_H
 #define SHORTCUT_TREEVIEW_H
 
+#include <QModelIndex>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 #include <QTreeView>
@@ -21,7 +16,7 @@ public:
     explicit ShortcutFilterProxyModel(QObject *parent = nullptr);
 
 protected:
-    [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 };
 
 class ShortcutTreeView : public QTreeView
diff --git a/cockatrice/src/client/settings/shortcuts_settings.cpp b/cockatrice/src/settings/shortcuts_settings.cpp
similarity index 100%
rename from cockatrice/src/client/settings/shortcuts_settings.cpp
rename to cockatrice/src/settings/shortcuts_settings.cpp
diff --git a/cockatrice/src/client/settings/shortcuts_settings.h b/cockatrice/src/settings/shortcuts_settings.h
similarity index 91%
rename from cockatrice/src/client/settings/shortcuts_settings.h
rename to cockatrice/src/settings/shortcuts_settings.h
index 1de73c165..3f7b94148 100644
--- a/cockatrice/src/client/settings/shortcuts_settings.h
+++ b/cockatrice/src/settings/shortcuts_settings.h
@@ -1,9 +1,3 @@
-/**
- * @file shortcuts_settings.h
- * @ingroup CoreSettings
- * @brief TODO: Document this.
- */
-
 #ifndef SHORTCUTSSETTINGS_H
 #define SHORTCUTSSETTINGS_H
 
@@ -33,7 +27,6 @@ public:
         Move_bottom,
         Gameplay,
         Drawing,
-        Hand,
         Chat_room,
         Game_window,
         Load_deck,
@@ -72,8 +65,6 @@ public:
                 return QApplication::translate("shortcutsTab", "Gameplay");
             case Drawing:
                 return QApplication::translate("shortcutsTab", "Drawing");
-            case Hand:
-                return QApplication::translate("shortcutsTab", "Hand");
             case Chat_room:
                 return QApplication::translate("shortcutsTab", "Chat Room");
             case Game_window:
@@ -99,15 +90,15 @@ public:
     void setSequence(const QList &_sequence)
     {
         QList::operator=(_sequence);
-    }
-    [[nodiscard]] QString getName() const
+    };
+    QString getName() const
     {
         return QApplication::translate("shortcutsTab", name.toUtf8().data());
-    }
-    [[nodiscard]] QString getGroupName() const
+    };
+    QString getGroupName() const
     {
         return ShortcutGroup::getGroupName(group);
-    }
+    };
 
 private:
     QString name;
@@ -120,24 +111,24 @@ class ShortcutsSettings : public QObject
 public:
     explicit ShortcutsSettings(const QString &settingsFilePath, QObject *parent = nullptr);
 
-    [[nodiscard]] ShortcutKey getDefaultShortcut(const QString &name) const;
-    [[nodiscard]] ShortcutKey getShortcut(const QString &name) const;
-    [[nodiscard]] QKeySequence getSingleShortcut(const QString &name) const;
-    [[nodiscard]] QString getDefaultShortcutString(const QString &name) const;
-    [[nodiscard]] QString getShortcutString(const QString &name) const;
-    [[nodiscard]] QString getShortcutFriendlyName(const QString &shortcutName) const;
-    [[nodiscard]] QList<QString> getAllShortcutKeys() const
+    ShortcutKey getDefaultShortcut(const QString &name) const;
+    ShortcutKey getShortcut(const QString &name) const;
+    QKeySequence getSingleShortcut(const QString &name) const;
+    QString getDefaultShortcutString(const QString &name) const;
+    QString getShortcutString(const QString &name) const;
+    QString getShortcutFriendlyName(const QString &shortcutName) const;
+    QList<QString> getAllShortcutKeys() const
     {
         return shortCuts.keys();
-    }
+    };
 
     void setShortcuts(const QString &name, const QList<QKeySequence> &Sequence);
     void setShortcuts(const QString &name, const QKeySequence &Sequence);
     void setShortcuts(const QString &name, const QString &sequences);
 
-    [[nodiscard]] bool isKeyAllowed(const QString &name, const QString &sequences) const;
-    [[nodiscard]] bool isValid(const QString &name, const QString &sequences) const;
-    [[nodiscard]] QStringList findOverlaps(const QString &name, const QString &sequences) const;
+    bool isKeyAllowed(const QString &name, const QString &sequences) const;
+    bool isValid(const QString &name, const QString &sequences) const;
+    QStringList findOverlaps(const QString &name, const QString &sequences) const;
 
     void resetAllShortcuts();
     void clearAllShortcuts();
@@ -152,8 +143,8 @@ private:
     QString settingsFilePath;
     QHash<QString, ShortcutKey> shortCuts;
 
-    [[nodiscard]] QString stringifySequence(const QList<QKeySequence> &Sequence) const;
-    [[nodiscard]] QList<QKeySequence> parseSequenceString(const QString &stringSequence) const;
+    QString stringifySequence(const QList<QKeySequence> &Sequence) const;
+    QList<QKeySequence> parseSequenceString(const QString &stringSequence) const;
 
     const QHash<QString, ShortcutKey> defaultShortCuts = {
         {"MainWindow/aCheckCardUpdates", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Check for Card Updates..."),
@@ -501,7 +492,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 +504,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)},
@@ -546,9 +534,6 @@ private:
         {"Player/aSelectColumn", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Select All Cards in Column"),
                                              parseSequenceString("Ctrl+Shift+C"),
                                              ShortcutGroup::Playing_Area)},
-        {"Player/aRevealToAll", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Reveal Selected Cards to All Players"),
-                                            parseSequenceString(""),
-                                            ShortcutGroup::Playing_Area)},
         {"Player/aMoveToBottomLibrary", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Bottom of Library"),
                                                     parseSequenceString("Ctrl+B"),
                                                     ShortcutGroup::Move_selected)},
@@ -563,11 +548,17 @@ 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/aSortHand", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Sort Hand"),
+                                         parseSequenceString("Ctrl+Shift+H"),
+                                         ShortcutGroup::View)},
         {"Player/aViewGraveyard",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard"), parseSequenceString("F4"), ShortcutGroup::View)},
         {"Player/aViewLibrary",
@@ -598,19 +589,11 @@ private:
         {"Player/aMoveTopCardsToGraveyard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple)"),
                                                         parseSequenceString("Alt+M"),
                                                         ShortcutGroup::Move_top)},
-        {"Player/aMoveTopCardsToGraveyardFaceDown",
-         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple), Face Down"),
-                     parseSequenceString(""),
-                     ShortcutGroup::Move_top)},
         {"Player/aMoveTopCardToExile",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::Move_top)},
         {"Player/aMoveTopCardsToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple)"),
                                                     parseSequenceString(""),
                                                     ShortcutGroup::Move_top)},
-        {"Player/aMoveTopCardsToExileFaceDown",
-         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple), Face Down"),
-                     parseSequenceString(""),
-                     ShortcutGroup::Move_top)},
         {"Player/aMoveTopCardsUntil", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Stack Until Found"),
                                                   parseSequenceString("Ctrl+Shift+Y"),
                                                   ShortcutGroup::Move_top)},
@@ -628,19 +611,11 @@ private:
         {"Player/aMoveBottomCardsToGrave", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple)"),
                                                        parseSequenceString(""),
                                                        ShortcutGroup::Move_bottom)},
-        {"Player/aMoveBottomCardsToGraveFaceDown",
-         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple), Face Down"),
-                     parseSequenceString(""),
-                     ShortcutGroup::Move_bottom)},
         {"Player/aMoveBottomCardToExile",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::Move_bottom)},
         {"Player/aMoveBottomCardsToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple)"),
                                                        parseSequenceString(""),
                                                        ShortcutGroup::Move_bottom)},
-        {"Player/aMoveBottomCardsToExileFaceDown",
-         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple), Face Down"),
-                     parseSequenceString(""),
-                     ShortcutGroup::Move_bottom)},
         {"Player/aMoveBottomCardToTop", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Top of Library"),
                                                     parseSequenceString(""),
                                                     ShortcutGroup::Move_bottom)},
@@ -676,12 +651,6 @@ private:
         {"Player/aMulligan", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Mulligan"),
                                          parseSequenceString("Ctrl+M"),
                                          ShortcutGroup::Drawing)},
-        {"Player/aMulliganSame", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Mulligan (Same hand size)"),
-                                             parseSequenceString("Ctrl+Shift+M"),
-                                             ShortcutGroup::Drawing)},
-        {"Player/aMulliganMinusOne", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Mulligan (Hand size - 1)"),
-                                                 parseSequenceString("Ctrl+Shift+Alt+M"),
-                                                 ShortcutGroup::Drawing)},
         {"Player/aDrawCard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Draw a Card"),
                                          parseSequenceString("Ctrl+D"),
                                          ShortcutGroup::Drawing)},
@@ -697,22 +666,6 @@ private:
         {"Player/aAlwaysLookAtTopCard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Always Look At Top Card"),
                                                     parseSequenceString("Ctrl+Shift+N"),
                                                     ShortcutGroup::Drawing)},
-        {"Player/aSortHandByName", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Sort Hand by Name"),
-                                               parseSequenceString(""),
-                                               ShortcutGroup::Hand)},
-        {"Player/aSortHandByType", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Sort Hand by Type"),
-                                               parseSequenceString("Ctrl+Shift+H"),
-                                               ShortcutGroup::Hand)},
-        {"Player/aSortHandByManaValue", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Sort Hand by Mana Value"),
-                                                    parseSequenceString(""),
-                                                    ShortcutGroup::Hand)},
-        {"Player/aRevealHandToAll", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Reveal Hand to All Players"),
-                                                parseSequenceString(""),
-                                                ShortcutGroup::Hand)},
-        {"Player/aRevealRandomHandCardToAll",
-         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Reveal Random Card to All Players"),
-                     parseSequenceString(""),
-                     ShortcutGroup::Hand)},
         {"Player/aRotateViewCW", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Rotate View Clockwise"),
                                              parseSequenceString(""),
                                              ShortcutGroup::Gameplay)},
diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
new file mode 100644
index 000000000..3bd29b577
--- /dev/null
+++ b/cockatrice/src/tabs/abstract_tab_deck_editor.cpp
@@ -0,0 +1,608 @@
+#include "abstract_tab_deck_editor.h"
+
+#include "../client/tapped_out_interface.h"
+#include "../database/card_database_manager.h"
+#include "../database/model/card_database_model.h"
+#include "../deck/deck_stats_interface.h"
+#include "../dialogs/dlg_load_deck.h"
+#include "../dialogs/dlg_load_deck_from_clipboard.h"
+#include "../dialogs/dlg_load_deck_from_website.h"
+#include "../interface/pixel_map_generator.h"
+#include "../interface/widgets/cards/card_info_frame_widget.h"
+#include "../picture_loader/picture_loader.h"
+#include "../server/abstract_client.h"
+#include "../server/pending_command.h"
+#include "../settings/cache_settings.h"
+#include "pb/command_deck_upload.pb.h"
+#include "pb/response.pb.h"
+#include "tab_supervisor.h"
+#include "trice_limits.h"
+
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QCloseEvent>
+#include <QDebug>
+#include <QDesktopServices>
+#include <QDir>
+#include <QFileDialog>
+#include <QHeaderView>
+#include <QLineEdit>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QPrintPreviewDialog>
+#include <QPrinter>
+#include <QProcessEnvironment>
+#include <QPushButton>
+#include <QRegularExpression>
+#include <QSplitter>
+#include <QTextStream>
+#include <QTreeView>
+#include <QUrl>
+
+AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
+{
+    setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
+
+    databaseDisplayDockWidget = new DeckEditorDatabaseDisplayWidget(this);
+    deckDockWidget = new DeckEditorDeckDockWidget(this);
+    cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this);
+    filterDockWidget = new DeckEditorFilterDockWidget(this);
+    printingSelectorDockWidget = new DeckEditorPrintingSelectorDockWidget(this);
+
+    connect(deckDockWidget, &DeckEditorDeckDockWidget::deckChanged, this, &AbstractTabDeckEditor::onDeckChanged);
+    connect(deckDockWidget, &DeckEditorDeckDockWidget::deckModified, this, &AbstractTabDeckEditor::onDeckModified);
+    connect(deckDockWidget, &DeckEditorDeckDockWidget::cardChanged, this, &AbstractTabDeckEditor::updateCard);
+    connect(this, &AbstractTabDeckEditor::decrementCard, deckDockWidget, &DeckEditorDeckDockWidget::actDecrementCard);
+    connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::cardChanged, this,
+            &AbstractTabDeckEditor::updateCard);
+    connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::addCardToMainDeck, this,
+            &AbstractTabDeckEditor::actAddCard);
+    connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::addCardToSideboard, this,
+            &AbstractTabDeckEditor::actAddCardToSideboard);
+    connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromMainDeck, this,
+            &AbstractTabDeckEditor::actDecrementCard);
+    connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromSideboard, this,
+            &AbstractTabDeckEditor::actDecrementCardFromSideboard);
+
+    connect(filterDockWidget, &DeckEditorFilterDockWidget::clearAllDatabaseFilters, databaseDisplayDockWidget,
+            &DeckEditorDatabaseDisplayWidget::clearAllDatabaseFilters);
+
+    connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
+            &AbstractTabDeckEditor::refreshShortcuts);
+}
+
+void AbstractTabDeckEditor::updateCard(const ExactCard &card)
+{
+    cardInfoDockWidget->updateCard(card);
+    printingSelectorDockWidget->printingSelector->setCard(card.getCardPtr(), DECK_ZONE_MAIN);
+}
+
+void AbstractTabDeckEditor::onDeckChanged()
+{
+}
+
+void AbstractTabDeckEditor::onDeckModified()
+{
+    setModified(!isBlankNewDeck());
+    deckMenu->setSaveStatus(!isBlankNewDeck());
+}
+
+void AbstractTabDeckEditor::addCardHelper(const ExactCard &card, QString zoneName)
+{
+    if (!card)
+        return;
+    if (card.getInfo().getIsToken())
+        zoneName = DECK_ZONE_TOKENS;
+
+    QModelIndex newCardIndex = deckDockWidget->deckModel->addCard(card, zoneName);
+    // recursiveExpand(newCardIndex);
+    deckDockWidget->deckView->clearSelection();
+    deckDockWidget->deckView->setCurrentIndex(newCardIndex);
+    setModified(true);
+    databaseDisplayDockWidget->searchEdit->setSelection(0, databaseDisplayDockWidget->searchEdit->text().length());
+}
+
+void AbstractTabDeckEditor::actAddCard(const ExactCard &card)
+{
+    if (QApplication::keyboardModifiers() & Qt::ControlModifier)
+        actAddCardToSideboard(card);
+    else
+        addCardHelper(card, DECK_ZONE_MAIN);
+    deckMenu->setSaveStatus(true);
+}
+
+void AbstractTabDeckEditor::actAddCardToSideboard(const ExactCard &card)
+{
+    addCardHelper(card, DECK_ZONE_SIDE);
+    deckMenu->setSaveStatus(true);
+}
+
+void AbstractTabDeckEditor::actDecrementCard(const ExactCard &card)
+{
+    emit decrementCard(card, DECK_ZONE_MAIN);
+}
+
+void AbstractTabDeckEditor::actDecrementCardFromSideboard(const ExactCard &card)
+{
+    emit decrementCard(card, DECK_ZONE_SIDE);
+}
+
+void AbstractTabDeckEditor::actSwapCard(const ExactCard &card, const QString &zoneName)
+{
+    QString providerId = card.getPrinting().getUuid();
+    QString collectorNumber = card.getPrinting().getProperty("num");
+
+    QModelIndex foundCard = deckDockWidget->deckModel->findCard(card.getName(), zoneName, providerId, collectorNumber);
+    if (!foundCard.isValid()) {
+        foundCard = deckDockWidget->deckModel->findCard(card.getName(), zoneName);
+    }
+
+    deckDockWidget->swapCard(foundCard);
+}
+
+/**
+ * Opens the deck in this tab.
+ * @param deck The deck. Takes ownership of the object
+ */
+void AbstractTabDeckEditor::openDeck(DeckLoader *deck)
+{
+    setDeck(deck);
+
+    if (!deck->getLastFileName().isEmpty()) {
+        SettingsCache::instance().recents().updateRecentlyOpenedDeckPaths(deck->getLastFileName());
+    }
+}
+
+/**
+ * Sets the currently active deck for this tab
+ * @param _deck The deck. Takes ownership of the object
+ */
+void AbstractTabDeckEditor::setDeck(DeckLoader *_deck)
+{
+    deckDockWidget->setDeck(_deck);
+    PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckList()->getCardRefList()));
+    setModified(false);
+
+    // If they load a deck, make the deck list appear
+    aDeckDockVisible->setChecked(true);
+    deckDockWidget->setVisible(aDeckDockVisible->isChecked());
+}
+
+DeckLoader *AbstractTabDeckEditor::getDeckList() const
+{
+    return deckDockWidget->getDeckList();
+}
+
+void AbstractTabDeckEditor::setModified(bool _modified)
+{
+    modified = _modified;
+    emit tabTextChanged(this, getTabText());
+}
+
+/**
+ * @brief Returns true if this tab is a blank newly opened tab, as if it was just created with the `New Deck` action.
+ */
+bool AbstractTabDeckEditor::isBlankNewDeck() const
+{
+    DeckLoader *deck = getDeckList();
+    return !modified && deck->isBlankDeck() && deck->hasNotBeenLoaded();
+}
+
+void AbstractTabDeckEditor::actNewDeck()
+{
+    auto deckOpenLocation = confirmOpen(false);
+
+    if (deckOpenLocation == CANCELLED) {
+        return;
+    }
+
+    if (deckOpenLocation == NEW_TAB) {
+        emit openDeckEditor(nullptr);
+        return;
+    }
+
+    cleanDeckAndResetModified();
+}
+
+void AbstractTabDeckEditor::cleanDeckAndResetModified()
+{
+    deckMenu->setSaveStatus(false);
+    deckDockWidget->cleanDeck();
+    setModified(false);
+}
+
+/**
+ * @brief Displays the save confirmation dialogue that is shown before loading a deck, if required. Takes into
+ * account the `openDeckInNewTab` settting.
+ *
+ * @param openInSameTabIfBlank Open the deck in the same tab instead of a new tab if the current tab is completely
+ * blank. Only relevant when the `openDeckInNewTab` setting is enabled.
+ *
+ * @returns An enum that indicates if and where to load the deck
+ */
+AbstractTabDeckEditor::DeckOpenLocation AbstractTabDeckEditor::confirmOpen(const bool openInSameTabIfBlank)
+{
+    // handle `openDeckInNewTab` setting
+    if (SettingsCache::instance().getOpenDeckInNewTab()) {
+        if (openInSameTabIfBlank && isBlankNewDeck()) {
+            return SAME_TAB;
+        } else {
+            return NEW_TAB;
+        }
+    }
+
+    // early return if deck is unmodified
+    if (!modified) {
+        return SAME_TAB;
+    }
+
+    // do the save confirmation dialogue
+    tabSupervisor->setCurrentWidget(this);
+
+    QMessageBox *msgBox = createSaveConfirmationWindow();
+    QPushButton *newTabButton = msgBox->addButton(tr("Open in new tab"), QMessageBox::ApplyRole);
+
+    int ret = msgBox->exec();
+
+    // `exec()` returns an opaque value if a non-standard button was clicked.
+    // Directly check if newTabButton was clicked before switching over the standard buttons.
+    if (msgBox->clickedButton() == newTabButton) {
+        return NEW_TAB;
+    }
+
+    switch (ret) {
+        case QMessageBox::Save:
+            return actSaveDeck() ? SAME_TAB : CANCELLED;
+        case QMessageBox::Discard:
+            return SAME_TAB;
+        default:
+            return CANCELLED;
+    }
+}
+
+/**
+ * @brief Creates the base save confirmation dialogue box.
+ *
+ * @returns A QMessageBox that can be further modified
+ */
+QMessageBox *AbstractTabDeckEditor::createSaveConfirmationWindow()
+{
+    QMessageBox *msgBox = new QMessageBox(this);
+    msgBox->setIcon(QMessageBox::Warning);
+    msgBox->setWindowTitle(tr("Are you sure?"));
+    msgBox->setText(tr("The decklist has been modified.\nDo you want to save the changes?"));
+    msgBox->setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+    return msgBox;
+}
+
+void AbstractTabDeckEditor::actLoadDeck()
+{
+    auto deckOpenLocation = confirmOpen();
+
+    if (deckOpenLocation == CANCELLED) {
+        return;
+    }
+
+    DlgLoadDeck dialog(this);
+    if (!dialog.exec())
+        return;
+
+    QString fileName = dialog.selectedFiles().at(0);
+    openDeckFromFile(fileName, deckOpenLocation);
+    deckDockWidget->updateBannerCardComboBox();
+}
+
+void AbstractTabDeckEditor::actOpenRecent(const QString &fileName)
+{
+    auto deckOpenLocation = confirmOpen();
+
+    if (deckOpenLocation == CANCELLED) {
+        return;
+    }
+
+    openDeckFromFile(fileName, deckOpenLocation);
+}
+
+/**
+ * Actually opens the deck from file
+ * @param fileName The path of the deck to open
+ * @param deckOpenLocation Which tab to open the deck
+ */
+void AbstractTabDeckEditor::openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation)
+{
+    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(fileName);
+
+    auto *l = new DeckLoader;
+    if (l->loadFromFile(fileName, fmt, true)) {
+        if (deckOpenLocation == NEW_TAB) {
+            emit openDeckEditor(l);
+            l->deleteLater();
+        } else {
+            deckMenu->setSaveStatus(false);
+            openDeck(l);
+        }
+    } else {
+        l->deleteLater();
+        QMessageBox::critical(this, tr("Error"), tr("Could not open deck at %1").arg(fileName));
+    }
+    deckMenu->setSaveStatus(true);
+}
+
+bool AbstractTabDeckEditor::actSaveDeck()
+{
+    DeckLoader *const deck = getDeckList();
+    if (deck->getLastRemoteDeckId() != -1) {
+        QString deckString = deck->writeToString_Native();
+        if (deckString.length() > MAX_FILE_LENGTH) {
+            QMessageBox::critical(this, tr("Error"), tr("Could not save remote deck"));
+            return false;
+        }
+
+        Command_DeckUpload cmd;
+        cmd.set_deck_id(static_cast<google::protobuf::uint32>(deck->getLastRemoteDeckId()));
+        cmd.set_deck_list(deckString.toStdString());
+
+        PendingCommand *pend = AbstractClient::prepareSessionCommand(cmd);
+        connect(pend, &PendingCommand::finished, this, &AbstractTabDeckEditor::saveDeckRemoteFinished);
+        tabSupervisor->getClient()->sendCommand(pend);
+
+        return true;
+    } else if (deck->getLastFileName().isEmpty())
+        return actSaveDeckAs();
+    else if (deck->saveToFile(deck->getLastFileName(), deck->getLastFileFormat())) {
+        setModified(false);
+        return true;
+    }
+    QMessageBox::critical(
+        this, tr("Error"),
+        tr("The deck could not be saved.\nPlease check that the directory is writable and try again."));
+    return false;
+}
+
+bool AbstractTabDeckEditor::actSaveDeckAs()
+{
+    QFileDialog dialog(this, tr("Save deck"));
+    dialog.setDirectory(SettingsCache::instance().getDeckPath());
+    dialog.setAcceptMode(QFileDialog::AcceptSave);
+    dialog.setDefaultSuffix("cod");
+    dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS);
+    dialog.selectFile(getDeckList()->getName().trimmed());
+
+    if (!dialog.exec())
+        return false;
+
+    QString fileName = dialog.selectedFiles().at(0);
+    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(fileName);
+
+    if (!getDeckList()->saveToFile(fileName, fmt)) {
+        QMessageBox::critical(
+            this, tr("Error"),
+            tr("The deck could not be saved.\nPlease check that the directory is writable and try again."));
+        return false;
+    }
+    setModified(false);
+
+    SettingsCache::instance().recents().updateRecentlyOpenedDeckPaths(fileName);
+
+    return true;
+}
+
+void AbstractTabDeckEditor::saveDeckRemoteFinished(const Response &response)
+{
+    if (response.response_code() != Response::RespOk)
+        QMessageBox::critical(this, tr("Error"), tr("The deck could not be saved."));
+    else
+        setModified(false);
+}
+
+void AbstractTabDeckEditor::actLoadDeckFromClipboard()
+{
+    auto deckOpenLocation = confirmOpen();
+
+    if (deckOpenLocation == CANCELLED) {
+        return;
+    }
+
+    DlgLoadDeckFromClipboard dlg(this);
+    if (!dlg.exec())
+        return;
+
+    if (deckOpenLocation == NEW_TAB) {
+        emit openDeckEditor(dlg.getDeckList());
+    } else {
+        setDeck(dlg.getDeckList());
+        setModified(true);
+    }
+
+    deckMenu->setSaveStatus(true);
+}
+
+void AbstractTabDeckEditor::editDeckInClipboard(bool annotated)
+{
+    DlgEditDeckInClipboard dlg(*getDeckList(), annotated, this);
+    if (!dlg.exec())
+        return;
+
+    setDeck(dlg.getDeckList());
+    setModified(true);
+
+    deckMenu->setSaveStatus(true);
+}
+
+void AbstractTabDeckEditor::actEditDeckInClipboard()
+{
+    editDeckInClipboard(true);
+}
+
+void AbstractTabDeckEditor::actEditDeckInClipboardRaw()
+{
+    editDeckInClipboard(false);
+}
+
+void AbstractTabDeckEditor::actSaveDeckToClipboard()
+{
+    getDeckList()->saveToClipboard(true, true);
+}
+
+void AbstractTabDeckEditor::actSaveDeckToClipboardNoSetInfo()
+{
+    getDeckList()->saveToClipboard(true, false);
+}
+
+void AbstractTabDeckEditor::actSaveDeckToClipboardRaw()
+{
+    getDeckList()->saveToClipboard(false, true);
+}
+
+void AbstractTabDeckEditor::actSaveDeckToClipboardRawNoSetInfo()
+{
+    getDeckList()->saveToClipboard(false, false);
+}
+
+void AbstractTabDeckEditor::actPrintDeck()
+{
+    auto *dlg = new QPrintPreviewDialog(this);
+    connect(dlg, &QPrintPreviewDialog::paintRequested, deckDockWidget->deckModel, &DeckListModel::printDeckList);
+    dlg->exec();
+}
+
+void AbstractTabDeckEditor::actLoadDeckFromWebsite()
+{
+    auto deckOpenLocation = confirmOpen();
+
+    if (deckOpenLocation == CANCELLED) {
+        return;
+    }
+
+    DlgLoadDeckFromWebsite dlg(this);
+    if (!dlg.exec())
+        return;
+
+    if (deckOpenLocation == NEW_TAB) {
+        emit openDeckEditor(dlg.getDeck());
+    } else {
+        setDeck(dlg.getDeck());
+        setModified(true);
+    }
+
+    deckMenu->setSaveStatus(true);
+}
+
+void AbstractTabDeckEditor::exportToDecklistWebsite(DeckLoader::DecklistWebsite website)
+{
+    // check if deck is not null
+    if (DeckLoader *const deck = getDeckList()) {
+        // Get the decklist url string from the deck loader class.
+        QString decklistUrlString = deck->exportDeckToDecklist(website);
+        // Check to make sure the string isn't empty.
+        if (QString::compare(decklistUrlString, "", Qt::CaseInsensitive) == 0) {
+            // Show an error if the deck is empty, and return.
+            QMessageBox::critical(this, tr("Error"), tr("There are no cards in your deck to be exported"));
+            return;
+        }
+        // Encode the string recieved from the model to make sure all characters are encoded.
+        // first we put it into a qurl object
+        QUrl decklistUrl = QUrl(decklistUrlString);
+        // we get the correctly encoded url.
+        decklistUrlString = decklistUrl.toEncoded();
+        // We open the url in the user's default browser
+        QDesktopServices::openUrl(decklistUrlString);
+    } else {
+        // if there's no deck loader object, return an error
+        QMessageBox::critical(this, tr("Error"), tr("No deck was selected to be exported."));
+    }
+}
+
+/**
+ * Exports the deck to www.decklist.org (the old website)
+ */
+void AbstractTabDeckEditor::actExportDeckDecklist()
+{
+    exportToDecklistWebsite(DeckLoader::DecklistOrg);
+}
+
+/**
+ * Exports the deck to www.decklist.xyz (the new website)
+ */
+void AbstractTabDeckEditor::actExportDeckDecklistXyz()
+{
+    exportToDecklistWebsite(DeckLoader::DecklistXyz);
+}
+
+void AbstractTabDeckEditor::actAnalyzeDeckDeckstats()
+{
+    auto *interface = new DeckStatsInterface(*databaseDisplayDockWidget->databaseModel->getDatabase(),
+                                             this); // it deletes itself when done
+    interface->analyzeDeck(getDeckList());
+}
+
+void AbstractTabDeckEditor::actAnalyzeDeckTappedout()
+{
+    auto *interface = new TappedOutInterface(*databaseDisplayDockWidget->databaseModel->getDatabase(),
+                                             this); // it deletes itself when done
+    interface->analyzeDeck(getDeckList());
+}
+
+void AbstractTabDeckEditor::filterTreeChanged(FilterTree *filterTree)
+{
+    databaseDisplayDockWidget->setFilterTree(filterTree);
+}
+
+void AbstractTabDeckEditor::closeEvent(QCloseEvent *event)
+{
+    emit deckEditorClosing(this);
+    event->accept();
+}
+
+// Method uses to sync docks state with menu items state
+bool AbstractTabDeckEditor::eventFilter(QObject *o, QEvent *e)
+{
+    if (e->type() == QEvent::Close) {
+        if (o == cardInfoDockWidget) {
+            aCardInfoDockVisible->setChecked(false);
+            aCardInfoDockFloating->setEnabled(false);
+        } else if (o == deckDockWidget) {
+            aDeckDockVisible->setChecked(false);
+            aDeckDockFloating->setEnabled(false);
+        } else if (o == filterDockWidget) {
+            aFilterDockVisible->setChecked(false);
+            aFilterDockFloating->setEnabled(false);
+        } else if (o == printingSelectorDockWidget) {
+            aPrintingSelectorDockVisible->setChecked(false);
+            aPrintingSelectorDockFloating->setEnabled(false);
+        }
+    }
+    if (o == this && e->type() == QEvent::Hide) {
+        LayoutsSettings &layouts = SettingsCache::instance().layouts();
+        layouts.setDeckEditorLayoutState(saveState());
+        layouts.setDeckEditorGeometry(saveGeometry());
+        layouts.setDeckEditorCardSize(cardInfoDockWidget->size());
+        layouts.setDeckEditorFilterSize(filterDockWidget->size());
+        layouts.setDeckEditorDeckSize(deckDockWidget->size());
+        layouts.setDeckEditorPrintingSelectorSize(printingSelectorDockWidget->size());
+    }
+    return false;
+}
+
+bool AbstractTabDeckEditor::confirmClose()
+{
+    if (modified) {
+        tabSupervisor->setCurrentWidget(this);
+        int ret = createSaveConfirmationWindow()->exec();
+        if (ret == QMessageBox::Save)
+            return actSaveDeck();
+        else if (ret == QMessageBox::Cancel)
+            return false;
+    }
+    return true;
+}
+
+bool AbstractTabDeckEditor::closeRequest()
+{
+    if (!confirmClose()) {
+        return false;
+    }
+
+    return close();
+}
\ No newline at end of file
diff --git a/cockatrice/src/tabs/abstract_tab_deck_editor.h b/cockatrice/src/tabs/abstract_tab_deck_editor.h
new file mode 100644
index 000000000..e280d747f
--- /dev/null
+++ b/cockatrice/src/tabs/abstract_tab_deck_editor.h
@@ -0,0 +1,160 @@
+#ifndef TAB_GENERIC_DECK_EDITOR_H
+#define TAB_GENERIC_DECK_EDITOR_H
+
+#include "../card/card_info.h"
+#include "../client/deck_editor_menu.h"
+#include "../interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h"
+#include "../interface/widgets/deck_editor/deck_editor_database_display_widget.h"
+#include "../interface/widgets/deck_editor/deck_editor_deck_dock_widget.h"
+#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
+#include "../interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h"
+#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
+#include "tab.h"
+
+class CardDatabaseModel;
+class CardDatabaseDisplayModel;
+
+class CardInfoFrameWidget;
+class DeckLoader;
+class DeckEditorMenu;
+class DeckEditorCardInfoDockWidget;
+class DeckEditorDatabaseDisplayWidget;
+class DeckEditorDeckDockWidget;
+class DeckEditorFilterDockWidget;
+class DeckEditorPrintingSelectorDockWidget;
+class DeckPreviewDeckTagsDisplayWidget;
+class Response;
+class FilterTreeModel;
+class FilterBuilder;
+
+class QTreeView;
+class QTextEdit;
+class QLabel;
+class QComboBox;
+class QGroupBox;
+class QMessageBox;
+class QHBoxLayout;
+class QVBoxLayout;
+class QPushButton;
+class QDockWidget;
+class QMenu;
+class QAction;
+
+class AbstractTabDeckEditor : public Tab
+{
+    Q_OBJECT
+
+    friend class DeckEditorMenu;
+
+public:
+    explicit AbstractTabDeckEditor(TabSupervisor *_tabSupervisor);
+
+    // UI and Navigation
+    virtual void createMenus() = 0;
+    [[nodiscard]] virtual QString getTabText() const override = 0;
+    bool confirmClose();
+    virtual void retranslateUi() override = 0;
+
+    // Deck Management
+    void openDeck(DeckLoader *deck);
+    DeckLoader *getDeckList() const;
+    void setModified(bool _windowModified);
+
+    // UI Elements
+    DeckEditorMenu *deckMenu;
+    DeckEditorDatabaseDisplayWidget *databaseDisplayDockWidget;
+    DeckEditorCardInfoDockWidget *cardInfoDockWidget;
+    DeckEditorDeckDockWidget *deckDockWidget;
+    DeckEditorFilterDockWidget *filterDockWidget;
+    DeckEditorPrintingSelectorDockWidget *printingSelectorDockWidget;
+
+public slots:
+    virtual void onDeckChanged();
+    virtual void onDeckModified();
+    void updateCard(const ExactCard &card);
+    void actAddCard(const ExactCard &card);
+    void actAddCardToSideboard(const ExactCard &card);
+    void actDecrementCard(const ExactCard &card);
+    void actDecrementCardFromSideboard(const ExactCard &card);
+    void actOpenRecent(const QString &fileName);
+    void filterTreeChanged(FilterTree *filterTree);
+    bool closeRequest() override;
+    virtual void showPrintingSelector() = 0;
+    virtual void dockTopLevelChanged(bool topLevel) = 0;
+
+signals:
+    void openDeckEditor(const DeckLoader *deckLoader);
+    void deckEditorClosing(AbstractTabDeckEditor *tab);
+    void decrementCard(const ExactCard &card, QString zoneName);
+
+protected slots:
+    // Deck Operations
+    virtual void actNewDeck();
+    void cleanDeckAndResetModified();
+    virtual void actLoadDeck();
+    bool actSaveDeck();
+    virtual bool actSaveDeckAs();
+    virtual void actLoadDeckFromClipboard();
+    void actEditDeckInClipboard();
+    void actEditDeckInClipboardRaw();
+    void actSaveDeckToClipboard();
+    void actSaveDeckToClipboardNoSetInfo();
+    void actSaveDeckToClipboardRaw();
+    void actSaveDeckToClipboardRawNoSetInfo();
+    void actPrintDeck();
+    void actLoadDeckFromWebsite();
+    void actExportDeckDecklist();
+    void actExportDeckDecklistXyz();
+    void actAnalyzeDeckDeckstats();
+    void actAnalyzeDeckTappedout();
+
+    // Remote Save
+    void saveDeckRemoteFinished(const Response &r);
+
+    // UI Layout Management
+    virtual void loadLayout() = 0;
+    virtual void restartLayout() = 0;
+    virtual void freeDocksSize() = 0;
+    virtual void refreshShortcuts() = 0;
+
+    void closeEvent(QCloseEvent *event) override;
+    bool eventFilter(QObject *o, QEvent *e) override;
+    virtual void dockVisibleTriggered() = 0;
+    virtual void dockFloatingTriggered() = 0;
+
+private:
+    virtual void setDeck(DeckLoader *_deck);
+    void editDeckInClipboard(bool annotated);
+    void exportToDecklistWebsite(DeckLoader::DecklistWebsite website);
+
+protected:
+    /**
+     * @brief Enum for selecting deck open location
+     */
+    enum DeckOpenLocation
+    {
+        CANCELLED,
+        SAME_TAB,
+        NEW_TAB
+    };
+
+    DeckOpenLocation confirmOpen(bool openInSameTabIfBlank = true);
+    QMessageBox *createSaveConfirmationWindow();
+    bool isBlankNewDeck() const;
+
+    // Helper functions for card actions
+    void addCardHelper(const ExactCard &card, QString zoneName);
+    void actSwapCard(const ExactCard &card, const QString &zoneName);
+    virtual void openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation);
+
+    // UI Menu Elements
+    QMenu *viewMenu, *cardInfoDockMenu, *deckDockMenu, *filterDockMenu, *printingSelectorDockMenu;
+
+    QAction *aResetLayout;
+    QAction *aCardInfoDockVisible, *aCardInfoDockFloating, *aDeckDockVisible, *aDeckDockFloating;
+    QAction *aFilterDockVisible, *aFilterDockFloating, *aPrintingSelectorDockVisible, *aPrintingSelectorDockFloating;
+
+    bool modified = false;
+};
+
+#endif // TAB_GENERIC_DECK_EDITOR_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp b/cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
similarity index 97%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
index 145a3fca0..f071949f2 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
+++ b/cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
@@ -2,6 +2,7 @@
 
 #include <QDebug>
 #include <QJsonArray>
+#include <QJsonDocument>
 #include <QJsonObject>
 
 void EdhrecApiResponseArchidektLink::fromJson(const QJsonObject &json)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h b/cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
similarity index 65%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
rename to cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
index d265c164d..b47101e78 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.h
@@ -1,15 +1,12 @@
 #ifndef ARCHIDEKTENTRY_H
 #define ARCHIDEKTENTRY_H
 
+#include <QDebug>
 #include <QJsonObject>
 #include <QString>
 #include <QVector>
 
-/**
- * @class EdhrecApiResponseArchidektLink
- * @ingroup ApiResponses
- * @brief Represents a single Archidekt entry
- */
+// Represents a single Archidekt entry
 class EdhrecApiResponseArchidektLink
 {
 public:
@@ -22,11 +19,7 @@ public:
     void debugPrint() const;
 };
 
-/**
- * @class EdhrecCommanderApiResponseArchidektLinks
- * @ingroup ApiResponses
- * @brief Represents the Archidekt section as a list of entries
- */
+// Represents the Archidekt section as a list of entries
 class EdhrecCommanderApiResponseArchidektLinks
 {
 public:
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h
similarity index 87%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h
rename to cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h
index 70d37cbae..2d330e3e8 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.h
@@ -6,14 +6,11 @@
 #include "../commander/edhrec_commander_api_response_average_deck_statistics.h"
 #include "edhrec_deck_api_response.h"
 
+#include <QDebug>
 #include <QJsonObject>
 #include <QString>
 
-/**
- * @class EdhrecAverageDeckApiResponse
- * @ingroup ApiResponses
- * @brief Represents the main structure of the JSON
- */
+// Represents the main structure of the JSON
 class EdhrecAverageDeckApiResponse
 {
 public:
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
similarity index 73%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
index 1cb070c30..c25f4e5aa 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
+++ b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
@@ -1,10 +1,12 @@
 #include "edhrec_deck_api_response.h"
 
+#include "../../../../../deck/deck_loader.h"
+
 #include <QApplication>
 #include <QDebug>
 #include <QJsonArray>
 #include <QJsonObject>
-#include <libcockatrice/card/import/card_name_normalizer.h>
+#include <QMainWindow>
 
 void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
 {
@@ -13,8 +15,10 @@ void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
         deckList += cardlistValue.toString() + "\n";
     }
 
+    deckLoader = new DeckLoader();
+
     QTextStream stream(&deckList);
-    deck.loadFromStream_Plain(stream, true, CardNameNormalizer());
+    deckLoader->loadFromStream_Plain(stream, true);
 }
 
 void EdhrecDeckApiResponse::debugPrint() const
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
similarity index 67%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
rename to cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
index cd4f9d99c..fe8be7f6c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h
@@ -1,13 +1,13 @@
-/**
- * @file edhrec_deck_api_response.h
- * @ingroup ApiResponses
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_DECK_API_RESPONSE_H
 #define EDHREC_DECK_API_RESPONSE_H
 
-#include "../../../../../../deck_loader/deck_loader.h"
+#include "../../../../../deck/deck_loader.h"
+
+#include <QDebug>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QString>
+#include <QVector>
 
 class EdhrecDeckApiResponse
 {
@@ -21,7 +21,7 @@ public:
     // Debug method for logging
     void debugPrint() const;
 
-    DeckList deck;
+    DeckLoader *deckLoader;
 };
 
 #endif // EDHREC_DECK_API_RESPONSE_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp b/cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h b/cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
similarity index 61%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
rename to cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
index 66a407acd..32e017a92 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
@@ -1,9 +1,3 @@
-/**
- * @file edhrec_api_response_card_prices.h
- * @ingroup ApiResponses
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_PRICES_H
 #define EDHREC_COMMANDER_API_RESPONSE_CARD_PRICES_H
 
@@ -20,39 +14,39 @@ public:
     void debugPrint() const;
 
     // Getter methods for card prices
-    [[nodiscard]] const QJsonObject &getCardhoarder() const
+    const QJsonObject &getCardhoarder() const
     {
         return cardhoarder;
     }
-    [[nodiscard]] const QJsonObject &getCardkingdom() const
+    const QJsonObject &getCardkingdom() const
     {
         return cardkingdom;
     }
-    [[nodiscard]] const QJsonObject &getCardmarket() const
+    const QJsonObject &getCardmarket() const
     {
         return cardmarket;
     }
-    [[nodiscard]] const QJsonObject &getFace2face() const
+    const QJsonObject &getFace2face() const
     {
         return face2face;
     }
-    [[nodiscard]] const QJsonObject &getManapool() const
+    const QJsonObject &getManapool() const
     {
         return manapool;
     }
-    [[nodiscard]] const QJsonObject &getMtgstocks() const
+    const QJsonObject &getMtgstocks() const
     {
         return mtgstocks;
     }
-    [[nodiscard]] const QJsonObject &getScg() const
+    const QJsonObject &getScg() const
     {
         return scg;
     }
-    [[nodiscard]] const QJsonObject &getTcgl() const
+    const QJsonObject &getTcgl() const
     {
         return tcgl;
     }
-    [[nodiscard]] const QJsonObject &getTcgplayer() const
+    const QJsonObject &getTcgplayer() const
     {
         return tcgplayer;
     }
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
similarity index 65%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
index 07b53dd97..94650785f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h
@@ -1,15 +1,11 @@
-/**
- * @file edhrec_api_response_card_container.h
- * @ingroup ApiResponses
- * @brief TODO: Document this.
- */
-
 #ifndef CONTAINER_ENTRY_H
 #define CONTAINER_ENTRY_H
 
 #include "edhrec_api_response_card_list.h"
 #include "edhrec_commander_api_response_commander_details.h"
 
+#include <QDebug>
+#include <QJsonArray>
 #include <QJsonObject>
 #include <QString>
 #include <QVector>
@@ -27,27 +23,27 @@ public:
     void debugPrint() const;
 
     // Getter methods for deck container
-    [[nodiscard]] const QString &getDescription() const
+    const QString &getDescription() const
     {
         return description;
     }
-    [[nodiscard]] const QVector<QJsonObject> &getBreadcrumb() const
+    const QVector<QJsonObject> &getBreadcrumb() const
     {
         return breadcrumb;
     }
-    [[nodiscard]] const EdhrecCommanderApiResponseCommanderDetails &getCommanderDetails() const
+    const EdhrecCommanderApiResponseCommanderDetails &getCommanderDetails() const
     {
         return card;
     }
-    [[nodiscard]] const QVector<EdhrecApiResponseCardList> &getCardlists() const
+    const QVector<EdhrecApiResponseCardList> &getCardlists() const
     {
         return cardlists;
     }
-    [[nodiscard]] const QString &getKeywords() const
+    const QString &getKeywords() const
     {
         return keywords;
     }
-    [[nodiscard]] const QString &getTitle() const
+    const QString &getTitle() const
     {
         return title;
     }
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h
similarity index 83%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h
rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h
index 86d78c5e3..9f75aac72 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h
@@ -1,9 +1,3 @@
-/**
- * @file edhrec_api_response_card_details.h
- * @ingroup ApiResponses
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_VIEW_H
 #define CARD_VIEW_H
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
similarity index 83%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
index 15691fbe4..9fcacfffe 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.h
@@ -1,15 +1,10 @@
-/**
- * @file edhrec_api_response_card_list.h
- * @ingroup ApiResponses
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_LIST_H
 #define CARD_LIST_H
 
 #include "edhrec_api_response_card_details.h"
 
 #include <QJsonArray>
+#include <QJsonObject>
 #include <QList>
 #include <QString>
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
similarity index 59%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
rename to cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
index 629eb8273..7b754c9b2 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h
@@ -1,15 +1,10 @@
-/**
- * @file edhrec_commander_api_response_commander_details.h
- * @ingroup ApiResponses
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_H
 #define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_H
 
 #include "../card_prices/edhrec_api_response_card_prices.h"
 
 #include <QJsonArray>
+#include <QJsonObject>
 #include <QString>
 #include <QVector>
 
@@ -26,119 +21,119 @@ public:
     void debugPrint() const;
 
     // Getters for the card data
-    [[nodiscard]] const QString &getAetherhubUri() const
+    const QString &getAetherhubUri() const
     {
         return aetherhubUri;
     }
-    [[nodiscard]] const QString &getArchidektUri() const
+    const QString &getArchidektUri() const
     {
         return archidektUri;
     }
-    [[nodiscard]] int getCmc() const
+    int getCmc() const
     {
         return cmc;
     }
-    [[nodiscard]] const QJsonArray &getColorIdentity() const
+    const QJsonArray &getColorIdentity() const
     {
         return colorIdentity;
     }
-    [[nodiscard]] bool isCombos() const
+    bool isCombos() const
     {
         return combos;
     }
-    [[nodiscard]] const QString &getDeckstatsUri() const
+    const QString &getDeckstatsUri() const
     {
         return deckstatsUri;
     }
-    [[nodiscard]] const QVector<QString> &getImageUris() const
+    const QVector<QString> &getImageUris() const
     {
         return imageUris;
     }
-    [[nodiscard]] int getInclusion() const
+    int getInclusion() const
     {
         return inclusion;
     }
-    [[nodiscard]] bool getIsCommander() const
+    bool getIsCommander() const
     {
         return isCommander;
     }
-    [[nodiscard]] const QString &getLabel() const
+    const QString &getLabel() const
     {
         return label;
     }
-    [[nodiscard]] const QString &getLayout() const
+    const QString &getLayout() const
     {
         return layout;
     }
-    [[nodiscard]] bool getLegalCommander() const
+    bool getLegalCommander() const
     {
         return legalCommander;
     }
-    [[nodiscard]] const QString &getMoxfieldUri() const
+    const QString &getMoxfieldUri() const
     {
         return moxfieldUri;
     }
-    [[nodiscard]] const QString &getMtggoldfishUri() const
+    const QString &getMtggoldfishUri() const
     {
         return mtggoldfishUri;
     }
-    [[nodiscard]] const QString &getName() const
+    const QString &getName() const
     {
         return name;
     }
-    [[nodiscard]] const QJsonArray &getNames() const
+    const QJsonArray &getNames() const
     {
         return names;
     }
-    [[nodiscard]] int getNumDecks() const
+    int getNumDecks() const
     {
         return numDecks;
     }
-    [[nodiscard]] int getPotentialDecks() const
+    int getPotentialDecks() const
     {
         return potentialDecks;
     }
-    [[nodiscard]] const QString &getPrecon() const
+    const QString &getPrecon() const
     {
         return precon;
     }
-    [[nodiscard]] const CardPrices &getPrices() const
+    const CardPrices &getPrices() const
     {
         return prices;
     }
-    [[nodiscard]] const QString &getPrimaryType() const
+    const QString &getPrimaryType() const
     {
         return primaryType;
     }
-    [[nodiscard]] const QString &getRarity() const
+    const QString &getRarity() const
     {
         return rarity;
     }
-    [[nodiscard]] double getSalt() const
+    double getSalt() const
     {
         return salt;
     }
-    [[nodiscard]] const QString &getSanitized() const
+    const QString &getSanitized() const
     {
         return sanitized;
     }
-    [[nodiscard]] const QString &getSanitizedWo() const
+    const QString &getSanitizedWo() const
     {
         return sanitizedWo;
     }
-    [[nodiscard]] const QString &getScryfallUri() const
+    const QString &getScryfallUri() const
     {
         return scryfallUri;
     }
-    [[nodiscard]] const QString &getSpellbookUri() const
+    const QString &getSpellbookUri() const
     {
         return spellbookUri;
     }
-    [[nodiscard]] const QString &getType() const
+    const QString &getType() const
     {
         return type;
     }
-    [[nodiscard]] const QString &getUrl() const
+    const QString &getUrl() const
     {
         return url;
     }
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h
similarity index 84%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h
rename to cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h
index 64f2fd7cd..e859184d2 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.h
@@ -5,14 +5,11 @@
 #include "../cards/edhrec_api_response_card_container.h"
 #include "edhrec_commander_api_response_average_deck_statistics.h"
 
+#include <QDebug>
 #include <QJsonObject>
 #include <QString>
 
-/**
- * @class EdhrecCommanderApiResponse
- * @ingroup ApiResponses
- * @brief Represents the main structure of the JSON
- */
+// Represents the main structure of the JSON
 class EdhrecCommanderApiResponse
 {
 public:
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp b/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h b/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h
similarity index 73%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h
rename to cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h
index 5d9980220..1dd01abe2 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.h
@@ -3,11 +3,7 @@
 
 #include <QJsonObject>
 
-/**
- * @struct EdhrecCommanderApiResponseAverageDeckStatistics
- * @ingroup ApiResponses
- * @brief Represents the typical deck statistics (collapsed section)
- */
+// Represents the typical deck statistics (collapsed section)
 struct EdhrecCommanderApiResponseAverageDeckStatistics
 {
     int creature = 0;
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
similarity index 79%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
rename to cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
index fb89c0b12..569c31894 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.h
@@ -1,14 +1,9 @@
-/**
- * @file edhrec_top_cards_api_response.h
- * @ingroup ApiResponses
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_TOP_CARDS_API_RESPONSE_H
 #define EDHREC_TOP_CARDS_API_RESPONSE_H
 
 #include "../cards/edhrec_api_response_card_container.h"
 
+#include <QDebug>
 #include <QString>
 
 class EdhrecTopCardsApiResponse
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
similarity index 79%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
rename to cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
index 26c5afedb..526611eb7 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.h
@@ -1,14 +1,9 @@
-/**
- * @file edhrec_top_commanders_api_response.h
- * @ingroup ApiResponses
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_TOP_COMMANDERS_API_RESPONSE_H
 #define EDHREC_TOP_COMMANDERS_API_RESPONSE_H
 
 #include "../cards/edhrec_api_response_card_container.h"
 
+#include <QDebug>
 #include <QString>
 
 class EdhrecTopCommandersApiResponse
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp b/cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
rename to cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h b/cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
similarity index 79%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
rename to cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
index 48219893a..f31d03a8e 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
+++ b/cockatrice/src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.h
@@ -1,14 +1,9 @@
-/**
- * @file edhrec_top_tags_api_response.h
- * @ingroup ApiResponses
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_TOP_TAGS_API_RESPONSE_H
 #define EDHREC_TOP_TAGS_API_RESPONSE_H
 
 #include "../cards/edhrec_api_response_card_container.h"
 
+#include <QDebug>
 #include <QString>
 
 class EdhrecTopTagsApiResponse
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
rename to cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
similarity index 88%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
rename to cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
index 80d32a394..8dae375fe 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
+++ b/cockatrice/src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.h
@@ -1,9 +1,3 @@
-/**
- * @file edhrec_api_response_card_prices_display_widget.h
- * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
- */
-
 #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/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
similarity index 56%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
index 9d45f254b..cde18053b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
+++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
@@ -1,11 +1,8 @@
 #include "edhrec_api_response_card_details_display_widget.h"
 
-#include "../../../../../general/display/background_plate_widget.h"
+#include "../../../../../database/card_database_manager.h"
 #include "../../tab_edhrec_main.h"
 
-#include <QMouseEvent>
-#include <libcockatrice/card/database/card_database_manager.h>
-
 EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWidget(
     QWidget *parent,
     const EdhrecApiResponseCardDetails &_toDisplay)
@@ -20,21 +17,15 @@ EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWi
     nameLabel = new QLabel(this);
     nameLabel->setText(toDisplay.name);
     nameLabel->setAlignment(Qt::AlignHCenter);
-    nameLabel->setStyleSheet("font-size: 20px; font-weight: bold");
 
     inclusionDisplayWidget = new EdhrecApiResponseCardInclusionDisplayWidget(this, toDisplay);
 
     synergyDisplayWidget = new EdhrecApiResponseCardSynergyDisplayWidget(this, toDisplay);
 
-    backgroundPlateWidget = new BackgroundPlateWidget(this);
-    auto plateLayout = new QVBoxLayout(backgroundPlateWidget);
-
-    plateLayout->addWidget(nameLabel);
-    plateLayout->addWidget(cardPictureWidget);
-    plateLayout->addWidget(inclusionDisplayWidget);
-    plateLayout->addWidget(synergyDisplayWidget);
-
-    layout->addWidget(backgroundPlateWidget);
+    layout->addWidget(nameLabel);
+    layout->addWidget(cardPictureWidget);
+    layout->addWidget(inclusionDisplayWidget);
+    layout->addWidget(synergyDisplayWidget);
 
     QWidget *currentParent = parentWidget();
     TabEdhRecMain *parentTab = nullptr;
@@ -49,7 +40,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,
@@ -57,30 +48,6 @@ EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWi
     }
 }
 
-void EdhrecApiResponseCardDetailsDisplayWidget::mousePressEvent(QMouseEvent *event)
-{
-    QWidget::mousePressEvent(event);
-    if (event->button() == Qt::LeftButton) {
-        actRequestPageNavigation();
-    }
-}
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-void EdhrecApiResponseCardDetailsDisplayWidget::enterEvent(QEnterEvent *event)
-#else
-void EdhrecApiResponseCardDetailsDisplayWidget::enterEvent(QEvent *event)
-#endif
-{
-    QWidget::enterEvent(event);
-    backgroundPlateWidget->setFocused(true);
-}
-
-void EdhrecApiResponseCardDetailsDisplayWidget::leaveEvent(QEvent *event)
-{
-    QWidget::leaveEvent(event);
-    backgroundPlateWidget->setFocused(false);
-}
-
 void EdhrecApiResponseCardDetailsDisplayWidget::actRequestPageNavigation()
 {
     emit requestUrl(toDisplay.url);
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
similarity index 61%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
index 82dcfb8b0..1182bcf26 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
+++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
@@ -1,14 +1,7 @@
-/**
- * @file edhrec_api_response_card_details_display_widget.h
- * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_CARD_DETAILS_DISPLAY_WIDGET_H
 
-#include "../../../../../cards/card_info_picture_widget.h"
-#include "../../../../../general/display/background_plate_widget.h"
+#include "../../../../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../api_response/cards/edhrec_api_response_card_details.h"
 #include "edhrec_api_response_card_inclusion_display_widget.h"
 #include "edhrec_api_response_card_synergy_display_widget.h"
@@ -31,20 +24,9 @@ private:
     EdhrecApiResponseCardDetails toDisplay;
     QVBoxLayout *layout;
     CardInfoPictureWidget *cardPictureWidget;
-    BackgroundPlateWidget *backgroundPlateWidget; ///< Plate for metadata labels
     QLabel *nameLabel;
     EdhrecApiResponseCardInclusionDisplayWidget *inclusionDisplayWidget;
     EdhrecApiResponseCardSynergyDisplayWidget *synergyDisplayWidget;
-
-protected slots:
-    void mousePressEvent(QMouseEvent *event) override;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    void enterEvent(QEnterEvent *event) override; ///< Qt6 hover enter
-#else
-    void enterEvent(QEvent *event) override; ///< Qt5 hover enter
-#endif
-    void leaveEvent(QEvent *event) override;
 };
 
 #endif // 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.cpp b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
similarity index 77%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
index 43baddb4c..db55b2b41 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
+++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.h
@@ -1,13 +1,7 @@
-/**
- * @file edhrec_api_response_card_inclusion_display_widget.h
- * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H
 #define EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H
 
-#include "../../../../../general/display/charts/bars/percent_bar_widget.h"
+#include "../../../../../interface/widgets/general/display/percent_bar_widget.h"
 #include "../../api_response/cards/edhrec_api_response_card_details.h"
 
 #include <QLabel>
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
similarity index 93%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
index 841ef315b..67372fd37 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
+++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
@@ -1,6 +1,6 @@
 #include "edhrec_api_response_card_list_display_widget.h"
 
-#include "../../../../../general/display/banner_widget.h"
+#include "../../../../../interface/widgets/general/display/banner_widget.h"
 #include "edhrec_api_response_card_details_display_widget.h"
 
 #include <QLabel>
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
similarity index 74%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
index d34c3da34..1f7e66887 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
+++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.h
@@ -1,14 +1,8 @@
-/**
- * @file edhrec_api_response_card_list_display_widget.h
- * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H
 
-#include "../../../../../general/display/banner_widget.h"
-#include "../../../../../general/layout_containers/flow_widget.h"
+#include "../../../../../interface/widgets/general/display/banner_widget.h"
+#include "../../../../../interface/widgets/general/layout_containers/flow_widget.h"
 #include "../../api_response/cards/edhrec_api_response_card_list.h"
 
 #include <QResizeEvent>
@@ -24,7 +18,7 @@ public:
     [[nodiscard]] QString getBannerText() const
     {
         return header->getText();
-    }
+    };
 
 private:
     QVBoxLayout *layout;
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
similarity index 76%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
rename to cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
index c2e1c018c..8877b4510 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
+++ b/cockatrice/src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.h
@@ -1,13 +1,7 @@
-/**
- * @file edhrec_api_response_card_synergy_display_widget.h
- * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H
 #define EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H
 
-#include "../../../../../general/display/charts/bars/percent_bar_widget.h"
+#include "../../../../../interface/widgets/general/display/percent_bar_widget.h"
 #include "../../api_response/cards/edhrec_api_response_card_details.h"
 
 #include <QLabel>
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
similarity index 58%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
rename to cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
index 515475f3e..bf7444b5e 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
+++ b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
@@ -1,11 +1,9 @@
 #include "edhrec_api_response_commander_details_display_widget.h"
 
-#include "../../../../../cards/card_info_picture_widget.h"
+#include "../../../../../database/card_database_manager.h"
+#include "../../../../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../tab_edhrec_main.h"
 #include "../card_prices/edhrec_api_response_card_prices_display_widget.h"
-#include "edhrec_commander_api_response_bracket_navigation_widget.h"
-
-#include <libcockatrice/card/database/card_database_manager.h>
 
 EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget(
     QWidget *parent,
@@ -13,14 +11,9 @@ EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCom
     QString baseUrl)
     : QWidget(parent), commanderDetails(_commanderDetails)
 {
-    layout = new QHBoxLayout(this);
+    layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    commanderLayout = new QHBoxLayout();
-    commanderDetailsLayout = new QVBoxLayout();
-    commanderDetailsLayout->setAlignment(Qt::AlignCenter);
-    navigationAndPricesLayout = new QVBoxLayout();
-
     commanderPicture = new CardInfoPictureWidget(this);
     commanderPicture->setCard(CardDatabaseManager::query()->getCard({commanderDetails.getName()}));
 
@@ -42,35 +35,20 @@ EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCom
 
     commanderDetails.debugPrint();
 
-    commanderName = new QLabel(this);
-    commanderName->setText(commanderDetails.getName());
-    commanderName->setAlignment(Qt::AlignCenter);
-    commanderName->setStyleSheet("font-size: 28px; font-weight: bold");
-
     label = new QLabel(this);
     label->setAlignment(Qt::AlignCenter);
-    label->setStyleSheet("font-size: 16px");
-
     salt = new QLabel(this);
     salt->setAlignment(Qt::AlignCenter);
-    salt->setStyleSheet("font-size: 16px");
 
     cardPricesDisplayWidget = new EdhrecApiResponseCardPricesDisplayWidget(this, commanderDetails.getPrices());
 
     navigationWidget = new EdhrecCommanderApiResponseNavigationWidget(this, commanderDetails, baseUrl);
 
-    commanderLayout->addWidget(commanderPicture);
-    commanderDetailsLayout->addWidget(commanderName);
-    commanderDetailsLayout->addSpacing(1);
-    commanderDetailsLayout->addWidget(label);
-    commanderDetailsLayout->addWidget(salt);
-    commanderDetailsLayout->addWidget(cardPricesDisplayWidget);
-    commanderLayout->addLayout(commanderDetailsLayout);
-    navigationAndPricesLayout->addWidget(navigationWidget);
-    // navigationAndPricesLayout->addWidget(cardPricesDisplayWidget);
-
-    layout->addLayout(commanderLayout);
-    layout->addLayout(navigationAndPricesLayout);
+    layout->addWidget(commanderPicture);
+    layout->addWidget(label);
+    layout->addWidget(salt);
+    layout->addWidget(cardPricesDisplayWidget);
+    layout->addWidget(navigationWidget);
 
     retranslateUi();
 }
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
similarity index 75%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
rename to cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
index 8e74588e2..dbd396b0f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
+++ b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
@@ -1,13 +1,7 @@
-/**
- * @file edhrec_api_response_commander_details_display_widget.h
- * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_DISPLAY_WIDGET_H
 
-#include "../../../../../cards/card_info_picture_widget.h"
+#include "../../../../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../api_response/cards/edhrec_commander_api_response_commander_details.h"
 #include "../card_prices/edhrec_api_response_card_prices_display_widget.h"
 #include "edhrec_commander_api_response_navigation_widget.h"
@@ -29,12 +23,8 @@ public:
 
 private:
     EdhrecCommanderApiResponseCommanderDetails commanderDetails;
-    QHBoxLayout *layout;
-    QHBoxLayout *commanderLayout;
-    QVBoxLayout *commanderDetailsLayout;
-    QVBoxLayout *navigationAndPricesLayout;
+    QVBoxLayout *layout;
     CardInfoPictureWidget *commanderPicture;
-    QLabel *commanderName;
     QLabel *label;
     QLabel *salt;
     EdhrecApiResponseCardPricesDisplayWidget *cardPricesDisplayWidget;
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
similarity index 98%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
rename to cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
index 230858d6c..722a8004c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
+++ b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
@@ -1,6 +1,6 @@
 #include "edhrec_commander_api_response_display_widget.h"
 
-#include "../../../../../cards/card_info_picture_widget.h"
+#include "../../../../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../api_response/commander/edhrec_commander_api_response.h"
 #include "../cards/edhrec_api_response_card_list_display_widget.h"
 #include "edhrec_api_response_commander_details_display_widget.h"
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
similarity index 86%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
rename to cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
index 1678e1380..172b64e32 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
+++ b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.h
@@ -1,9 +1,3 @@
-/**
- * @file edhrec_commander_api_response_display_widget.h
- * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
 
diff --git a/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
new file mode 100644
index 000000000..3f3b9f1ba
--- /dev/null
+++ b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
@@ -0,0 +1,174 @@
+#include "edhrec_commander_api_response_navigation_widget.h"
+
+#include "../../tab_edhrec_main.h"
+
+EdhrecCommanderApiResponseNavigationWidget::EdhrecCommanderApiResponseNavigationWidget(
+    QWidget *parent,
+    const EdhrecCommanderApiResponseCommanderDetails &_commanderDetails,
+    QString baseUrl)
+    : QWidget(parent), commanderDetails(_commanderDetails)
+{
+    layout = new QGridLayout(this);
+    setLayout(layout);
+
+    gameChangerLabel = new QLabel(this);
+    budgetLabel = new QLabel(this);
+
+    comboPushButton = new QPushButton(this);
+    averageDeckPushButton = new QPushButton(this);
+
+    layout->addWidget(comboPushButton, 0, 0, 1, 1);
+    layout->addWidget(averageDeckPushButton, 0, 1, 1, 1);
+
+    layout->addWidget(gameChangerLabel, 1, 0, 1, 2);
+
+    for (int i = 0; i < gameChangerOptions.length(); i++) {
+        QString option = gameChangerOptions.at(i);
+        QString label = option.isEmpty() ? "All" : option.at(0).toUpper() + option.mid(1);
+        QPushButton *optionButton = new QPushButton(label, this);
+        gameChangerButtons[option] = optionButton;
+        layout->addWidget(optionButton, 2, i);
+        connect(optionButton, &QPushButton::clicked, this, [=, this]() {
+            selectedGameChanger = option;
+            updateOptionButtonSelection(gameChangerButtons, option);
+            actRequestCommanderNavigation();
+        });
+    }
+
+    layout->addWidget(budgetLabel, 3, 0, 1, 2);
+
+    for (int i = 0; i < budgetOptions.length(); i++) {
+        QString option = budgetOptions.at(i);
+        QString label = option.isEmpty() ? "Any" : option.at(0).toUpper() + option.mid(1);
+        QPushButton *btn = new QPushButton(label, this);
+        budgetButtons[option] = btn;
+        layout->addWidget(btn, 4, i);
+        connect(btn, &QPushButton::clicked, this, [=, this]() {
+            selectedBudget = option;
+            updateOptionButtonSelection(budgetButtons, option);
+            actRequestCommanderNavigation();
+        });
+    }
+
+    updateOptionButtonSelection(gameChangerButtons, "");
+    updateOptionButtonSelection(budgetButtons, "");
+
+    QWidget *currentParent = parentWidget();
+    TabEdhRecMain *parentTab = nullptr;
+
+    while (currentParent) {
+        if ((parentTab = qobject_cast<TabEdhRecMain *>(currentParent))) {
+            break;
+        }
+        currentParent = currentParent->parentWidget();
+    }
+
+    if (parentTab) {
+        connect(comboPushButton, &QPushButton::clicked, this,
+                &EdhrecCommanderApiResponseNavigationWidget::actRequestComboNavigation);
+        connect(averageDeckPushButton, &QPushButton::clicked, this,
+                &EdhrecCommanderApiResponseNavigationWidget::actRequestAverageDeckNavigation);
+        connect(this, &EdhrecCommanderApiResponseNavigationWidget::requestUrl, parentTab,
+                &TabEdhRecMain::actNavigatePage);
+    }
+
+    retranslateUi();
+    applyOptionsFromUrl(baseUrl);
+}
+
+void EdhrecCommanderApiResponseNavigationWidget::retranslateUi()
+{
+    comboPushButton->setText(tr("Combos"));
+    averageDeckPushButton->setText(tr("Average Deck"));
+    gameChangerLabel->setText(tr("Game Changers"));
+    budgetLabel->setText(tr("Budget"));
+}
+
+void EdhrecCommanderApiResponseNavigationWidget::applyOptionsFromUrl(const QString &url)
+{
+    QString cleanedUrl = url;
+
+    // Remove base and file extension
+    if (cleanedUrl.startsWith("https://json.edhrec.com/pages/")) {
+        cleanedUrl = cleanedUrl.mid(QString("https://json.edhrec.com/pages/").length());
+    }
+    if (cleanedUrl.endsWith(".json")) {
+        cleanedUrl.chop(5);
+    }
+
+    // Expecting something like: "commanders/the-ur-dragon/core/expensive"
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+    QStringList parts = cleanedUrl.split('/', Qt::SkipEmptyParts);
+#else
+    QStringList parts = cleanedUrl.split('/', QString::SkipEmptyParts);
+#endif
+
+    if (parts.size() < 2) {
+        return;
+    }
+
+    QString commanderName = parts[1];
+    QString gameChangerOpt, budgetOpt;
+
+    // Define valid sets
+    QSet<QString> validGameChangers = {"core", "upgraded", "optimized"};
+    QSet<QString> validBudgets = {"budget", "expensive"};
+
+    // Check remaining parts after commander
+    for (int i = 2; i < parts.size(); ++i) {
+        QString part = parts[i].toLower();
+        if (validGameChangers.contains(part)) {
+            gameChangerOpt = part;
+        } else if (validBudgets.contains(part)) {
+            budgetOpt = part;
+        }
+    }
+
+    // Validate and apply
+    if (!gameChangerButtons.contains(gameChangerOpt)) {
+        gameChangerOpt.clear();
+    }
+    if (!budgetButtons.contains(budgetOpt)) {
+        budgetOpt.clear();
+    }
+
+    selectedGameChanger = gameChangerOpt;
+    selectedBudget = budgetOpt;
+
+    updateOptionButtonSelection(gameChangerButtons, selectedGameChanger);
+    updateOptionButtonSelection(budgetButtons, selectedBudget);
+}
+
+void EdhrecCommanderApiResponseNavigationWidget::updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons,
+                                                                             const QString &selectedKey)
+{
+    for (auto it = buttons.begin(); it != buttons.end(); ++it) {
+        it.value()->setStyleSheet(it.key() == selectedKey ? "background-color: lightblue; font-weight: bold;" : "");
+    }
+}
+
+QString EdhrecCommanderApiResponseNavigationWidget::addNavigationOptionsToUrl(QString baseUrl)
+{
+    if (!selectedGameChanger.isEmpty()) {
+        baseUrl += "/" + selectedGameChanger;
+    }
+    if (!selectedBudget.isEmpty()) {
+        baseUrl += "/" + selectedBudget;
+    }
+    return baseUrl;
+}
+
+void EdhrecCommanderApiResponseNavigationWidget::actRequestCommanderNavigation()
+{
+    emit requestUrl(addNavigationOptionsToUrl("/commanders/" + commanderDetails.getSanitized()));
+}
+
+void EdhrecCommanderApiResponseNavigationWidget::actRequestComboNavigation()
+{
+    emit requestUrl("/combos/" + commanderDetails.getSanitized());
+}
+
+void EdhrecCommanderApiResponseNavigationWidget::actRequestAverageDeckNavigation()
+{
+    emit requestUrl(addNavigationOptionsToUrl("/average-decks/" + commanderDetails.getSanitized()));
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
similarity index 67%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
rename to cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
index 10dfa8223..16f601b9b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
+++ b/cockatrice/src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
@@ -1,15 +1,7 @@
-/**
- * @file edhrec_commander_api_response_navigation_widget.h
- * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_COMMANDER_API_RESPONSE_NAVIGATION_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_NAVIGATION_WIDGET_H
 
 #include "edhrec_api_response_commander_details_display_widget.h"
-#include "edhrec_commander_api_response_bracket_navigation_widget.h"
-#include "edhrec_commander_api_response_budget_navigation_widget.h"
 
 #include <QGridLayout>
 #include <QLabel>
@@ -25,6 +17,7 @@ public:
         const EdhrecCommanderApiResponseCommanderDetails &_commanderDetails,
         QString baseUrl);
     void retranslateUi();
+    void applyOptionsFromUrl(const QString &url);
 
 public slots:
     void actRequestCommanderNavigation();
@@ -36,14 +29,24 @@ signals:
 private:
     QGridLayout *layout;
 
-    EdhrecCommanderApiResponseBracketNavigationWidget *bracketNavigationWidget;
-    EdhrecCommanderApiResponseBudgetNavigationWidget *budgetNavigationWidget;
+    QLabel *gameChangerLabel;
+    QLabel *budgetLabel;
+
+    QStringList gameChangerOptions = {"", "core", "upgraded", "optimized"};
+    QStringList budgetOptions = {"", "budget", "expensive"};
+
+    QString selectedGameChanger;
+    QString selectedBudget;
+
+    QMap<QString, QPushButton *> gameChangerButtons;
+    QMap<QString, QPushButton *> budgetButtons;
 
     QPushButton *comboPushButton;
     QPushButton *averageDeckPushButton;
 
     EdhrecCommanderApiResponseCommanderDetails commanderDetails;
 
+    void updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons, const QString &selectedKey);
     QString addNavigationOptionsToUrl(QString baseUrl);
     QString buildComboUrl() const;
 };
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp b/cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
rename to cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
similarity index 83%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
rename to cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
index e2748bf10..4b7a34d6a 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
+++ b/cockatrice/src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.h
@@ -1,9 +1,3 @@
-/**
- * @file edhrec_top_cards_api_response_display_widget.h
- * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
- */
-
 #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.cpp b/cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
rename to cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
similarity index 83%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
rename to cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
index 766518c02..e8774d38b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
+++ b/cockatrice/src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.h
@@ -1,9 +1,3 @@
-/**
- * @file edhrec_top_commanders_api_response_display_widget.h
- * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
- */
-
 #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.cpp b/cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
rename to cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h b/cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
similarity index 82%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
rename to cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
index 64228b85d..d67875058 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
+++ b/cockatrice/src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.h
@@ -1,14 +1,9 @@
-/**
- * @file edhrec_top_tags_api_response_display_widget.h
- * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H
 
 #include "../../api_response/top_tags/edhrec_top_tags_api_response.h"
 
+#include <QResizeEvent>
 #include <QScrollArea>
 #include <QVBoxLayout>
 #include <QWidget>
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp b/cockatrice/src/tabs/api/edhrec/tab_edhrec.cpp
similarity index 97%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
rename to cockatrice/src/tabs/api/edhrec/tab_edhrec.cpp
index 10389f4eb..4c740e5d1 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
+++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec.cpp
@@ -4,6 +4,7 @@
 #include "display/commander/edhrec_commander_api_response_display_widget.h"
 
 #include <QDebug>
+#include <QHBoxLayout>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -15,7 +16,10 @@
 TabEdhRec::TabEdhRec(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
 {
     networkManager = new QNetworkAccessManager(this);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
     networkManager->setTransferTimeout(); // Use Qt's default timeout
+#endif
+
     networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
     connect(networkManager, &QNetworkAccessManager::finished, this, &TabEdhRec::processApiJson);
 }
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h b/cockatrice/src/tabs/api/edhrec/tab_edhrec.h
similarity index 82%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
rename to cockatrice/src/tabs/api/edhrec/tab_edhrec.h
index b5ee8d2ca..517a04051 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
+++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec.h
@@ -1,17 +1,12 @@
-/**
- * @file tab_edhrec.h
- * @ingroup Tabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_EDHREC_H
 #define TAB_EDHREC_H
 
+#include "../../../card/card_info.h"
+#include "../../../interface/widgets/general/layout_containers/flow_widget.h"
 #include "../../tab.h"
 #include "display/commander/edhrec_commander_api_response_display_widget.h"
 
 #include <QNetworkAccessManager>
-#include <libcockatrice/card/card_info.h>
 
 class TabEdhRec : public Tab
 {
@@ -20,7 +15,7 @@ public:
     explicit TabEdhRec(TabSupervisor *_tabSupervisor);
 
     void retranslateUi() override;
-    [[nodiscard]] QString getTabText() const override
+    QString getTabText() const override
     {
         auto cardName = cardToQuery.isNull() ? QString() : cardToQuery->getName();
         return tr("EDHREC: ") + cardName;
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp
similarity index 91%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
rename to cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp
index f861d8afd..36089886a 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
+++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.cpp
@@ -1,6 +1,8 @@
 #include "tab_edhrec_main.h"
 
-#include "../../../../../client/settings/cache_settings.h"
+#include "../../../database/card_database_manager.h"
+#include "../../../database/model/card/card_completer_proxy_model.h"
+#include "../../../database/model/card/card_search_model.h"
 #include "../../tab_supervisor.h"
 #include "api_response/average_deck/edhrec_average_deck_api_response.h"
 #include "api_response/commander/edhrec_commander_api_response.h"
@@ -22,10 +24,7 @@
 #include <QNetworkReply>
 #include <QPushButton>
 #include <QRegularExpression>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/models/database/card/card_completer_proxy_model.h>
-#include <libcockatrice/models/database/card/card_search_model.h>
-#include <version_string.h>
+#include <QResizeEvent>
 
 static bool canBeCommander(const CardInfoPtr &cardInfo)
 {
@@ -37,7 +36,10 @@ static bool canBeCommander(const CardInfoPtr &cardInfo)
 TabEdhRecMain::TabEdhRecMain(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
 {
     networkManager = new QNetworkAccessManager(this);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
     networkManager->setTransferTimeout(); // Use Qt's default timeout
+#endif
+
     networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
     connect(networkManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(processApiJson(QNetworkReply *)));
 
@@ -62,14 +64,14 @@ TabEdhRecMain::TabEdhRecMain(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor
     auto cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
     auto displayModel = new CardDatabaseDisplayModel(this);
     displayModel->setSourceModel(cardDatabaseModel);
-    auto *searchModel = new CardSearchModel(displayModel, this);
+    CardSearchModel *searchModel = new CardSearchModel(displayModel, this);
 
-    auto *proxyModel = new CardCompleterProxyModel(this);
+    CardCompleterProxyModel *proxyModel = new CardCompleterProxyModel(this);
     proxyModel->setSourceModel(searchModel);
     proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
     proxyModel->setFilterRole(Qt::DisplayRole);
 
-    auto *completer = new QCompleter(proxyModel, this);
+    QCompleter *completer = new QCompleter(proxyModel, this);
     completer->setCompletionRole(Qt::DisplayRole);
     completer->setCompletionMode(QCompleter::PopupCompletion);
     completer->setCaseSensitivity(Qt::CaseInsensitive);
@@ -94,9 +96,7 @@ TabEdhRecMain::TabEdhRecMain(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor
 
     settingsButton = new SettingsButtonWidget(this);
 
-    cardSizeSlider = new CardSizeWidget(this, nullptr, SettingsCache::instance().getEDHRecCardSize());
-    connect(cardSizeSlider, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
-            &SettingsCache::setEDHRecCardSize);
+    cardSizeSlider = new CardSizeWidget(this);
 
     settingsButton->addSettingsWidget(cardSizeSlider);
 
@@ -164,7 +164,6 @@ void TabEdhRecMain::setCard(CardInfoPtr _cardToQuery, bool isCommander)
     }
 
     QNetworkRequest request{QUrl(url)};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -172,7 +171,6 @@ void TabEdhRecMain::setCard(CardInfoPtr _cardToQuery, bool isCommander)
 void TabEdhRecMain::actNavigatePage(QString url)
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages" + url + ".json")};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -180,7 +178,6 @@ void TabEdhRecMain::actNavigatePage(QString url)
 void TabEdhRecMain::getTopCards()
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages/top/year.json")};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -188,7 +185,6 @@ void TabEdhRecMain::getTopCards()
 void TabEdhRecMain::getTopCommanders()
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages/commanders/year.json")};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -196,7 +192,7 @@ void TabEdhRecMain::getTopCommanders()
 void TabEdhRecMain::getTopTags()
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages/tags.json")};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+
     networkManager->get(request);
 }
 
@@ -360,7 +356,7 @@ void TabEdhRecMain::processAverageDeckResponse(QJsonObject reply)
 {
     EdhrecAverageDeckApiResponse deckData;
     deckData.fromJson(reply);
-    tabSupervisor->openDeckInNewTab({deckData.deck.deck, {}});
+    tabSupervisor->openDeckInNewTab(deckData.deck.deckLoader);
 }
 
 void TabEdhRecMain::prettyPrintJson(const QJsonValue &value, int indentLevel)
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h
similarity index 83%
rename from cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
rename to cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h
index 04cf03fc1..a7e2ab2f4 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h
+++ b/cockatrice/src/tabs/api/edhrec/tab_edhrec_main.h
@@ -1,14 +1,10 @@
-/**
- * @file tab_edhrec_main.h
- * @ingroup Tabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_EDHREC_MAIN_H
 #define TAB_EDHREC_MAIN_H
 
-#include "../../interface/widgets/cards/card_size_widget.h"
-#include "../../interface/widgets/quick_settings/settings_button_widget.h"
+#include "../../../database/card_database.h"
+#include "../../../interface/widgets/cards/card_size_widget.h"
+#include "../../../interface/widgets/general/layout_containers/flow_widget.h"
+#include "../../../interface/widgets/quick_settings/settings_button_widget.h"
 #include "../../tab.h"
 #include "display/commander/edhrec_commander_api_response_display_widget.h"
 
@@ -16,7 +12,6 @@
 #include <QLineEdit>
 #include <QNetworkAccessManager>
 #include <QPushButton>
-#include <libcockatrice/card/database/card_database.h>
 
 class TabEdhRecMain : public Tab
 {
@@ -26,13 +21,13 @@ public:
 
     void retranslateUi() override;
     void doSearch();
-    [[nodiscard]] QString getTabText() const override
+    QString getTabText() const override
     {
         auto cardName = cardToQuery.isNull() ? QString() : cardToQuery->getName();
         return tr("EDHRec: ") + cardName;
     }
 
-    CardSizeWidget *getCardSizeSlider() const
+    CardSizeWidget *getCardSizeSlider()
     {
         return cardSizeSlider;
     }
diff --git a/cockatrice/src/interface/widgets/tabs/tab.cpp b/cockatrice/src/tabs/tab.cpp
similarity index 100%
rename from cockatrice/src/interface/widgets/tabs/tab.cpp
rename to cockatrice/src/tabs/tab.cpp
diff --git a/cockatrice/src/interface/widgets/tabs/tab.h b/cockatrice/src/tabs/tab.h
similarity index 79%
rename from cockatrice/src/interface/widgets/tabs/tab.h
rename to cockatrice/src/tabs/tab.h
index 7cff01130..fc97585c3 100644
--- a/cockatrice/src/interface/widgets/tabs/tab.h
+++ b/cockatrice/src/tabs/tab.h
@@ -1,14 +1,9 @@
-/**
- * @file tab.h
- * @ingroup Tabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_H
 #define TAB_H
 
+#include "card_ref.h"
+
 #include <QMainWindow>
-#include <libcockatrice/utility/card_ref.h>
 
 class QMenu;
 class TabSupervisor;
@@ -39,15 +34,15 @@ private:
 
 public:
     explicit Tab(TabSupervisor *_tabSupervisor);
-    [[nodiscard]] const QList<QMenu *> &getTabMenus() const
+    const QList<QMenu *> &getTabMenus() const
     {
         return tabMenus;
     }
-    [[nodiscard]] TabSupervisor *getTabSupervisor() const
+    TabSupervisor *getTabSupervisor() const
     {
         return tabSupervisor;
     }
-    [[nodiscard]] bool getContentsChanged() const
+    bool getContentsChanged() const
     {
         return contentsChanged;
     }
@@ -55,7 +50,7 @@ public:
     {
         contentsChanged = _contentsChanged;
     }
-    [[nodiscard]] virtual QString getTabText() const = 0;
+    virtual QString getTabText() const = 0;
     virtual void retranslateUi() = 0;
 
     /**
diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.cpp b/cockatrice/src/tabs/tab_account.cpp
similarity index 90%
rename from cockatrice/src/interface/widgets/tabs/tab_account.cpp
rename to cockatrice/src/tabs/tab_account.cpp
index e61732f90..ba82857fe 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_account.cpp
+++ b/cockatrice/src/tabs/tab_account.cpp
@@ -1,23 +1,23 @@
 #include "tab_account.h"
 
 #include "../client/sound_engine.h"
-#include "../interface/widgets/server/user/user_info_box.h"
-#include "../interface/widgets/server/user/user_list_manager.h"
-#include "../interface/widgets/server/user/user_list_widget.h"
-#include "../interface/widgets/utility/custom_line_edit.h"
+#include "../deck/custom_line_edit.h"
+#include "../server/abstract_client.h"
+#include "../server/pending_command.h"
+#include "../server/user/user_info_box.h"
+#include "../server/user/user_list_manager.h"
+#include "../server/user/user_list_widget.h"
+#include "pb/event_add_to_list.pb.h"
+#include "pb/event_remove_from_list.pb.h"
+#include "pb/event_user_joined.pb.h"
+#include "pb/event_user_left.pb.h"
+#include "pb/response_list_users.pb.h"
+#include "pb/session_commands.pb.h"
 #include "tab_supervisor.h"
+#include "trice_limits.h"
 
 #include <QPushButton>
 #include <QVBoxLayout>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
-#include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
-#include <libcockatrice/protocol/pb/event_user_joined.pb.h>
-#include <libcockatrice/protocol/pb/event_user_left.pb.h>
-#include <libcockatrice/protocol/pb/response_list_users.pb.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
 
 TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo)
     : Tab(_tabSupervisor), client(_client)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.h b/cockatrice/src/tabs/tab_account.h
similarity index 91%
rename from cockatrice/src/interface/widgets/tabs/tab_account.h
rename to cockatrice/src/tabs/tab_account.h
index e09c12eb2..5824a7527 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_account.h
+++ b/cockatrice/src/tabs/tab_account.h
@@ -1,16 +1,9 @@
-/**
- * @file tab_account.h
- * @ingroup AccountTabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_ACCOUNT_H
 #define TAB_ACCOUNT_H
 
+#include "pb/serverinfo_user.pb.h"
 #include "tab.h"
 
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-
 class AbstractClient;
 class Event_AddToList;
 class Event_ListRooms;
diff --git a/cockatrice/src/interface/widgets/tabs/tab_admin.cpp b/cockatrice/src/tabs/tab_admin.cpp
similarity index 92%
rename from cockatrice/src/interface/widgets/tabs/tab_admin.cpp
rename to cockatrice/src/tabs/tab_admin.cpp
index 533e1cc83..a3d9e34e8 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_admin.cpp
+++ b/cockatrice/src/tabs/tab_admin.cpp
@@ -1,5 +1,12 @@
 #include "tab_admin.h"
 
+#include "../server/abstract_client.h"
+#include "../server/pending_command.h"
+#include "pb/admin_commands.pb.h"
+#include "pb/event_replay_added.pb.h"
+#include "pb/moderator_commands.pb.h"
+#include "trice_limits.h"
+
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QGroupBox>
@@ -8,31 +15,25 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QSpinBox>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/admin_commands.pb.h>
-#include <libcockatrice/protocol/pb/event_replay_added.pb.h>
-#include <libcockatrice/protocol/pb/moderator_commands.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
 
 ShutdownDialog::ShutdownDialog(QWidget *parent) : QDialog(parent)
 {
-    auto *reasonLabel = new QLabel(tr("&Reason for shutdown:"));
+    QLabel *reasonLabel = new QLabel(tr("&Reason for shutdown:"));
     reasonEdit = new QLineEdit;
     reasonEdit->setMaxLength(MAX_TEXT_LENGTH);
     reasonLabel->setBuddy(reasonEdit);
-    auto *minutesLabel = new QLabel(tr("&Time until shutdown (minutes):"));
+    QLabel *minutesLabel = new QLabel(tr("&Time until shutdown (minutes):"));
     minutesEdit = new QSpinBox;
     minutesLabel->setBuddy(minutesEdit);
     minutesEdit->setMinimum(0);
     minutesEdit->setValue(5);
     minutesEdit->setMaximum(999);
 
-    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &ShutdownDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &ShutdownDialog::reject);
 
-    auto *mainLayout = new QGridLayout;
+    QGridLayout *mainLayout = new QGridLayout;
     mainLayout->addWidget(reasonLabel, 0, 0);
     mainLayout->addWidget(reasonEdit, 0, 1);
     mainLayout->addWidget(minutesLabel, 1, 0);
@@ -109,7 +110,7 @@ TabAdmin::TabAdmin(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool
     lockButton->setEnabled(false);
     connect(lockButton, &QPushButton::clicked, this, &TabAdmin::actLock);
 
-    auto *mainLayout = new QVBoxLayout;
+    QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addWidget(adminGroupBox);
     mainLayout->addWidget(moderatorGroupBox);
     mainLayout->addStretch();
@@ -118,7 +119,7 @@ TabAdmin::TabAdmin(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool
 
     retranslateUi();
 
-    auto *mainWidget = new QWidget(this);
+    QWidget *mainWidget = new QWidget(this);
     mainWidget->setLayout(mainLayout);
     setCentralWidget(mainWidget);
 
diff --git a/cockatrice/src/interface/widgets/tabs/tab_admin.h b/cockatrice/src/tabs/tab_admin.h
similarity index 78%
rename from cockatrice/src/interface/widgets/tabs/tab_admin.h
rename to cockatrice/src/tabs/tab_admin.h
index e1935e351..e219aa627 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_admin.h
+++ b/cockatrice/src/tabs/tab_admin.h
@@ -1,17 +1,11 @@
-/**
- * @file tab_admin.h
- * @ingroup ServerTabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_ADMIN_H
 #define TAB_ADMIN_H
 
+#include "pb/commands.pb.h"
+#include "pb/response.pb.h"
 #include "tab.h"
 
 #include <QDialog>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
 
 class AbstractClient;
 
@@ -29,8 +23,8 @@ private:
 
 public:
     explicit ShutdownDialog(QWidget *parent = nullptr);
-    [[nodiscard]] QString getReason() const;
-    [[nodiscard]] int getMinutes() const;
+    QString getReason() const;
+    int getMinutes() const;
 };
 
 class TabAdmin : public Tab
@@ -62,11 +56,11 @@ private slots:
 public:
     TabAdmin(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _fullAdmin);
     void retranslateUi() override;
-    [[nodiscard]] QString getTabText() const override
+    QString getTabText() const override
     {
         return tr("Administration");
     }
-    [[nodiscard]] bool getLocked() const
+    bool getLocked() const
     {
         return locked;
     }
diff --git a/cockatrice/src/tabs/tab_deck_editor.cpp b/cockatrice/src/tabs/tab_deck_editor.cpp
new file mode 100644
index 000000000..b17eb5ff1
--- /dev/null
+++ b/cockatrice/src/tabs/tab_deck_editor.cpp
@@ -0,0 +1,359 @@
+#include "tab_deck_editor.h"
+
+#include "../client/deck_editor_menu.h"
+#include "../client/tapped_out_interface.h"
+#include "../database/card_database_manager.h"
+#include "../database/model/card_database_model.h"
+#include "../dialogs/dlg_load_deck.h"
+#include "../dialogs/dlg_load_deck_from_clipboard.h"
+#include "../filters/filter_builder.h"
+#include "../filters/filter_tree_model.h"
+#include "../interface/pixel_map_generator.h"
+#include "../interface/widgets/cards/card_info_frame_widget.h"
+#include "../interface/widgets/deck_editor/deck_editor_filter_dock_widget.h"
+#include "../server/abstract_client.h"
+#include "../server/pending_command.h"
+#include "../settings/cache_settings.h"
+#include "tab_supervisor.h"
+#include "trice_limits.h"
+
+#include <QAction>
+#include <QApplication>
+#include <QCloseEvent>
+#include <QComboBox>
+#include <QDebug>
+#include <QDir>
+#include <QDockWidget>
+#include <QFileDialog>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QPrintPreviewDialog>
+#include <QProcessEnvironment>
+#include <QSplitter>
+#include <QTextEdit>
+#include <QTimer>
+#include <QToolButton>
+#include <QTreeView>
+#include <QVBoxLayout>
+
+TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor)
+{
+    setObjectName("TabDeckEditor");
+
+    TabDeckEditor::createMenus();
+
+    installEventFilter(this);
+
+    TabDeckEditor::retranslateUi();
+    TabDeckEditor::refreshShortcuts();
+
+    TabDeckEditor::loadLayout();
+}
+
+void TabDeckEditor::createMenus()
+{
+    deckMenu = new DeckEditorMenu(this);
+    addTabMenu(deckMenu);
+
+    viewMenu = new QMenu(this);
+
+    cardInfoDockMenu = viewMenu->addMenu(QString());
+    deckDockMenu = viewMenu->addMenu(QString());
+    filterDockMenu = viewMenu->addMenu(QString());
+    printingSelectorDockMenu = viewMenu->addMenu(QString());
+
+    aCardInfoDockVisible = cardInfoDockMenu->addAction(QString());
+    aCardInfoDockVisible->setCheckable(true);
+    connect(aCardInfoDockVisible, &QAction::triggered, this, &TabDeckEditor::dockVisibleTriggered);
+    aCardInfoDockFloating = cardInfoDockMenu->addAction(QString());
+    aCardInfoDockFloating->setCheckable(true);
+    connect(aCardInfoDockFloating, &QAction::triggered, this, &TabDeckEditor::dockFloatingTriggered);
+
+    aDeckDockVisible = deckDockMenu->addAction(QString());
+    aDeckDockVisible->setCheckable(true);
+    connect(aDeckDockVisible, &QAction::triggered, this, &TabDeckEditor::dockVisibleTriggered);
+    aDeckDockFloating = deckDockMenu->addAction(QString());
+    aDeckDockFloating->setCheckable(true);
+    connect(aDeckDockFloating, &QAction::triggered, this, &TabDeckEditor::dockFloatingTriggered);
+
+    aFilterDockVisible = filterDockMenu->addAction(QString());
+    aFilterDockVisible->setCheckable(true);
+    connect(aFilterDockVisible, &QAction::triggered, this, &TabDeckEditor::dockVisibleTriggered);
+    aFilterDockFloating = filterDockMenu->addAction(QString());
+    aFilterDockFloating->setCheckable(true);
+    connect(aFilterDockFloating, &QAction::triggered, this, &TabDeckEditor::dockFloatingTriggered);
+
+    aPrintingSelectorDockVisible = printingSelectorDockMenu->addAction(QString());
+    aPrintingSelectorDockVisible->setCheckable(true);
+    connect(aPrintingSelectorDockVisible, &QAction::triggered, this, &TabDeckEditor::dockVisibleTriggered);
+    aPrintingSelectorDockFloating = printingSelectorDockMenu->addAction(QString());
+    aPrintingSelectorDockFloating->setCheckable(true);
+    connect(aPrintingSelectorDockFloating, &QAction::triggered, this, &TabDeckEditor::dockFloatingTriggered);
+
+    viewMenu->addSeparator();
+
+    aResetLayout = viewMenu->addAction(QString());
+    connect(aResetLayout, &QAction::triggered, this, &TabDeckEditor::restartLayout);
+    viewMenu->addAction(aResetLayout);
+
+    deckMenu->setSaveStatus(false);
+
+    addTabMenu(viewMenu);
+}
+
+QString TabDeckEditor::getTabText() const
+{
+    QString result = tr("Deck: %1").arg(deckDockWidget->getSimpleDeckName());
+    if (modified)
+        result.prepend("* ");
+    return result;
+}
+
+void TabDeckEditor::retranslateUi()
+{
+    deckMenu->retranslateUi();
+
+    cardInfoDockWidget->retranslateUi();
+    deckDockWidget->retranslateUi();
+    filterDockWidget->retranslateUi();
+    printingSelectorDockWidget->retranslateUi();
+
+    viewMenu->setTitle(tr("&View"));
+    cardInfoDockMenu->setTitle(tr("Card Info"));
+    deckDockMenu->setTitle(tr("Deck"));
+    filterDockMenu->setTitle(tr("Filters"));
+    printingSelectorDockMenu->setTitle(tr("Printing"));
+
+    aCardInfoDockVisible->setText(tr("Visible"));
+    aCardInfoDockFloating->setText(tr("Floating"));
+
+    aDeckDockVisible->setText(tr("Visible"));
+    aDeckDockFloating->setText(tr("Floating"));
+
+    aFilterDockVisible->setText(tr("Visible"));
+    aFilterDockFloating->setText(tr("Floating"));
+
+    aPrintingSelectorDockVisible->setText(tr("Visible"));
+    aPrintingSelectorDockFloating->setText(tr("Floating"));
+
+    aResetLayout->setText(tr("Reset layout"));
+}
+
+void TabDeckEditor::refreshShortcuts()
+{
+    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
+    aResetLayout->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aResetLayout"));
+}
+
+void TabDeckEditor::showPrintingSelector()
+{
+    printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr(),
+                                                          DECK_ZONE_MAIN);
+    printingSelectorDockWidget->printingSelector->updateDisplay();
+    aPrintingSelectorDockVisible->setChecked(true);
+    printingSelectorDockWidget->setVisible(true);
+}
+
+void TabDeckEditor::loadLayout()
+{
+    LayoutsSettings &layouts = SettingsCache::instance().layouts();
+
+    setCentralWidget(databaseDisplayDockWidget);
+
+    auto &layoutState = layouts.getDeckEditorLayoutState();
+    if (layoutState.isNull()) {
+        restartLayout();
+    } else {
+        restoreState(layoutState);
+        restoreGeometry(layouts.getDeckEditorGeometry());
+    }
+
+    aCardInfoDockVisible->setChecked(!cardInfoDockWidget->isHidden());
+    aFilterDockVisible->setChecked(!filterDockWidget->isHidden());
+    aDeckDockVisible->setChecked(!deckDockWidget->isHidden());
+    aPrintingSelectorDockVisible->setChecked(!printingSelectorDockWidget->isHidden());
+
+    aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
+    aDeckDockFloating->setEnabled(aDeckDockVisible->isChecked());
+    aFilterDockFloating->setEnabled(aFilterDockVisible->isChecked());
+    aPrintingSelectorDockFloating->setEnabled(aPrintingSelectorDockVisible->isChecked());
+
+    aCardInfoDockFloating->setChecked(cardInfoDockWidget->isFloating());
+    aFilterDockFloating->setChecked(filterDockWidget->isFloating());
+    aDeckDockFloating->setChecked(deckDockWidget->isFloating());
+    aPrintingSelectorDockFloating->setChecked(printingSelectorDockWidget->isFloating());
+
+    cardInfoDockWidget->setMinimumSize(layouts.getDeckEditorCardSize());
+    cardInfoDockWidget->setMaximumSize(layouts.getDeckEditorCardSize());
+
+    filterDockWidget->setMinimumSize(layouts.getDeckEditorFilterSize());
+    filterDockWidget->setMaximumSize(layouts.getDeckEditorFilterSize());
+
+    deckDockWidget->setMinimumSize(layouts.getDeckEditorDeckSize());
+    deckDockWidget->setMaximumSize(layouts.getDeckEditorDeckSize());
+
+    printingSelectorDockWidget->setMinimumSize(layouts.getDeckEditorPrintingSelectorSize());
+    printingSelectorDockWidget->setMaximumSize(layouts.getDeckEditorPrintingSelectorSize());
+
+    QTimer::singleShot(100, this, &TabDeckEditor::freeDocksSize);
+}
+
+void TabDeckEditor::restartLayout()
+{
+    deckDockWidget->setVisible(true);
+    cardInfoDockWidget->setVisible(true);
+    filterDockWidget->setVisible(true);
+    printingSelectorDockWidget->setVisible(false);
+
+    deckDockWidget->setFloating(false);
+    cardInfoDockWidget->setFloating(false);
+    filterDockWidget->setFloating(false);
+    printingSelectorDockWidget->setFloating(false);
+
+    aCardInfoDockVisible->setChecked(true);
+    aDeckDockVisible->setChecked(true);
+    aFilterDockVisible->setChecked(true);
+    aPrintingSelectorDockVisible->setChecked(false);
+
+    aCardInfoDockFloating->setChecked(false);
+    aDeckDockFloating->setChecked(false);
+    aFilterDockFloating->setChecked(false);
+    aPrintingSelectorDockFloating->setChecked(false);
+
+    setCentralWidget(databaseDisplayDockWidget);
+    addDockWidget(static_cast<Qt::DockWidgetArea>(2), deckDockWidget);
+    addDockWidget(static_cast<Qt::DockWidgetArea>(2), cardInfoDockWidget);
+    addDockWidget(static_cast<Qt::DockWidgetArea>(2), filterDockWidget);
+    addDockWidget(static_cast<Qt::DockWidgetArea>(2), printingSelectorDockWidget);
+
+    splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Horizontal);
+    splitDockWidget(printingSelectorDockWidget, deckDockWidget, Qt::Horizontal);
+    splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Horizontal);
+    splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Vertical);
+
+    QTimer::singleShot(100, this, &TabDeckEditor::freeDocksSize);
+}
+
+void TabDeckEditor::freeDocksSize()
+{
+    deckDockWidget->setMinimumSize(100, 100);
+    deckDockWidget->setMaximumSize(5000, 5000);
+
+    cardInfoDockWidget->setMinimumSize(100, 100);
+    cardInfoDockWidget->setMaximumSize(5000, 5000);
+
+    filterDockWidget->setMinimumSize(100, 100);
+    filterDockWidget->setMaximumSize(5000, 5000);
+
+    printingSelectorDockWidget->setMinimumSize(100, 100);
+    printingSelectorDockWidget->setMaximumSize(5000, 5000);
+}
+
+void TabDeckEditor::dockVisibleTriggered()
+{
+    QObject *o = sender();
+    if (o == aCardInfoDockVisible) {
+        cardInfoDockWidget->setHidden(!aCardInfoDockVisible->isChecked());
+        aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
+        return;
+    }
+
+    if (o == aDeckDockVisible) {
+        deckDockWidget->setHidden(!aDeckDockVisible->isChecked());
+        aDeckDockFloating->setEnabled(aDeckDockVisible->isChecked());
+        return;
+    }
+
+    if (o == aFilterDockVisible) {
+        filterDockWidget->setHidden(!aFilterDockVisible->isChecked());
+        aFilterDockFloating->setEnabled(aFilterDockVisible->isChecked());
+        return;
+    }
+
+    if (o == aPrintingSelectorDockVisible) {
+        printingSelectorDockWidget->setHidden(!aPrintingSelectorDockVisible->isChecked());
+        aPrintingSelectorDockFloating->setEnabled(aPrintingSelectorDockVisible->isChecked());
+        return;
+    }
+}
+
+void TabDeckEditor::dockFloatingTriggered()
+{
+    QObject *o = sender();
+    if (o == aCardInfoDockFloating) {
+        cardInfoDockWidget->setFloating(aCardInfoDockFloating->isChecked());
+        return;
+    }
+
+    if (o == aDeckDockFloating) {
+        deckDockWidget->setFloating(aDeckDockFloating->isChecked());
+        return;
+    }
+
+    if (o == aFilterDockFloating) {
+        filterDockWidget->setFloating(aFilterDockFloating->isChecked());
+        return;
+    }
+
+    if (o == aPrintingSelectorDockFloating) {
+        printingSelectorDockWidget->setFloating(aPrintingSelectorDockFloating->isChecked());
+        return;
+    }
+}
+
+void TabDeckEditor::dockTopLevelChanged(bool topLevel)
+{
+    QObject *o = sender();
+    if (o == cardInfoDockWidget) {
+        aCardInfoDockFloating->setChecked(topLevel);
+        return;
+    }
+
+    if (o == deckDockWidget) {
+        aDeckDockFloating->setChecked(topLevel);
+        return;
+    }
+
+    if (o == filterDockWidget) {
+        aFilterDockFloating->setChecked(topLevel);
+        return;
+    }
+
+    if (o == printingSelectorDockWidget) {
+        aPrintingSelectorDockFloating->setChecked(topLevel);
+        return;
+    }
+}
+
+// Method uses to sync docks state with menu items state
+bool TabDeckEditor::eventFilter(QObject *o, QEvent *e)
+{
+    if (e->type() == QEvent::Close) {
+        if (o == cardInfoDockWidget) {
+            aCardInfoDockVisible->setChecked(false);
+            aCardInfoDockFloating->setEnabled(false);
+        } else if (o == deckDockWidget) {
+            aDeckDockVisible->setChecked(false);
+            aDeckDockFloating->setEnabled(false);
+        } else if (o == filterDockWidget) {
+            aFilterDockVisible->setChecked(false);
+            aFilterDockFloating->setEnabled(false);
+        } else if (o == printingSelectorDockWidget) {
+            aPrintingSelectorDockVisible->setChecked(false);
+            aPrintingSelectorDockFloating->setEnabled(false);
+        }
+    }
+    if (o == this && e->type() == QEvent::Hide) {
+        LayoutsSettings &layouts = SettingsCache::instance().layouts();
+        layouts.setDeckEditorLayoutState(saveState());
+        layouts.setDeckEditorGeometry(saveGeometry());
+        layouts.setDeckEditorCardSize(cardInfoDockWidget->size());
+        layouts.setDeckEditorFilterSize(filterDockWidget->size());
+        layouts.setDeckEditorDeckSize(deckDockWidget->size());
+        layouts.setDeckEditorPrintingSelectorSize(printingSelectorDockWidget->size());
+    }
+    return false;
+}
\ No newline at end of file
diff --git a/cockatrice/src/tabs/tab_deck_editor.h b/cockatrice/src/tabs/tab_deck_editor.h
new file mode 100644
index 000000000..078560da1
--- /dev/null
+++ b/cockatrice/src/tabs/tab_deck_editor.h
@@ -0,0 +1,41 @@
+#ifndef WINDOW_DECKEDITOR_H
+#define WINDOW_DECKEDITOR_H
+
+#include "../card/card_info.h"
+#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
+#include "../utility/key_signals.h"
+#include "abstract_tab_deck_editor.h"
+
+class CardDatabaseModel;
+class CardDatabaseDisplayModel;
+class DeckListModel;
+
+class QLabel;
+class DeckLoader;
+
+class TabDeckEditor : public AbstractTabDeckEditor
+{
+    Q_OBJECT
+
+protected slots:
+    void loadLayout() override;
+    void restartLayout() override;
+    void freeDocksSize() override;
+    void refreshShortcuts() override;
+
+    bool eventFilter(QObject *o, QEvent *e) override;
+    void dockVisibleTriggered() override;
+    void dockFloatingTriggered() override;
+    void dockTopLevelChanged(bool topLevel) override;
+
+public:
+    explicit TabDeckEditor(TabSupervisor *_tabSupervisor);
+    void retranslateUi() override;
+    QString getTabText() const override;
+    void createMenus() override;
+
+public slots:
+    void showPrintingSelector() override;
+};
+
+#endif
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/tabs/tab_deck_storage.cpp
similarity index 93%
rename from cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
rename to cockatrice/src/tabs/tab_deck_storage.cpp
index 26e3f2ecf..898612e6f 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/tabs/tab_deck_storage.cpp
@@ -1,9 +1,19 @@
 #include "tab_deck_storage.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_loader.h"
-#include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
-#include "../interface/widgets/utility/get_text_with_max.h"
+#include "../client/get_text_with_max.h"
+#include "../deck/deck_loader.h"
+#include "../server/pending_command.h"
+#include "../server/remote/remote_decklist_tree_widget.h"
+#include "../settings/cache_settings.h"
+#include "deck_list.h"
+#include "pb/command_deck_del.pb.h"
+#include "pb/command_deck_del_dir.pb.h"
+#include "pb/command_deck_download.pb.h"
+#include "pb/command_deck_new_dir.pb.h"
+#include "pb/command_deck_upload.pb.h"
+#include "pb/response.pb.h"
+#include "pb/response_deck_download.pb.h"
+#include "pb/response_deck_upload.pb.h"
 
 #include <QAction>
 #include <QApplication>
@@ -11,6 +21,7 @@
 #include <QDesktopServices>
 #include <QFileSystemModel>
 #include <QGroupBox>
+#include <QHBoxLayout>
 #include <QHeaderView>
 #include <QInputDialog>
 #include <QMessageBox>
@@ -18,16 +29,6 @@
 #include <QTreeView>
 #include <QUrl>
 #include <QVBoxLayout>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/protocol/pb/command_deck_del.pb.h>
-#include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
-#include <libcockatrice/protocol/pb/command_deck_download.pb.h>
-#include <libcockatrice/protocol/pb/command_deck_new_dir.pb.h>
-#include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_download.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_upload.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
 
 TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
                                AbstractClient *_client,
@@ -241,11 +242,11 @@ void TabDeckStorage::actOpenLocalDeck()
             continue;
         QString filePath = localDirModel->filePath(curLeft);
 
-        std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(filePath, DeckFileFormat::Cockatrice, true);
-        if (!deckOpt)
+        DeckLoader deckLoader;
+        if (!deckLoader.loadFromFile(filePath, DeckLoader::CockatriceFormat, true))
             continue;
 
-        emit openDeckEditor(deckOpt.value());
+        emit openDeckEditor(&deckLoader);
     }
 }
 
@@ -307,14 +308,12 @@ void TabDeckStorage::uploadDeck(const QString &filePath, const QString &targetPa
     QFile deckFile(filePath);
     QFileInfo deckFileInfo(deckFile);
 
-    std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(filePath, DeckFileFormat::Cockatrice, true);
-    if (!deckOpt) {
+    DeckLoader deck;
+    if (!deck.loadFromFile(filePath, DeckLoader::CockatriceFormat)) {
         QMessageBox::critical(this, tr("Error"), tr("Invalid deck file"));
         return;
     }
 
-    DeckList deck = deckOpt.value().deckList;
-
     if (deck.getName().isEmpty()) {
         bool ok;
         QString deckName =
@@ -434,11 +433,11 @@ void TabDeckStorage::openRemoteDeckFinished(const Response &r, const CommandCont
     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)
+    DeckLoader loader;
+    if (!loader.loadFromRemote(QString::fromStdString(resp.deck()), cmd.deck_id()))
         return;
 
-    emit openDeckEditor(deckOpt.value());
+    emit openDeckEditor(&loader);
 }
 
 void TabDeckStorage::actDownload()
@@ -494,9 +493,8 @@ void TabDeckStorage::downloadFinished(const Response &r,
     const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
     QString filePath = extraData.toString();
 
-    DeckList deckList = DeckList(QString::fromStdString(resp.deck()));
-
-    DeckLoader::saveToFile(deckList, filePath, DeckFileFormat::Cockatrice);
+    DeckLoader deck(QString::fromStdString(resp.deck()));
+    deck.saveToFile(filePath, DeckLoader::CockatriceFormat);
 }
 
 void TabDeckStorage::actNewFolder()
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h b/cockatrice/src/tabs/tab_deck_storage.h
similarity index 88%
rename from cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
rename to cockatrice/src/tabs/tab_deck_storage.h
index f8c0497f7..6e9deb320 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
+++ b/cockatrice/src/tabs/tab_deck_storage.h
@@ -1,19 +1,10 @@
-/**
- * @file tab_deck_storage.h
- * @ingroup DeckStorageWidgets
- * @ingroup Tabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_DECK_STORAGE_H
 #define TAB_DECK_STORAGE_H
 
-#include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
+#include "../server/abstract_client.h"
+#include "../server/remote/remote_decklist_tree_widget.h"
 #include "tab.h"
 
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-
-struct LoadedDeck;
 class ServerInfo_User;
 class AbstractClient;
 class QTreeView;
@@ -24,6 +15,7 @@ class QTreeWidgetItem;
 class QGroupBox;
 class CommandContainer;
 class Response;
+class DeckLoader;
 
 class TabDeckStorage : public Tab
 {
@@ -87,7 +79,7 @@ public:
         return tr("Deck Storage");
     }
 signals:
-    void openDeckEditor(const LoadedDeck &deck);
+    void openDeckEditor(const DeckLoader *deckLoader);
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/tabs/tab_game.cpp
similarity index 77%
rename from cockatrice/src/interface/widgets/tabs/tab_game.cpp
rename to cockatrice/src/tabs/tab_game.cpp
index 161829b35..a07430dbb 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/tabs/tab_game.cpp
@@ -1,6 +1,9 @@
 #include "tab_game.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../client/network/replay_timeline_widget.h"
+#include "../database/card_database.h"
+#include "../database/card_database_manager.h"
+#include "../dialogs/dlg_create_game.h"
 #include "../game/board/arrow_item.h"
 #include "../game/board/card_item.h"
 #include "../game/deckview/deck_view_container.h"
@@ -13,35 +16,36 @@
 #include "../game/player/player.h"
 #include "../game/player/player_list_widget.h"
 #include "../game/replay.h"
-#include "../interface/card_picture_loader/card_picture_loader.h"
+#include "../game/zones/card_zone.h"
+#include "../interface/line_edit_completer.h"
 #include "../interface/widgets/cards/card_info_frame_widget.h"
-#include "../interface/widgets/dialogs/dlg_create_game.h"
-#include "../interface/widgets/server/user/user_list_manager.h"
-#include "../interface/widgets/utility/line_edit_completer.h"
 #include "../interface/window_main.h"
 #include "../main.h"
-#include "../utility/visibility_change_listener.h"
+#include "../picture_loader/picture_loader.h"
+#include "../server/abstract_client.h"
+#include "../server/user/user_list_manager.h"
+#include "../settings/cache_settings.h"
+#include "pb/event_game_joined.pb.h"
+#include "pb/game_replay.pb.h"
+#include "pb/serverinfo_player.pb.h"
+#include "pb/serverinfo_user.pb.h"
 #include "tab_supervisor.h"
+#include "trice_limits.h"
 
 #include <QAction>
 #include <QCompleter>
 #include <QDebug>
 #include <QDockWidget>
+#include <QFileDialog>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMenu>
 #include <QMessageBox>
+#include <QSplitter>
 #include <QStackedWidget>
 #include <QTimer>
+#include <QToolButton>
 #include <QWidget>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
-#include <libcockatrice/protocol/pb/game_replay.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/utility/trice_limits.h>
 
 TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
     : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr)
@@ -98,11 +102,12 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor,
     createMessageDock();
     createPlayAreaWidget();
     createDeckViewContainerWidget();
-    replayDock = nullptr;
+    createReplayDock(nullptr);
 
     addDockWidget(Qt::RightDockWidgetArea, cardInfoDock);
     addDockWidget(Qt::RightDockWidgetArea, playerListDock);
     addDockWidget(Qt::RightDockWidgetArea, messageLayoutDock);
+    replayDock->setHidden(true);
 
     mainWidget = new QStackedWidget(this);
     mainWidget->addWidget(deckViewContainerWidget);
@@ -256,18 +261,13 @@ void TabGame::emitUserEvent()
 
 TabGame::~TabGame()
 {
-    if (replayManager) {
-        delete replayManager->replay;
-    }
-    for (auto &player : game->getPlayerManager()->getPlayers()) {
-        player->clear();
-    }
+    delete replayManager->replay;
 }
 
 void TabGame::updatePlayerListDockTitle()
 {
-    QString type = replayDock ? tr("Replay") : tr("Game");
-    QString tabText = " | " + type + " #" + QString::number(game->getGameMetaInfo()->gameId());
+    QString tabText = " | " + (replayManager->replay ? tr("Replay") : tr("Game")) + " #" +
+                      QString::number(game->getGameMetaInfo()->gameId());
     QString userCountInfo =
         QString(" %1/%2").arg(game->getPlayerManager()->getPlayerCount()).arg(game->getGameMetaInfo()->maxPlayers());
     playerListDock->setWindowTitle(tr("Player List") + userCountInfo +
@@ -276,8 +276,8 @@ void TabGame::updatePlayerListDockTitle()
 
 void TabGame::retranslateUi()
 {
-    QString type = replayDock ? tr("Replay") : tr("Game");
-    QString tabText = " | " + type + " #" + QString::number(game->getGameMetaInfo()->gameId());
+    QString tabText = " | " + (replayManager->replay ? tr("Replay") : tr("Game")) + " #" +
+                      QString::number(game->getGameMetaInfo()->gameId());
 
     updatePlayerListDockTitle();
     cardInfoDock->setWindowTitle(tr("Card Info") + (cardInfoDock->isWindow() ? tabText : QString()));
@@ -323,11 +323,10 @@ void TabGame::retranslateUi()
         }
     }
     if (aLeaveGame) {
-        if (replayDock) {
-            aLeaveGame->setText(tr("C&lose replay"));
-        } else {
-            aLeaveGame->setText(tr("&Leave game"));
-        }
+        aLeaveGame->setText(tr("&Leave game"));
+    }
+    if (aCloseReplay) {
+        aCloseReplay->setText(tr("C&lose replay"));
     }
     if (aFocusChat) {
         aFocusChat->setText(tr("&Focus Chat"));
@@ -341,18 +340,23 @@ void TabGame::retranslateUi()
     }
 
     viewMenu->setTitle(tr("&View"));
+    cardInfoDockMenu->setTitle(tr("Card Info"));
+    messageLayoutDockMenu->setTitle(tr("Messages"));
+    playerListDockMenu->setTitle(tr("Player List"));
 
-    dockToActions[cardInfoDock].menu->setTitle(tr("Card Info"));
-    dockToActions[messageLayoutDock].menu->setTitle(tr("Messages"));
-    dockToActions[playerListDock].menu->setTitle(tr("Player List"));
+    aCardInfoDockVisible->setText(tr("Visible"));
+    aCardInfoDockFloating->setText(tr("Floating"));
+
+    aMessageLayoutDockVisible->setText(tr("Visible"));
+    aMessageLayoutDockFloating->setText(tr("Floating"));
+
+    aPlayerListDockVisible->setText(tr("Visible"));
+    aPlayerListDockFloating->setText(tr("Floating"));
 
     if (replayDock) {
-        dockToActions[replayDock].menu->setTitle(tr("Replay Timeline"));
-    }
-
-    for (auto &actions : dockToActions.values()) {
-        actions.aVisible->setText(tr("Visible"));
-        actions.aFloating->setText(tr("Floating"));
+        replayDockMenu->setTitle(tr("Replay Timeline"));
+        aReplayDockVisible->setText(tr("Visible"));
+        aReplayDockFloating->setText(tr("Floating"));
     }
 
     aResetLayout->setText(tr("Reset layout"));
@@ -440,6 +444,9 @@ void TabGame::refreshShortcuts()
     if (aLeaveGame) {
         aLeaveGame->setShortcuts(shortcuts.getShortcut("Player/aLeaveGame"));
     }
+    if (aCloseReplay) {
+        aCloseReplay->setShortcuts(shortcuts.getShortcut("Player/aCloseReplay"));
+    }
     if (aResetLayout) {
         aResetLayout->setShortcuts(shortcuts.getShortcut("Player/aResetLayout"));
     }
@@ -491,12 +498,14 @@ void TabGame::actConcede()
                                   QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
             return;
         emit game->getPlayerManager()->activeLocalPlayerConceded();
+        player->setConceded(true);
     } else {
         if (QMessageBox::question(this, tr("Unconcede"),
                                   tr("You have already conceded.  Do you want to return to this game?"),
                                   QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
             return;
         emit game->getPlayerManager()->activeLocalPlayerUnconceded();
+        player->setConceded(false);
     }
 }
 
@@ -515,7 +524,7 @@ bool TabGame::leaveGame()
                 return false;
         }
 
-        if (!replayDock)
+        if (!replayManager->replay)
             emit gameLeft();
     }
     return true;
@@ -641,6 +650,14 @@ void TabGame::notifyPlayerKicked()
     msgBox.exec();
 }
 
+void TabGame::processPlayerLeave(Player *leavingPlayer)
+{
+    QString playerName = "@" + leavingPlayer->getPlayerInfo()->getName();
+    removePlayerFromAutoCompleteList(playerName);
+
+    scene->removePlayer(leavingPlayer);
+}
+
 Player *TabGame::addPlayer(Player *newPlayer)
 {
     QString newPlayerName = "@" + newPlayer->getPlayerInfo()->getName();
@@ -690,31 +707,6 @@ void TabGame::addLocalPlayer(Player *newPlayer, int playerId)
     }
 }
 
-void TabGame::processPlayerLeave(Player *leavingPlayer)
-{
-    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.
-    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;
-                }
-            }
-        }
-    }
-}
-
 void TabGame::processRemotePlayerDeckSelect(QString deckList, int playerId, QString playerName)
 {
     DeckList loader;
@@ -747,10 +739,10 @@ void TabGame::loadDeckForLocalPlayer(Player *localPlayer, int playerId, ServerIn
 {
     TabbedDeckViewContainer *deckViewContainer = deckViewContainers.value(playerId);
     if (playerInfo.has_deck_list()) {
-        DeckList deckList = DeckList(QString::fromStdString(playerInfo.deck_list()));
-        CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(deckList.getCardRefList()));
-        deckViewContainer->playerDeckView->setDeck(deckList);
-        localPlayer->setDeck(deckList);
+        DeckLoader newDeck(QString::fromStdString(playerInfo.deck_list()));
+        PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
+        deckViewContainer->playerDeckView->setDeck(newDeck);
+        localPlayer->setDeck(newDeck);
     }
 }
 
@@ -902,7 +894,7 @@ QString TabGame::getTabText() const
     QString gameId(QString::number(game->getGameMetaInfo()->gameId()));
 
     QString tabText;
-    if (replayDock)
+    if (replayManager->replay)
         tabText.append(tr("Replay") + " ");
     if (!gameTypeInfo.isEmpty())
         tabText.append(gameTypeInfo + " ");
@@ -970,11 +962,12 @@ void TabGame::createMenuItems()
     connect(aLeaveGame, &QAction::triggered, this, &TabGame::closeRequest);
     aFocusChat = new QAction(this);
     connect(aFocusChat, &QAction::triggered, sayEdit, qOverload<>(&LineEditCompleter::setFocus));
+    aCloseReplay = nullptr;
 
     phasesMenu = new TearOffMenu(this);
 
     for (int i = 0; i < phasesToolbar->phaseCount(); ++i) {
-        auto *temp = new QAction(QString(), this);
+        QAction *temp = new QAction(QString(), this);
         connect(temp, &QAction::triggered, this, &TabGame::actPhaseAction);
         phasesMenu->addAction(temp);
         phaseActions.append(temp);
@@ -1019,12 +1012,13 @@ void TabGame::createReplayMenuItems()
     aGameInfo = nullptr;
     aConcede = nullptr;
     aFocusChat = nullptr;
-    aLeaveGame = new QAction(this);
-    connect(aLeaveGame, &QAction::triggered, this, &TabGame::closeRequest);
+    aLeaveGame = nullptr;
+    aCloseReplay = new QAction(this);
+    connect(aCloseReplay, &QAction::triggered, this, &TabGame::closeRequest);
 
     phasesMenu = nullptr;
     gameMenu = new QMenu(this);
-    gameMenu->addAction(aLeaveGame);
+    gameMenu->addAction(aCloseReplay);
 
     aCardMenu = nullptr;
 
@@ -1035,12 +1029,40 @@ void TabGame::createViewMenuItems()
 {
     viewMenu = new QMenu(this);
 
-    registerDockWidget(viewMenu, cardInfoDock, {250, 360});
-    registerDockWidget(viewMenu, messageLayoutDock, {250, 200});
-    registerDockWidget(viewMenu, playerListDock, {250, 50});
+    cardInfoDockMenu = viewMenu->addMenu(QString());
+    messageLayoutDockMenu = viewMenu->addMenu(QString());
+    playerListDockMenu = viewMenu->addMenu(QString());
+
+    aCardInfoDockVisible = cardInfoDockMenu->addAction(QString());
+    aCardInfoDockVisible->setCheckable(true);
+    connect(aCardInfoDockVisible, &QAction::triggered, this, &TabGame::dockVisibleTriggered);
+    aCardInfoDockFloating = cardInfoDockMenu->addAction(QString());
+    aCardInfoDockFloating->setCheckable(true);
+    connect(aCardInfoDockFloating, &QAction::triggered, this, &TabGame::dockFloatingTriggered);
+
+    aMessageLayoutDockVisible = messageLayoutDockMenu->addAction(QString());
+    aMessageLayoutDockVisible->setCheckable(true);
+    connect(aMessageLayoutDockVisible, &QAction::triggered, this, &TabGame::dockVisibleTriggered);
+    aMessageLayoutDockFloating = messageLayoutDockMenu->addAction(QString());
+    aMessageLayoutDockFloating->setCheckable(true);
+    connect(aMessageLayoutDockFloating, &QAction::triggered, this, &TabGame::dockFloatingTriggered);
+
+    aPlayerListDockVisible = playerListDockMenu->addAction(QString());
+    aPlayerListDockVisible->setCheckable(true);
+    connect(aPlayerListDockVisible, &QAction::triggered, this, &TabGame::dockVisibleTriggered);
+    aPlayerListDockFloating = playerListDockMenu->addAction(QString());
+    aPlayerListDockFloating->setCheckable(true);
+    connect(aPlayerListDockFloating, &QAction::triggered, this, &TabGame::dockFloatingTriggered);
 
     if (replayDock) {
-        registerDockWidget(viewMenu, replayDock, {900, 100});
+        replayDockMenu = viewMenu->addMenu(QString());
+
+        aReplayDockVisible = replayDockMenu->addAction(QString());
+        aReplayDockVisible->setCheckable(true);
+        connect(aReplayDockVisible, &QAction::triggered, this, &TabGame::dockVisibleTriggered);
+        aReplayDockFloating = replayDockMenu->addAction(QString());
+        aReplayDockFloating->setCheckable(true);
+        connect(aReplayDockFloating, &QAction::triggered, this, &TabGame::dockFloatingTriggered);
     }
 
     viewMenu->addSeparator();
@@ -1052,45 +1074,68 @@ void TabGame::createViewMenuItems()
     addTabMenu(viewMenu);
 }
 
-void TabGame::registerDockWidget(QMenu *_viewMenu, QDockWidget *widget, const QSize &defaultSize)
-{
-    QMenu *menu = _viewMenu->addMenu(QString());
-
-    QAction *aVisible = menu->addAction(QString());
-    aVisible->setCheckable(true);
-
-    QAction *aFloating = menu->addAction(QString());
-    aFloating->setCheckable(true);
-    aFloating->setEnabled(false);
-
-    // user interaction
-    connect(aVisible, &QAction::triggered, widget, [widget](bool checked) { widget->setVisible(checked); });
-    connect(aFloating, &QAction::triggered, this, [widget](bool checked) { widget->setFloating(checked); });
-
-    // sync aFloating's enabled state with aVisible's checked state
-    connect(aVisible, &QAction::toggled, aFloating, [aFloating](bool checked) { aFloating->setEnabled(checked); });
-
-    // sync aFloating with dockWidget's floating state
-    connect(widget, &QDockWidget::topLevelChanged, aFloating,
-            [aFloating](bool topLevel) { aFloating->setChecked(topLevel); });
-
-    // sync aVisible with dockWidget's visible state
-    auto filter = new VisibilityChangeListener(widget);
-    connect(filter, &VisibilityChangeListener::visibilityChanged, aVisible,
-            [aVisible](bool visible) { aVisible->setChecked(visible); });
-
-    dockToActions.insert(widget, {menu, aVisible, aFloating, defaultSize});
-}
-
 void TabGame::loadLayout()
 {
     LayoutsSettings &layouts = SettingsCache::instance().layouts();
-    if (replayDock) {
+    if (replayManager->replay) {
         restoreGeometry(layouts.getReplayPlayAreaGeometry());
         restoreState(layouts.getReplayPlayAreaLayoutState());
+
+        cardInfoDock->setMinimumSize(layouts.getReplayCardInfoSize());
+        cardInfoDock->setMaximumSize(layouts.getReplayCardInfoSize());
+        messageLayoutDock->setMinimumSize(layouts.getReplayMessageLayoutSize());
+        messageLayoutDock->setMaximumSize(layouts.getReplayMessageLayoutSize());
+        playerListDock->setMinimumSize(layouts.getReplayPlayerListSize());
+        playerListDock->setMaximumSize(layouts.getReplayPlayerListSize());
+        replayDock->setMinimumSize(layouts.getReplayReplaySize());
+        replayDock->setMaximumSize(layouts.getReplayReplaySize());
     } else {
         restoreGeometry(layouts.getGamePlayAreaGeometry());
         restoreState(layouts.getGamePlayAreaLayoutState());
+
+        cardInfoDock->setMinimumSize(layouts.getGameCardInfoSize());
+        cardInfoDock->setMaximumSize(layouts.getGameCardInfoSize());
+        messageLayoutDock->setMinimumSize(layouts.getGameMessageLayoutSize());
+        messageLayoutDock->setMaximumSize(layouts.getGameMessageLayoutSize());
+        playerListDock->setMinimumSize(layouts.getGamePlayerListSize());
+        playerListDock->setMaximumSize(layouts.getGamePlayerListSize());
+    }
+
+    aCardInfoDockVisible->setChecked(cardInfoDock->isVisible());
+    aMessageLayoutDockVisible->setChecked(messageLayoutDock->isVisible());
+    aPlayerListDockVisible->setChecked(playerListDock->isVisible());
+
+    aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
+    aMessageLayoutDockFloating->setEnabled(aMessageLayoutDockVisible->isChecked());
+    aPlayerListDockFloating->setEnabled(aPlayerListDockVisible->isChecked());
+
+    aCardInfoDockFloating->setChecked(cardInfoDock->isFloating());
+    aMessageLayoutDockFloating->setChecked(messageLayoutDock->isFloating());
+    aPlayerListDockFloating->setChecked(playerListDock->isFloating());
+
+    if (replayManager->replay) {
+        aReplayDockVisible->setChecked(replayDock->isVisible());
+        aReplayDockFloating->setEnabled(aReplayDockVisible->isChecked());
+        aReplayDockFloating->setChecked(replayDock->isFloating());
+    }
+
+    QTimer::singleShot(100, this, &TabGame::freeDocksSize);
+}
+
+void TabGame::freeDocksSize()
+{
+    cardInfoDock->setMinimumSize(100, 100);
+    cardInfoDock->setMaximumSize(5000, 5000);
+
+    messageLayoutDock->setMinimumSize(100, 100);
+    messageLayoutDock->setMaximumSize(5000, 5000);
+
+    playerListDock->setMinimumSize(100, 100);
+    playerListDock->setMaximumSize(5000, 5000);
+
+    if (replayDock) {
+        replayDock->setMinimumSize(100, 100);
+        replayDock->setMaximumSize(5000, 5000);
     }
 }
 
@@ -1104,6 +1149,14 @@ void TabGame::actResetLayout()
     playerListDock->setFloating(false);
     messageLayoutDock->setFloating(false);
 
+    aCardInfoDockVisible->setChecked(true);
+    aPlayerListDockVisible->setChecked(true);
+    aMessageLayoutDockVisible->setChecked(true);
+
+    aCardInfoDockFloating->setChecked(false);
+    aPlayerListDockFloating->setChecked(false);
+    aMessageLayoutDockFloating->setChecked(false);
+
     addDockWidget(Qt::RightDockWidgetArea, cardInfoDock);
     addDockWidget(Qt::RightDockWidgetArea, playerListDock);
     addDockWidget(Qt::RightDockWidgetArea, messageLayoutDock);
@@ -1112,16 +1165,27 @@ void TabGame::actResetLayout()
         replayDock->setVisible(true);
         replayDock->setFloating(false);
         addDockWidget(Qt::BottomDockWidgetArea, replayDock);
+        aReplayDockVisible->setChecked(true);
+        aReplayDockFloating->setChecked(false);
 
-        cardInfoDock->resize(250, 360);
-        messageLayoutDock->resize(250, 200);
-        playerListDock->resize(250, 50);
-        replayDock->resize(900, 100);
+        cardInfoDock->setMinimumSize(250, 360);
+        cardInfoDock->setMaximumSize(250, 360);
+        messageLayoutDock->setMinimumSize(250, 200);
+        messageLayoutDock->setMaximumSize(250, 200);
+        playerListDock->setMinimumSize(250, 50);
+        playerListDock->setMaximumSize(250, 50);
+        replayDock->setMinimumSize(900, 100);
+        replayDock->setMaximumSize(900, 100);
     } else {
-        cardInfoDock->resize(250, 360);
-        messageLayoutDock->resize(250, 250);
-        playerListDock->resize(250, 50);
+        cardInfoDock->setMinimumSize(250, 360);
+        cardInfoDock->setMaximumSize(250, 360);
+        messageLayoutDock->setMinimumSize(250, 250);
+        messageLayoutDock->setMaximumSize(250, 250);
+        playerListDock->setMinimumSize(250, 50);
+        playerListDock->setMaximumSize(250, 50);
     }
+
+    QTimer::singleShot(100, this, &TabGame::freeDocksSize);
 }
 
 void TabGame::createPlayAreaWidget(bool bReplay)
@@ -1154,6 +1218,9 @@ void TabGame::createReplayDock(GameReplay *replay)
                             QDockWidget::DockWidgetMovable);
     replayDock->setWidget(replayManager);
     replayDock->setFloating(false);
+
+    replayDock->installEventFilter(this);
+    connect(replayDock, &QDockWidget::topLevelChanged, this, &TabGame::dockTopLevelChanged);
 }
 
 void TabGame::createDeckViewContainerWidget(bool bReplay)
@@ -1192,6 +1259,9 @@ void TabGame::createCardInfoDock(bool bReplay)
                               QDockWidget::DockWidgetMovable);
     cardInfoDock->setWidget(cardBoxLayoutWidget);
     cardInfoDock->setFloating(false);
+
+    cardInfoDock->installEventFilter(this);
+    connect(cardInfoDock, &QDockWidget::topLevelChanged, this, &TabGame::dockTopLevelChanged);
 }
 
 void TabGame::createPlayerListDock(bool bReplay)
@@ -1211,6 +1281,9 @@ void TabGame::createPlayerListDock(bool bReplay)
                                 QDockWidget::DockWidgetMovable);
     playerListDock->setWidget(playerListWidget);
     playerListDock->setFloating(false);
+
+    playerListDock->installEventFilter(this);
+    connect(playerListDock, &QDockWidget::topLevelChanged, this, &TabGame::dockTopLevelChanged);
 }
 
 void TabGame::createMessageDock(bool bReplay)
@@ -1291,18 +1364,128 @@ void TabGame::createMessageDock(bool bReplay)
                                    QDockWidget::DockWidgetMovable);
     messageLayoutDock->setWidget(messageLogLayoutWidget);
     messageLayoutDock->setFloating(false);
+
+    messageLayoutDock->installEventFilter(this);
+    connect(messageLayoutDock, &QDockWidget::topLevelChanged, this, &TabGame::dockTopLevelChanged);
 }
 
 void TabGame::hideEvent(QHideEvent *event)
 {
     LayoutsSettings &layouts = SettingsCache::instance().layouts();
-    if (replayDock) {
+    if (replayManager->replay) {
         layouts.setReplayPlayAreaState(saveState());
         layouts.setReplayPlayAreaGeometry(saveGeometry());
+        layouts.setReplayCardInfoSize(cardInfoDock->size());
+        layouts.setReplayMessageLayoutSize(messageLayoutDock->size());
+        layouts.setReplayPlayerListSize(playerListDock->size());
+        layouts.setReplayReplaySize(replayDock->size());
     } else {
         layouts.setGamePlayAreaState(saveState());
         layouts.setGamePlayAreaGeometry(saveGeometry());
+        layouts.setGameCardInfoSize(cardInfoDock->size());
+        layouts.setGameMessageLayoutSize(messageLayoutDock->size());
+        layouts.setGamePlayerListSize(playerListDock->size());
     }
 
     Tab::hideEvent(event);
 }
+
+// Method uses to sync docks state with menu items state
+bool TabGame::eventFilter(QObject *o, QEvent *e)
+{
+    if (e->type() == QEvent::Close) {
+        if (o == cardInfoDock) {
+            aCardInfoDockVisible->setChecked(false);
+            aCardInfoDockFloating->setEnabled(false);
+        } else if (o == messageLayoutDock) {
+            aMessageLayoutDockVisible->setChecked(false);
+            aMessageLayoutDockFloating->setEnabled(false);
+        } else if (o == playerListDock) {
+            aPlayerListDockVisible->setChecked(false);
+            aPlayerListDockFloating->setEnabled(false);
+        } else if (o == replayDock) {
+            aReplayDockVisible->setChecked(false);
+            aReplayDockFloating->setEnabled(false);
+        }
+    }
+
+    return false;
+}
+
+void TabGame::dockVisibleTriggered()
+{
+    QObject *o = sender();
+    if (o == aCardInfoDockVisible) {
+        cardInfoDock->setVisible(aCardInfoDockVisible->isChecked());
+        aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
+        return;
+    }
+
+    if (o == aMessageLayoutDockVisible) {
+        messageLayoutDock->setVisible(aMessageLayoutDockVisible->isChecked());
+        aMessageLayoutDockFloating->setEnabled(aMessageLayoutDockVisible->isChecked());
+        return;
+    }
+
+    if (o == aPlayerListDockVisible) {
+        playerListDock->setVisible(aPlayerListDockVisible->isChecked());
+        aPlayerListDockFloating->setEnabled(aPlayerListDockVisible->isChecked());
+        return;
+    }
+
+    if (o == aReplayDockVisible) {
+        replayDock->setVisible(aReplayDockVisible->isChecked());
+        aReplayDockFloating->setEnabled(aReplayDockVisible->isChecked());
+        return;
+    }
+}
+
+void TabGame::dockFloatingTriggered()
+{
+    QObject *o = sender();
+    if (o == aCardInfoDockFloating) {
+        cardInfoDock->setFloating(aCardInfoDockFloating->isChecked());
+        return;
+    }
+
+    if (o == aMessageLayoutDockFloating) {
+        messageLayoutDock->setFloating(aMessageLayoutDockFloating->isChecked());
+        return;
+    }
+
+    if (o == aPlayerListDockFloating) {
+        playerListDock->setFloating(aPlayerListDockFloating->isChecked());
+        return;
+    }
+
+    if (o == aReplayDockFloating) {
+        replayDock->setFloating(aReplayDockFloating->isChecked());
+        return;
+    }
+}
+
+void TabGame::dockTopLevelChanged(bool topLevel)
+{
+    retranslateUi();
+
+    QObject *o = sender();
+    if (o == cardInfoDock) {
+        aCardInfoDockFloating->setChecked(topLevel);
+        return;
+    }
+
+    if (o == messageLayoutDock) {
+        aMessageLayoutDockFloating->setChecked(topLevel);
+        return;
+    }
+
+    if (o == playerListDock) {
+        aPlayerListDockFloating->setChecked(topLevel);
+        return;
+    }
+
+    if (o == replayDock) {
+        aReplayDockFloating->setChecked(topLevel);
+        return;
+    }
+}
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.h b/cockatrice/src/tabs/tab_game.h
similarity index 83%
rename from cockatrice/src/interface/widgets/tabs/tab_game.h
rename to cockatrice/src/tabs/tab_game.h
index d8746ccc9..a0aeb8138 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.h
+++ b/cockatrice/src/tabs/tab_game.h
@@ -1,19 +1,13 @@
-/**
- * @file tab_game.h
- * @ingroup Tabs
- * @ingroup GameWidgets
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_GAME_H
 #define TAB_GAME_H
 
+#include "../client/replay_manager.h"
 #include "../game/abstract_game.h"
 #include "../game/log/message_log_widget.h"
 #include "../game/player/player.h"
-#include "../interface/widgets/menus/tearoff_menu.h"
-#include "../interface/widgets/replay/replay_manager.h"
+#include "../interface/tearoff_menu.h"
+#include "../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
+#include "pb/event_leave.pb.h"
 #include "tab.h"
 
 #include <QCompleter>
@@ -45,6 +39,7 @@ class ReplayTimelineWidget;
 class CardZone;
 class AbstractCardItem;
 class CardItem;
+class DeckLoader;
 class QVBoxLayout;
 class QHBoxLayout;
 class GameReplay;
@@ -58,7 +53,7 @@ class TabGame : public Tab
 private:
     AbstractGame *game;
     const UserListProxy *userListProxy;
-    ReplayManager *replayManager = nullptr;
+    ReplayManager *replayManager;
     QStringList gameTypes;
     QCompleter *completer;
     QStringList autocompleteUserList;
@@ -78,27 +73,16 @@ private:
     QWidget *gamePlayAreaWidget, *deckViewContainerWidget;
     QDockWidget *cardInfoDock, *messageLayoutDock, *playerListDock, *replayDock;
     QAction *playersSeparator;
-    QMenu *gameMenu, *viewMenu;
+    QMenu *gameMenu, *viewMenu, *cardInfoDockMenu, *messageLayoutDockMenu, *playerListDockMenu, *replayDockMenu;
     TearOffMenu *phasesMenu;
-    QAction *aGameInfo, *aConcede, *aLeaveGame, *aNextPhase, *aNextPhaseAction, *aNextTurn, *aReverseTurn,
-        *aRemoveLocalArrows, *aRotateViewCW, *aRotateViewCCW, *aResetLayout, *aResetReplayLayout;
+    QAction *aGameInfo, *aConcede, *aLeaveGame, *aCloseReplay, *aNextPhase, *aNextPhaseAction, *aNextTurn,
+        *aReverseTurn, *aRemoveLocalArrows, *aRotateViewCW, *aRotateViewCCW, *aResetLayout, *aResetReplayLayout;
+    QAction *aCardInfoDockVisible, *aCardInfoDockFloating, *aMessageLayoutDockVisible, *aMessageLayoutDockFloating,
+        *aPlayerListDockVisible, *aPlayerListDockFloating, *aReplayDockVisible, *aReplayDockFloating;
     QAction *aFocusChat;
     QList<QAction *> phaseActions;
     QAction *aCardMenu;
 
-    /**
-     * @brief The actions associated with managing a QDockWidget
-     */
-    struct DockActions
-    {
-        QMenu *menu;
-        QAction *aVisible;
-        QAction *aFloating;
-        QSize defaultSize;
-    };
-
-    QMap<QDockWidget *, DockActions> dockToActions;
-
     Player *addPlayer(Player *newPlayer);
     void addLocalPlayer(Player *newPlayer, int playerId);
     void processRemotePlayerDeckSelect(QString deckList, int playerId, QString playerName);
@@ -118,7 +102,6 @@ private:
     void createMenuItems();
     void createReplayMenuItems();
     void createViewMenuItems();
-    void registerDockWidget(QMenu *_viewMenu, QDockWidget *widget, const QSize &defaultSize);
     void createCardInfoDock(bool bReplay = false);
     void createPlayerListDock(bool bReplay = false);
     void createMessageDock(bool bReplay = false);
@@ -130,7 +113,7 @@ signals:
     void containerProcessingStarted(const GameEventContext &context);
     void containerProcessingDone();
     void openMessageDialog(const QString &userName, bool focus);
-    void openDeckEditor(const LoadedDeck &deck);
+    void openDeckEditor(const DeckLoader *deck);
     void notIdle();
 
     void phaseChanged(int phase);
@@ -165,8 +148,13 @@ private slots:
     void notifyPlayerKicked();
     void processPlayerLeave(Player *leavingPlayer);
     void actResetLayout();
+    void freeDocksSize();
 
     void hideEvent(QHideEvent *event) override;
+    bool eventFilter(QObject *o, QEvent *e) override;
+    void dockVisibleTriggered();
+    void dockFloatingTriggered();
+    void dockTopLevelChanged(bool topLevel);
 
 protected slots:
     void closeEvent(QCloseEvent *event) override;
@@ -187,9 +175,9 @@ public:
     void updatePlayerListDockTitle();
     bool closeRequest() override;
 
-    [[nodiscard]] QString getTabText() const override;
+    QString getTabText() const override;
 
-    [[nodiscard]] AbstractGame *getGame() const
+    AbstractGame *getGame() const
     {
         return game;
     }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.cpp b/cockatrice/src/tabs/tab_home.cpp
similarity index 85%
rename from cockatrice/src/interface/widgets/tabs/tab_home.cpp
rename to cockatrice/src/tabs/tab_home.cpp
index 7a79b1785..a44945315 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_home.cpp
+++ b/cockatrice/src/tabs/tab_home.cpp
@@ -1,5 +1,8 @@
 #include "tab_home.h"
 
+#include <QGroupBox>
+#include <QPushButton>
+
 TabHome::TabHome(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
 {
     homeWidget = new HomeWidget(this, tabSupervisor);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.h b/cockatrice/src/tabs/tab_home.h
similarity index 67%
rename from cockatrice/src/interface/widgets/tabs/tab_home.h
rename to cockatrice/src/tabs/tab_home.h
index c40dfc269..d2cacb65d 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_home.h
+++ b/cockatrice/src/tabs/tab_home.h
@@ -1,16 +1,12 @@
-/**
- * @file tab_home.h
- * @ingroup Tabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_HOME_H
 #define TAB_HOME_H
 
 #include "../interface/widgets/general/home_widget.h"
+#include "../server/abstract_client.h"
 #include "tab.h"
 
-#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <QHBoxLayout>
+#include <qgroupbox.h>
 
 class AbstractClient;
 
@@ -24,7 +20,7 @@ private:
 public:
     TabHome(TabSupervisor *_tabSupervisor, AbstractClient *_client);
     void retranslateUi() override;
-    [[nodiscard]] QString getTabText() const override
+    QString getTabText() const override
     {
         return tr("Home");
     }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp b/cockatrice/src/tabs/tab_logs.cpp
similarity index 96%
rename from cockatrice/src/interface/widgets/tabs/tab_logs.cpp
rename to cockatrice/src/tabs/tab_logs.cpp
index e4f699160..4a791a27e 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
+++ b/cockatrice/src/tabs/tab_logs.cpp
@@ -1,23 +1,25 @@
 #include "tab_logs.h"
 
-#include "../interface/widgets/utility/custom_line_edit.h"
+#include "../deck/custom_line_edit.h"
+#include "../dialogs/dlg_manage_sets.h"
+#include "../server/abstract_client.h"
+#include "../server/pending_command.h"
+#include "pb/moderator_commands.pb.h"
+#include "pb/response_viewlog_history.pb.h"
+#include "trice_limits.h"
 
 #include <QCheckBox>
-#include <QDockWidget>
-#include <QGridLayout>
+#include <QDialogButtonBox>
 #include <QGroupBox>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QSpinBox>
 #include <QTabWidget>
-#include <QTableWidget>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/moderator_commands.pb.h>
-#include <libcockatrice/protocol/pb/response_viewlog_history.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <QtGui>
+#include <QtWidgets>
 
 TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.h b/cockatrice/src/tabs/tab_logs.h
similarity index 92%
rename from cockatrice/src/interface/widgets/tabs/tab_logs.h
rename to cockatrice/src/tabs/tab_logs.h
index a73af651b..5694a24c7 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.h
+++ b/cockatrice/src/tabs/tab_logs.h
@@ -1,9 +1,3 @@
-/**
- * @file tab_logs.h
- * @ingroup ServerTabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_LOG_H
 #define TAB_LOG_H
 
@@ -13,6 +7,7 @@
 
 class AbstractClient;
 class LineEditUnfocusable;
+
 class QGroupBox;
 class QPushButton;
 class QSpinBox;
@@ -61,7 +56,7 @@ public:
     TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client);
     ~TabLog() override;
     void retranslateUi() override;
-    [[nodiscard]] QString getTabText() const override
+    QString getTabText() const override
     {
         return tr("Logs");
     }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.cpp b/cockatrice/src/tabs/tab_message.cpp
similarity index 88%
rename from cockatrice/src/interface/widgets/tabs/tab_message.cpp
rename to cockatrice/src/tabs/tab_message.cpp
index bd0457990..6b4b7044b 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_message.cpp
+++ b/cockatrice/src/tabs/tab_message.cpp
@@ -1,23 +1,23 @@
 #include "tab_message.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../client/sound_engine.h"
-#include "../interface/widgets/server/chat_view/chat_view.h"
-#include "../interface/widgets/server/user/user_list_manager.h"
-#include "../interface/widgets/utility/custom_line_edit.h"
+#include "../deck/custom_line_edit.h"
 #include "../main.h"
+#include "../server/abstract_client.h"
+#include "../server/chat_view/chat_view.h"
+#include "../server/pending_command.h"
+#include "../server/user/user_list_manager.h"
+#include "../settings/cache_settings.h"
+#include "pb/event_user_message.pb.h"
+#include "pb/serverinfo_user.pb.h"
+#include "pb/session_commands.pb.h"
+#include "trice_limits.h"
 
 #include <QApplication>
 #include <QDebug>
 #include <QMenu>
 #include <QSystemTrayIcon>
 #include <QVBoxLayout>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/event_user_message.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
 
 TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
                        AbstractClient *_client,
@@ -34,7 +34,7 @@ TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
     sayEdit->setMaxLength(MAX_TEXT_LENGTH);
     connect(sayEdit, &LineEditUnfocusable::returnPressed, this, &TabMessage::sendMessage);
 
-    auto *vbox = new QVBoxLayout;
+    QVBoxLayout *vbox = new QVBoxLayout;
     vbox->addWidget(chatView);
     vbox->addWidget(sayEdit);
 
@@ -47,7 +47,7 @@ TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
 
     retranslateUi();
 
-    auto *mainWidget = new QWidget(this);
+    QWidget *mainWidget = new QWidget(this);
     mainWidget->setLayout(vbox);
     setCentralWidget(mainWidget);
 }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.h b/cockatrice/src/tabs/tab_message.h
similarity index 88%
rename from cockatrice/src/interface/widgets/tabs/tab_message.h
rename to cockatrice/src/tabs/tab_message.h
index 36a0b5f78..659d0b804 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_message.h
+++ b/cockatrice/src/tabs/tab_message.h
@@ -1,9 +1,3 @@
-/**
- * @file tab_message.h
- * @ingroup MessagingTabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_MESSAGE_H
 #define TAB_MESSAGE_H
 
@@ -54,8 +48,8 @@ public:
     ~TabMessage() override;
     void retranslateUi() override;
     void tabActivated() override;
-    [[nodiscard]] QString getUserName() const;
-    [[nodiscard]] QString getTabText() const override;
+    QString getUserName() const;
+    QString getTabText() const override;
 
     void processUserMessageEvent(const Event_UserMessage &event);
 
diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp b/cockatrice/src/tabs/tab_replays.cpp
similarity index 93%
rename from cockatrice/src/interface/widgets/tabs/tab_replays.cpp
rename to cockatrice/src/tabs/tab_replays.cpp
index 570677ada..2feb41383 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
+++ b/cockatrice/src/tabs/tab_replays.cpp
@@ -1,7 +1,19 @@
 #include "tab_replays.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h"
+#include "../server/abstract_client.h"
+#include "../server/pending_command.h"
+#include "../server/remote/remote_replay_list_tree_widget.h"
+#include "../settings/cache_settings.h"
+#include "pb/command_replay_delete_match.pb.h"
+#include "pb/command_replay_download.pb.h"
+#include "pb/command_replay_get_code.pb.h"
+#include "pb/command_replay_modify_match.pb.h"
+#include "pb/command_replay_submit_code.pb.h"
+#include "pb/event_replay_added.pb.h"
+#include "pb/game_replay.pb.h"
+#include "pb/response.pb.h"
+#include "pb/response_replay_download.pb.h"
+#include "pb/response_replay_get_code.pb.h"
 #include "tab_game.h"
 
 #include <QAction>
@@ -17,20 +29,7 @@
 #include <QToolBar>
 #include <QTreeView>
 #include <QUrl>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/command_replay_delete_match.pb.h>
-#include <libcockatrice/protocol/pb/command_replay_download.pb.h>
-#include <libcockatrice/protocol/pb/command_replay_get_code.pb.h>
-#include <libcockatrice/protocol/pb/command_replay_modify_match.pb.h>
-#include <libcockatrice/protocol/pb/command_replay_submit_code.pb.h>
-#include <libcockatrice/protocol/pb/event_replay_added.pb.h>
-#include <libcockatrice/protocol/pb/game_replay.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/response_replay_download.pb.h>
-#include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-
-inline Q_LOGGING_CATEGORY(TabReplaysLog, "replays_tab");
+#include <QVBoxLayout>
 
 TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo)
     : Tab(_tabSupervisor), client(_client)
@@ -267,11 +266,9 @@ void TabReplays::actOpenLocalReplay()
         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);
     }
 }
 
@@ -383,12 +380,9 @@ void TabReplays::openRemoteReplayFinished(const Response &r)
 
     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()
@@ -446,10 +440,7 @@ void TabReplays::downloadFinished(const Response &r,
 
     const std::string &_data = resp.replay_data();
     QFile f(filePath);
-    if (!f.open(QIODevice::WriteOnly)) {
-        qWarning() << "failed to open" << filePath << "for writing after downloading replay";
-        return;
-    }
+    f.open(QIODevice::WriteOnly);
     f.write((const char *)_data.data(), _data.size());
     f.close();
 }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.h b/cockatrice/src/tabs/tab_replays.h
similarity index 91%
rename from cockatrice/src/interface/widgets/tabs/tab_replays.h
rename to cockatrice/src/tabs/tab_replays.h
index fa1131cd5..b3a1d5fad 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.h
+++ b/cockatrice/src/tabs/tab_replays.h
@@ -1,17 +1,9 @@
-/**
- * @file tab_replays.h
- * @ingroup Replays
- * @ingroup Tabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_REPLAYS_H
 #define TAB_REPLAYS_H
 
+#include "../server/abstract_client.h"
 #include "tab.h"
 
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-
 class ServerInfo_User;
 class Response;
 class AbstractClient;
@@ -84,7 +76,7 @@ signals:
 public:
     TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo);
     void retranslateUi() override;
-    [[nodiscard]] QString getTabText() const override
+    QString getTabText() const override
     {
         return tr("Game Replays");
     }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/tabs/tab_room.cpp
similarity index 89%
rename from cockatrice/src/interface/widgets/tabs/tab_room.cpp
rename to cockatrice/src/tabs/tab_room.cpp
index 92e38662b..ff6507b29 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp
+++ b/cockatrice/src/tabs/tab_room.cpp
@@ -1,14 +1,25 @@
 #include "tab_room.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../interface/widgets/dialogs/dlg_settings.h"
-#include "../interface/widgets/server/chat_view/chat_view.h"
-#include "../interface/widgets/server/game_selector.h"
-#include "../interface/widgets/server/user/user_list_manager.h"
-#include "../interface/widgets/server/user/user_list_widget.h"
+#include "../dialogs/dlg_settings.h"
 #include "../main.h"
+#include "../server/abstract_client.h"
+#include "../server/chat_view/chat_view.h"
+#include "../server/game_selector.h"
+#include "../server/pending_command.h"
+#include "../server/user/user_list_manager.h"
+#include "../server/user/user_list_widget.h"
+#include "../settings/cache_settings.h"
+#include "get_pb_extension.h"
+#include "pb/event_join_room.pb.h"
+#include "pb/event_leave_room.pb.h"
+#include "pb/event_list_games.pb.h"
+#include "pb/event_remove_messages.pb.h"
+#include "pb/event_room_say.pb.h"
+#include "pb/room_commands.pb.h"
+#include "pb/serverinfo_room.pb.h"
 #include "tab_account.h"
 #include "tab_supervisor.h"
+#include "trice_limits.h"
 
 #include <QApplication>
 #include <QCompleter>
@@ -21,17 +32,6 @@
 #include <QToolButton>
 #include <QVBoxLayout>
 #include <QtCore/qdatetime.h>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/get_pb_extension.h>
-#include <libcockatrice/protocol/pb/event_join_room.pb.h>
-#include <libcockatrice/protocol/pb/event_leave_room.pb.h>
-#include <libcockatrice/protocol/pb/event_list_games.pb.h>
-#include <libcockatrice/protocol/pb/event_remove_messages.pb.h>
-#include <libcockatrice/protocol/pb/event_room_say.pb.h>
-#include <libcockatrice/protocol/pb/room_commands.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
 
 TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
                  AbstractClient *_client,
@@ -67,7 +67,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
     sayLabel->setBuddy(sayEdit);
     connect(sayEdit, &LineEditCompleter::returnPressed, this, &TabRoom::sendMessage);
 
-    auto *chatSettingsMenu = new QMenu(this);
+    QMenu *chatSettingsMenu = new QMenu(this);
 
     aClearChat = chatSettingsMenu->addAction(QString());
     connect(aClearChat, &QAction::triggered, this, &TabRoom::actClearChat);
@@ -77,28 +77,28 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
     aOpenChatSettings = chatSettingsMenu->addAction(QString());
     connect(aOpenChatSettings, &QAction::triggered, this, &TabRoom::actOpenChatSettings);
 
-    auto *chatSettingsButton = new QToolButton;
+    QToolButton *chatSettingsButton = new QToolButton;
     chatSettingsButton->setIcon(QPixmap("theme:icons/settings"));
     chatSettingsButton->setMenu(chatSettingsMenu);
     chatSettingsButton->setPopupMode(QToolButton::InstantPopup);
 
-    auto *sayHbox = new QHBoxLayout;
+    QHBoxLayout *sayHbox = new QHBoxLayout;
     sayHbox->addWidget(sayLabel);
     sayHbox->addWidget(sayEdit);
     sayHbox->addWidget(chatSettingsButton);
 
-    auto *chatVbox = new QVBoxLayout;
+    QVBoxLayout *chatVbox = new QVBoxLayout;
     chatVbox->addWidget(chatView);
     chatVbox->addLayout(sayHbox);
 
     chatGroupBox = new QGroupBox;
     chatGroupBox->setLayout(chatVbox);
 
-    auto *splitter = new QSplitter(Qt::Vertical);
+    QSplitter *splitter = new QSplitter(Qt::Vertical);
     splitter->addWidget(gameSelector);
     splitter->addWidget(chatGroupBox);
 
-    auto *hbox = new QHBoxLayout;
+    QHBoxLayout *hbox = new QHBoxLayout;
     hbox->addWidget(splitter, 3);
     hbox->addWidget(userList, 1);
 
@@ -133,7 +133,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
 
     retranslateUi();
 
-    auto *mainWidget = new QWidget(this);
+    QWidget *mainWidget = new QWidget(this);
     mainWidget->setLayout(hbox);
     setCentralWidget(mainWidget);
 }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.h b/cockatrice/src/tabs/tab_room.h
similarity index 84%
rename from cockatrice/src/interface/widgets/tabs/tab_room.h
rename to cockatrice/src/tabs/tab_room.h
index 67d9afc86..040130d10 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.h
+++ b/cockatrice/src/tabs/tab_room.h
@@ -1,18 +1,12 @@
-/**
- * @file tab_room.h
- * @ingroup RoomTabs
- * @ingroup Lobby
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_ROOM_H
 #define TAB_ROOM_H
 
-#include "../interface/widgets/utility/line_edit_completer.h"
+#include "../interface/line_edit_completer.h"
 #include "tab.h"
 
 #include <QFocusEvent>
 #include <QGroupBox>
+#include <QKeyEvent>
 #include <QMap>
 
 class UserListProxy;
@@ -67,7 +61,7 @@ private:
     QAction *aLeaveRoom;
     QAction *aOpenChatSettings;
     QAction *aClearChat;
-    [[nodiscard]] QString sanitizeHtml(QString dirty) const;
+    QString sanitizeHtml(QString dirty) const;
 
     QStringList autocompleteUserList;
     QCompleter *completer;
@@ -105,23 +99,23 @@ public:
     void retranslateUi() override;
     void tabActivated() override;
     void processRoomEvent(const RoomEvent &event);
-    [[nodiscard]] int getRoomId() const
+    int getRoomId() const
     {
         return roomId;
     }
-    [[nodiscard]] const QMap<int, QString> &getGameTypes() const
+    const QMap<int, QString> &getGameTypes() const
     {
         return gameTypes;
     }
-    [[nodiscard]] QString getChannelName() const
+    QString getChannelName() const
     {
         return roomName;
     }
-    [[nodiscard]] QString getTabText() const override
+    QString getTabText() const override
     {
         return roomName;
     }
-    [[nodiscard]] const ServerInfo_User *getUserInfo() const
+    const ServerInfo_User *getUserInfo() const
     {
         return ownUser;
     }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.cpp b/cockatrice/src/tabs/tab_server.cpp
similarity index 95%
rename from cockatrice/src/interface/widgets/tabs/tab_server.cpp
rename to cockatrice/src/tabs/tab_server.cpp
index aa52b4b1a..069f06313 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_server.cpp
+++ b/cockatrice/src/tabs/tab_server.cpp
@@ -1,20 +1,25 @@
 #include "tab_server.h"
 
-#include "../interface/widgets/server/user/user_list_widget.h"
+#include "../server/abstract_client.h"
+#include "../server/pending_command.h"
+#include "../server/user/user_list_widget.h"
+#include "pb/event_list_rooms.pb.h"
+#include "pb/event_server_message.pb.h"
+#include "pb/response_join_room.pb.h"
+#include "pb/session_commands.pb.h"
 #include "tab_supervisor.h"
 
+#include <QCheckBox>
+#include <QDebug>
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QInputDialog>
+#include <QLabel>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QTextEdit>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
-#include <libcockatrice/protocol/pb/event_server_message.pb.h>
-#include <libcockatrice/protocol/pb/response_join_room.pb.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
+#include <QTreeView>
+#include <QVBoxLayout>
 
 RoomSelector::RoomSelector(AbstractClient *_client, QWidget *parent) : QGroupBox(parent), client(_client)
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.h b/cockatrice/src/tabs/tab_server.h
similarity index 91%
rename from cockatrice/src/interface/widgets/tabs/tab_server.h
rename to cockatrice/src/tabs/tab_server.h
index f2dd8f0a2..51df54397 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_server.h
+++ b/cockatrice/src/tabs/tab_server.h
@@ -1,9 +1,3 @@
-/**
- * @file tab_server.h
- * @ingroup ServerTabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_SERVER_H
 #define TAB_SERVER_H
 
@@ -63,7 +57,7 @@ private:
 public:
     TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client);
     void retranslateUi() override;
-    [[nodiscard]] QString getTabText() const override
+    QString getTabText() const override
     {
         return tr("Server");
     }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/tabs/tab_supervisor.cpp
similarity index 95%
rename from cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
rename to cockatrice/src/tabs/tab_supervisor.cpp
index b10d615ff..78fce4516 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/tabs/tab_supervisor.cpp
@@ -1,12 +1,21 @@
 #include "tab_supervisor.h"
 
-#include "../../../client/settings/cache_settings.h"
 #include "../interface/pixel_map_generator.h"
-#include "../interface/widgets/server/user/user_list_manager.h"
-#include "../interface/widgets/server/user/user_list_widget.h"
 #include "../main.h"
-#include "api/archidekt/tab_archidekt.h"
+#include "../server/abstract_client.h"
+#include "../server/user/user_list_manager.h"
+#include "../server/user/user_list_widget.h"
+#include "../settings/cache_settings.h"
 #include "api/edhrec/tab_edhrec_main.h"
+#include "pb/event_game_joined.pb.h"
+#include "pb/event_notify_user.pb.h"
+#include "pb/event_user_message.pb.h"
+#include "pb/game_event_container.pb.h"
+#include "pb/game_replay.pb.h"
+#include "pb/room_commands.pb.h"
+#include "pb/room_event.pb.h"
+#include "pb/serverinfo_room.pb.h"
+#include "pb/serverinfo_user.pb.h"
 #include "tab_account.h"
 #include "tab_admin.h"
 #include "tab_deck_editor.h"
@@ -27,15 +36,6 @@
 #include <QMessageBox>
 #include <QPainter>
 #include <QSystemTrayIcon>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
-#include <libcockatrice/protocol/pb/event_notify_user.pb.h>
-#include <libcockatrice/protocol/pb/event_user_message.pb.h>
-#include <libcockatrice/protocol/pb/game_event_container.pb.h>
-#include <libcockatrice/protocol/pb/room_commands.pb.h>
-#include <libcockatrice/protocol/pb/room_event.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const
 {
@@ -133,17 +133,14 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *
 
     // create tabs menu actions
     aTabDeckEditor = new QAction(this);
-    connect(aTabDeckEditor, &QAction::triggered, this, [this] { addDeckEditorTab(LoadedDeck()); });
+    connect(aTabDeckEditor, &QAction::triggered, this, [this] { addDeckEditorTab(nullptr); });
 
     aTabVisualDeckEditor = new QAction(this);
-    connect(aTabVisualDeckEditor, &QAction::triggered, this, [this] { addVisualDeckEditorTab(LoadedDeck()); });
+    connect(aTabVisualDeckEditor, &QAction::triggered, this, [this] { addVisualDeckEditorTab(nullptr); });
 
     aTabEdhRec = new QAction(this);
     connect(aTabEdhRec, &QAction::triggered, this, [this] { addEdhrecMainTab(); });
 
-    aTabArchidekt = new QAction(this);
-    connect(aTabArchidekt, &QAction::triggered, this, [this] { addArchidektTab(); });
-
     aTabHome = new QAction(this);
     aTabHome->setCheckable(true);
     connect(aTabHome, &QAction::triggered, this, &TabSupervisor::actTabHome);
@@ -208,7 +205,6 @@ void TabSupervisor::retranslateUi()
     aTabDeckEditor->setText(tr("Deck Editor"));
     aTabVisualDeckEditor->setText(tr("Visual Deck Editor"));
     aTabEdhRec->setText(tr("EDHRec"));
-    aTabArchidekt->setText(tr("Archidekt"));
     aTabHome->setText(tr("Home"));
     aTabVisualDeckStorage->setText(tr("&Visual Deck Storage"));
     aTabVisualDatabaseDisplay->setText(tr("Visual Database Display"));
@@ -391,7 +387,6 @@ void TabSupervisor::resetTabsMenu()
     tabsMenu->addAction(aTabDeckEditor);
     tabsMenu->addAction(aTabVisualDeckEditor);
     tabsMenu->addAction(aTabEdhRec);
-    tabsMenu->addAction(aTabArchidekt);
     tabsMenu->addSeparator();
     tabsMenu->addAction(aTabHome);
     tabsMenu->addAction(aTabVisualDeckStorage);
@@ -496,6 +491,10 @@ void TabSupervisor::stop()
         tabsToDelete << i.value();
     }
 
+    for (auto i = messageTabs.cbegin(), end = messageTabs.cend(); i != end; ++i) {
+        tabsToDelete << i.value();
+    }
+
     for (const auto tab : tabsToDelete) {
         tab->close();
     }
@@ -846,9 +845,9 @@ void TabSupervisor::talkLeft(TabMessage *tab)
 /**
  * Creates a new deck editor tab and loads the deck into it.
  * Creates either a classic or visual deck editor tab depending on settings
- * @param deckToOpen The deck to open in the tab.
+ * @param deckToOpen The deck to open in the tab. Creates a copy of the DeckLoader instance.
  */
-void TabSupervisor::openDeckInNewTab(const LoadedDeck &deckToOpen)
+void TabSupervisor::openDeckInNewTab(const DeckLoader *deckToOpen)
 {
     int type = SettingsCache::instance().getDefaultDeckEditorType();
     switch (type) {
@@ -868,12 +867,13 @@ void TabSupervisor::openDeckInNewTab(const LoadedDeck &deckToOpen)
 
 /**
  * Creates a new deck editor tab
- * @param deckToOpen The deck to open in the tab.
+ * @param deckToOpen The deck to open in the tab. Creates a copy of the DeckLoader instance.
  */
-TabDeckEditor *TabSupervisor::addDeckEditorTab(const LoadedDeck &deckToOpen)
+TabDeckEditor *TabSupervisor::addDeckEditorTab(const DeckLoader *deckToOpen)
 {
     auto *tab = new TabDeckEditor(this);
-    tab->openDeck(deckToOpen);
+    if (deckToOpen)
+        tab->openDeck(new DeckLoader(*deckToOpen));
     connect(tab, &AbstractTabDeckEditor::deckEditorClosing, this, &TabSupervisor::deckEditorClosed);
     connect(tab, &AbstractTabDeckEditor::openDeckEditor, this, &TabSupervisor::addDeckEditorTab);
     myAddTab(tab);
@@ -882,10 +882,11 @@ TabDeckEditor *TabSupervisor::addDeckEditorTab(const LoadedDeck &deckToOpen)
     return tab;
 }
 
-TabDeckEditorVisual *TabSupervisor::addVisualDeckEditorTab(const LoadedDeck &deckToOpen)
+TabDeckEditorVisual *TabSupervisor::addVisualDeckEditorTab(const DeckLoader *deckToOpen)
 {
     auto *tab = new TabDeckEditorVisual(this);
-    tab->openDeck(deckToOpen);
+    if (deckToOpen)
+        tab->openDeck(new DeckLoader(*deckToOpen));
     connect(tab, &AbstractTabDeckEditor::deckEditorClosing, this, &TabSupervisor::deckEditorClosed);
     connect(tab, &AbstractTabDeckEditor::openDeckEditor, this, &TabSupervisor::addVisualDeckEditorTab);
     myAddTab(tab);
@@ -903,15 +904,6 @@ TabEdhRecMain *TabSupervisor::addEdhrecMainTab()
     return tab;
 }
 
-TabArchidekt *TabSupervisor::addArchidektTab()
-{
-    auto *tab = new TabArchidekt(this);
-
-    myAddTab(tab);
-    setCurrentWidget(tab);
-    return tab;
-}
-
 TabVisualDatabaseDisplay *TabSupervisor::addVisualDatabaseDisplayTab()
 {
     auto *tab = new TabVisualDatabaseDisplay(this);
@@ -943,7 +935,7 @@ void TabSupervisor::deckEditorClosed(AbstractTabDeckEditor *tab)
 
 void TabSupervisor::tabUserEvent(bool globalEvent)
 {
-    auto *tab = static_cast<Tab *>(sender());
+    Tab *tab = static_cast<Tab *>(sender());
     if (tab != currentWidget()) {
         tab->setContentsChanged(true);
         setTabIcon(indexOf(tab), QPixmap("theme:icons/tab_changed"));
@@ -1044,7 +1036,7 @@ void TabSupervisor::processUserJoined(const ServerInfo_User &userInfoJoined)
 void TabSupervisor::updateCurrent(int index)
 {
     if (index != -1) {
-        auto *tab = static_cast<Tab *>(widget(index));
+        Tab *tab = static_cast<Tab *>(widget(index));
         if (tab->getContentsChanged()) {
             setTabIcon(index, QIcon());
             tab->setContentsChanged(false);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h b/cockatrice/src/tabs/tab_supervisor.h
similarity index 82%
rename from cockatrice/src/interface/widgets/tabs/tab_supervisor.h
rename to cockatrice/src/tabs/tab_supervisor.h
index 0c4428f83..165c3489b 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
+++ b/cockatrice/src/tabs/tab_supervisor.h
@@ -1,24 +1,18 @@
-/**
- * @file tab_supervisor.h
- * @ingroup Core
- * @ingroup Tabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_SUPERVISOR_H
 #define TAB_SUPERVISOR_H
 
-#include "../../deck_loader/deck_loader.h"
-#include "../interface/widgets/server/user/user_list_proxy.h"
+#include "../deck/deck_loader.h"
+#include "../server/user/user_list_proxy.h"
 #include "abstract_tab_deck_editor.h"
-#include "api/archidekt/tab_archidekt.h"
 #include "api/edhrec/tab_edhrec.h"
 #include "api/edhrec/tab_edhrec_main.h"
 #include "tab_visual_database_display.h"
 #include "visual_deck_editor/tab_deck_editor_visual.h"
+#include "visual_deck_editor/tab_deck_editor_visual_tab_widget.h"
 #include "visual_deck_storage/tab_deck_storage_visual.h"
 
 #include <QAbstractButton>
+#include <QCommonStyle>
 #include <QLoggingCategory>
 #include <QMap>
 #include <QProxyStyle>
@@ -63,8 +57,8 @@ class CloseButton : public QAbstractButton
     Q_OBJECT
 public:
     explicit CloseButton(QWidget *parent = nullptr);
-    [[nodiscard]] QSize sizeHint() const override;
-    [[nodiscard]] QSize minimumSizeHint() const override
+    QSize sizeHint() const override;
+    inline QSize minimumSizeHint() const override
     {
         return sizeHint();
     }
@@ -111,7 +105,7 @@ private:
     QList<AbstractTabDeckEditor *> deckEditorTabs;
     bool isLocalGame;
 
-    QAction *aTabHome, *aTabDeckEditor, *aTabVisualDeckEditor, *aTabEdhRec, *aTabArchidekt, *aTabVisualDeckStorage,
+    QAction *aTabHome, *aTabDeckEditor, *aTabVisualDeckEditor, *aTabEdhRec, *aTabVisualDeckStorage,
         *aTabVisualDatabaseDisplay, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, *aTabLog;
 
     int myAddTab(Tab *tab, QAction *manager = nullptr);
@@ -128,36 +122,36 @@ public:
     void start(const ServerInfo_User &userInfo);
     void startLocal(const QList<AbstractClient *> &_clients);
     void stop();
-    [[nodiscard]] bool getIsLocalGame() const
+    bool getIsLocalGame() const
     {
         return isLocalGame;
     }
-    [[nodiscard]] int getGameCount() const
+    int getGameCount() const
     {
         return gameTabs.size();
     }
-    [[nodiscard]] TabAccount *getTabAccount() const
+    TabAccount *getTabAccount() const
     {
         return tabAccount;
     }
-    [[nodiscard]] ServerInfo_User *getUserInfo() const
+    ServerInfo_User *getUserInfo() const
     {
         return userInfo;
     }
-    [[nodiscard]] AbstractClient *getClient() const;
-    [[nodiscard]] const UserListManager *getUserListManager() const
+    AbstractClient *getClient() const;
+    const UserListManager *getUserListManager() const
     {
         return userListManager;
     }
-    [[nodiscard]] const QMap<int, TabRoom *> &getRoomTabs() const
+    const QMap<int, TabRoom *> &getRoomTabs() const
     {
         return roomTabs;
     }
-    [[nodiscard]] QList<AbstractTabDeckEditor *> getDeckEditorTabs() const
+    QList<AbstractTabDeckEditor *> getDeckEditorTabs() const
     {
         return deckEditorTabs;
     }
-    [[nodiscard]] bool getAdminLocked() const;
+    bool getAdminLocked() const;
     void closeEvent(QCloseEvent *event) override;
     bool switchToGameTabIfAlreadyExists(const int gameId);
     static void actShowPopup(const QString &message);
@@ -168,12 +162,11 @@ signals:
     void showWindowIfHidden();
 
 public slots:
-    void openDeckInNewTab(const LoadedDeck &deckToOpen);
-    TabDeckEditor *addDeckEditorTab(const LoadedDeck &deckToOpen);
-    TabDeckEditorVisual *addVisualDeckEditorTab(const LoadedDeck &deckToOpen);
+    void openDeckInNewTab(const DeckLoader *deckToOpen);
+    TabDeckEditor *addDeckEditorTab(const DeckLoader *deckToOpen);
+    TabDeckEditorVisual *addVisualDeckEditorTab(const DeckLoader *deckToOpen);
     TabVisualDatabaseDisplay *addVisualDatabaseDisplayTab();
     TabEdhRecMain *addEdhrecMainTab();
-    TabArchidekt *addArchidektTab();
     TabEdhRec *addEdhrecTab(const CardInfoPtr &cardToQuery, bool isCommander = false);
     void openReplay(GameReplay *replay);
     void switchToFirstAvailableNetworkTab();
diff --git a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp b/cockatrice/src/tabs/tab_visual_database_display.cpp
similarity index 61%
rename from cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
rename to cockatrice/src/tabs/tab_visual_database_display.cpp
index 5e8fb8670..d45cdded0 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
+++ b/cockatrice/src/tabs/tab_visual_database_display.cpp
@@ -6,9 +6,9 @@ TabVisualDatabaseDisplay::TabVisualDatabaseDisplay(TabSupervisor *_tabSupervisor
 {
     deckEditor = new TabDeckEditor(_tabSupervisor);
     deckEditor->setHidden(true);
-    visualDatabaseDisplayWidget = new VisualDatabaseDisplayWidget(
-        this, deckEditor, deckEditor->cardDatabaseDockWidget->databaseDisplayWidget->databaseModel,
-        deckEditor->cardDatabaseDockWidget->databaseDisplayWidget->databaseDisplayModel);
+    visualDatabaseDisplayWidget =
+        new VisualDatabaseDisplayWidget(this, deckEditor, deckEditor->databaseDisplayDockWidget->databaseModel,
+                                        deckEditor->databaseDisplayDockWidget->databaseDisplayModel);
 
     setCentralWidget(visualDatabaseDisplayWidget);
 
diff --git a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h b/cockatrice/src/tabs/tab_visual_database_display.h
similarity index 58%
rename from cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
rename to cockatrice/src/tabs/tab_visual_database_display.h
index 66f38fb3d..689f5269c 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
+++ b/cockatrice/src/tabs/tab_visual_database_display.h
@@ -1,15 +1,11 @@
-/**
- * @file tab_visual_database_display.h
- * @ingroup Tabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_VISUAL_DATABASE_DISPLAY_H
 #define TAB_VISUAL_DATABASE_DISPLAY_H
 
 #include "../interface/widgets/visual_database_display/visual_database_display_widget.h"
 #include "tab.h"
 
+#include <QVBoxLayout>
+
 class TabVisualDatabaseDisplay : public Tab
 {
     Q_OBJECT
@@ -21,10 +17,9 @@ private:
 public:
     TabVisualDatabaseDisplay(TabSupervisor *_tabSupervisor);
     void retranslateUi() override;
-    [[nodiscard]] QString getTabText() const override
+    QString getTabText() const override
     {
-        return visualDatabaseDisplayWidget->displayModeButton->isChecked() ? tr("Database Display")
-                                                                           : tr("Visual Database Display");
+        return tr("Visual Database Display");
     }
 };
 
diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
new file mode 100644
index 000000000..d8584433d
--- /dev/null
+++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
@@ -0,0 +1,435 @@
+#include "tab_deck_editor_visual.h"
+
+#include "../../database/model/card_database_model.h"
+#include "../../deck/deck_list_model.h"
+#include "../../deck/deck_stats_interface.h"
+#include "../../filters/filter_builder.h"
+#include "../../interface/pixel_map_generator.h"
+#include "../../interface/widgets/cards/card_info_frame_widget.h"
+#include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
+#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
+#include "../../server/pending_command.h"
+#include "../../settings/cache_settings.h"
+#include "../tab_deck_editor.h"
+#include "../tab_supervisor.h"
+#include "pb/command_deck_upload.pb.h"
+#include "tab_deck_editor_visual_tab_widget.h"
+#include "trice_limits.h"
+
+#include <QAction>
+#include <QApplication>
+#include <QCloseEvent>
+#include <QCompleter>
+#include <QDir>
+#include <QDockWidget>
+#include <QFileDialog>
+#include <QHeaderView>
+#include <QLineEdit>
+#include <QMenu>
+#include <QPrintPreviewDialog>
+#include <QProcessEnvironment>
+#include <QSplitter>
+#include <QTextStream>
+#include <QTimer>
+#include <QTreeView>
+#include <QVBoxLayout>
+
+TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor)
+{
+    setObjectName("TabDeckEditorVisual");
+
+    createCentralFrame();
+
+    TabDeckEditorVisual::createMenus();
+
+    installEventFilter(this);
+
+    TabDeckEditorVisual::retranslateUi();
+    connect(&SettingsCache::instance().shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
+    TabDeckEditorVisual::refreshShortcuts();
+
+    TabDeckEditorVisual::loadLayout();
+    databaseDisplayDockWidget->setHidden(true);
+}
+
+void TabDeckEditorVisual::createCentralFrame()
+{
+    centralWidget = new QWidget(this);
+    centralWidget->setObjectName("centralWidget");
+
+    centralFrame = new QVBoxLayout;
+    centralWidget->setLayout(centralFrame);
+
+    tabContainer = new TabDeckEditorVisualTabWidget(centralWidget, this, deckDockWidget->deckModel,
+                                                    databaseDisplayDockWidget->databaseModel,
+                                                    databaseDisplayDockWidget->databaseDisplayModel);
+    connect(tabContainer, &TabDeckEditorVisualTabWidget::cardChanged, this,
+            &TabDeckEditorVisual::changeModelIndexAndCardInfo);
+    connect(tabContainer, &TabDeckEditorVisualTabWidget::cardChangedDatabaseDisplay, this,
+            &AbstractTabDeckEditor::updateCard);
+    connect(tabContainer, &TabDeckEditorVisualTabWidget::cardClicked, this,
+            &TabDeckEditorVisual::processMainboardCardClick);
+
+    connect(tabContainer, &TabDeckEditorVisualTabWidget::cardClickedDatabaseDisplay, this,
+            &TabDeckEditorVisual::processCardClickDatabaseDisplay);
+    centralFrame->addWidget(tabContainer);
+
+    setCentralWidget(centralWidget);
+    setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
+}
+
+void TabDeckEditorVisual::onDeckChanged()
+{
+    AbstractTabDeckEditor::onDeckModified();
+    tabContainer->visualDeckView->constructZoneWidgetsFromDeckListModel();
+    tabContainer->deckAnalytics->refreshDisplays(deckDockWidget->deckModel);
+    tabContainer->sampleHandWidget->setDeckModel(deckDockWidget->deckModel);
+}
+
+void TabDeckEditorVisual::createMenus()
+{
+    deckMenu = new DeckEditorMenu(this);
+    addTabMenu(deckMenu);
+
+    viewMenu = new QMenu(this);
+
+    cardInfoDockMenu = viewMenu->addMenu(QString());
+    deckDockMenu = viewMenu->addMenu(QString());
+    filterDockMenu = viewMenu->addMenu(QString());
+    printingSelectorDockMenu = viewMenu->addMenu(QString());
+
+    aCardInfoDockVisible = cardInfoDockMenu->addAction(QString());
+    aCardInfoDockVisible->setCheckable(true);
+    connect(aCardInfoDockVisible, SIGNAL(triggered()), this, SLOT(dockVisibleTriggered()));
+    aCardInfoDockFloating = cardInfoDockMenu->addAction(QString());
+    aCardInfoDockFloating->setCheckable(true);
+    connect(aCardInfoDockFloating, SIGNAL(triggered()), this, SLOT(dockFloatingTriggered()));
+
+    aDeckDockVisible = deckDockMenu->addAction(QString());
+    aDeckDockVisible->setCheckable(true);
+    connect(aDeckDockVisible, SIGNAL(triggered()), this, SLOT(dockVisibleTriggered()));
+    aDeckDockFloating = deckDockMenu->addAction(QString());
+    aDeckDockFloating->setCheckable(true);
+    connect(aDeckDockFloating, SIGNAL(triggered()), this, SLOT(dockFloatingTriggered()));
+
+    aFilterDockVisible = filterDockMenu->addAction(QString());
+    aFilterDockVisible->setCheckable(true);
+    connect(aFilterDockVisible, SIGNAL(triggered()), this, SLOT(dockVisibleTriggered()));
+    aFilterDockFloating = filterDockMenu->addAction(QString());
+    aFilterDockFloating->setCheckable(true);
+    connect(aFilterDockFloating, SIGNAL(triggered()), this, SLOT(dockFloatingTriggered()));
+
+    aPrintingSelectorDockVisible = printingSelectorDockMenu->addAction(QString());
+    aPrintingSelectorDockVisible->setCheckable(true);
+    connect(aPrintingSelectorDockVisible, SIGNAL(triggered()), this, SLOT(dockVisibleTriggered()));
+    aPrintingSelectorDockFloating = printingSelectorDockMenu->addAction(QString());
+    aPrintingSelectorDockFloating->setCheckable(true);
+    connect(aPrintingSelectorDockFloating, SIGNAL(triggered()), this, SLOT(dockFloatingTriggered()));
+
+    viewMenu->addSeparator();
+
+    aResetLayout = viewMenu->addAction(QString());
+    connect(aResetLayout, SIGNAL(triggered()), this, SLOT(restartLayout()));
+    viewMenu->addAction(aResetLayout);
+
+    deckMenu->setSaveStatus(false);
+
+    addTabMenu(viewMenu);
+}
+
+QString TabDeckEditorVisual::getTabText() const
+{
+    QString result = tr("Visual Deck: %1").arg(deckDockWidget->getSimpleDeckName());
+    if (modified)
+        result.prepend("* ");
+    return result;
+}
+
+void TabDeckEditorVisual::changeModelIndexAndCardInfo(const ExactCard &activeCard)
+{
+    updateCard(activeCard);
+    changeModelIndexToCard(activeCard);
+}
+
+void TabDeckEditorVisual::changeModelIndexToCard(const ExactCard &activeCard)
+{
+    QString cardName = activeCard.getName();
+    QModelIndex index = deckDockWidget->deckModel->findCard(cardName, DECK_ZONE_MAIN);
+    if (!index.isValid()) {
+        index = deckDockWidget->deckModel->findCard(cardName, DECK_ZONE_SIDE);
+    }
+    deckDockWidget->deckView->setCurrentIndex(index);
+}
+
+void TabDeckEditorVisual::processMainboardCardClick(QMouseEvent *event,
+                                                    CardInfoPictureWithTextOverlayWidget *instance,
+                                                    QString zoneName)
+{
+    if (event->button() == Qt::LeftButton) {
+        actSwapCard(instance->getCard(), zoneName);
+    } else if (event->button() == Qt::RightButton) {
+        actDecrementCard(instance->getCard());
+    } else if (event->button() == Qt::MiddleButton) {
+        deckDockWidget->actRemoveCard();
+    }
+}
+
+void TabDeckEditorVisual::processCardClickDatabaseDisplay(QMouseEvent *event,
+                                                          CardInfoPictureWithTextOverlayWidget *instance)
+{
+    if (event->button() == Qt::LeftButton) {
+        actAddCard(instance->getCard());
+    } else if (event->button() == Qt::RightButton) {
+        actDecrementCard(instance->getCard());
+    } else if (event->button() == Qt::MiddleButton) {
+        deckDockWidget->actRemoveCard();
+    }
+}
+
+bool TabDeckEditorVisual::actSaveDeckAs()
+{
+    // We have to disable the quick-add search bar or else it'll steal focus after dialog creation.
+    tabContainer->visualDeckView->searchBar->setEnabled(false);
+    auto result = AbstractTabDeckEditor::actSaveDeckAs();
+    tabContainer->visualDeckView->searchBar->setEnabled(true);
+    return result;
+}
+
+void TabDeckEditorVisual::showPrintingSelector()
+{
+    printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr(),
+                                                          DECK_ZONE_MAIN);
+    printingSelectorDockWidget->printingSelector->updateDisplay();
+    aPrintingSelectorDockVisible->setChecked(true);
+    printingSelectorDockWidget->setVisible(true);
+}
+
+void TabDeckEditorVisual::freeDocksSize()
+{
+    deckDockWidget->setMinimumSize(100, 100);
+    deckDockWidget->setMaximumSize(5000, 5000);
+
+    cardInfoDockWidget->setMinimumSize(100, 100);
+    cardInfoDockWidget->setMaximumSize(5000, 5000);
+
+    filterDockWidget->setMinimumSize(100, 100);
+    filterDockWidget->setMaximumSize(5000, 5000);
+
+    printingSelectorDockWidget->setMinimumSize(100, 100);
+    printingSelectorDockWidget->setMaximumSize(5000, 5000);
+}
+
+void TabDeckEditorVisual::refreshShortcuts()
+{
+    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
+    aResetLayout->setShortcuts(shortcuts.getShortcut("TabDeckEditorVisual/aResetLayout"));
+}
+
+void TabDeckEditorVisual::loadLayout()
+{
+    LayoutsSettings &layouts = SettingsCache::instance().layouts();
+    auto &layoutState = layouts.getDeckEditorLayoutState();
+    if (layoutState.isNull()) {
+        restartLayout();
+    } else {
+        restoreState(layoutState);
+        restoreGeometry(layouts.getDeckEditorGeometry());
+    }
+
+    aCardInfoDockVisible->setChecked(!cardInfoDockWidget->isHidden());
+    aFilterDockVisible->setChecked(!filterDockWidget->isHidden());
+    aDeckDockVisible->setChecked(!deckDockWidget->isHidden());
+    aPrintingSelectorDockVisible->setChecked(!printingSelectorDockWidget->isHidden());
+
+    aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
+    aDeckDockFloating->setEnabled(aDeckDockVisible->isChecked());
+    aFilterDockFloating->setEnabled(aFilterDockVisible->isChecked());
+    aPrintingSelectorDockFloating->setEnabled(aPrintingSelectorDockVisible->isChecked());
+
+    aCardInfoDockFloating->setChecked(cardInfoDockWidget->isFloating());
+    aFilterDockFloating->setChecked(filterDockWidget->isFloating());
+    aDeckDockFloating->setChecked(deckDockWidget->isFloating());
+    aPrintingSelectorDockFloating->setChecked(printingSelectorDockWidget->isFloating());
+
+    cardInfoDockWidget->setMinimumSize(layouts.getDeckEditorCardSize());
+    cardInfoDockWidget->setMaximumSize(layouts.getDeckEditorCardSize());
+
+    filterDockWidget->setMinimumSize(layouts.getDeckEditorFilterSize());
+    filterDockWidget->setMaximumSize(layouts.getDeckEditorFilterSize());
+
+    deckDockWidget->setMinimumSize(layouts.getDeckEditorDeckSize());
+    deckDockWidget->setMaximumSize(layouts.getDeckEditorDeckSize());
+
+    printingSelectorDockWidget->setMinimumSize(layouts.getDeckEditorPrintingSelectorSize());
+    printingSelectorDockWidget->setMaximumSize(layouts.getDeckEditorPrintingSelectorSize());
+
+    QTimer::singleShot(100, this, &TabDeckEditorVisual::freeDocksSize);
+}
+
+void TabDeckEditorVisual::restartLayout()
+{
+    deckDockWidget->setVisible(true);
+    cardInfoDockWidget->setVisible(true);
+    filterDockWidget->setVisible(false);
+    printingSelectorDockWidget->setVisible(true);
+
+    deckDockWidget->setFloating(false);
+    cardInfoDockWidget->setFloating(false);
+    filterDockWidget->setFloating(false);
+    printingSelectorDockWidget->setFloating(false);
+
+    aCardInfoDockVisible->setChecked(true);
+    aDeckDockVisible->setChecked(true);
+    aFilterDockVisible->setChecked(false);
+    aPrintingSelectorDockVisible->setChecked(true);
+
+    aCardInfoDockFloating->setChecked(false);
+    aDeckDockFloating->setChecked(false);
+    aFilterDockFloating->setChecked(false);
+    aPrintingSelectorDockFloating->setChecked(false);
+
+    setCentralWidget(centralWidget);
+    addDockWidget(static_cast<Qt::DockWidgetArea>(2), deckDockWidget);
+    addDockWidget(static_cast<Qt::DockWidgetArea>(2), cardInfoDockWidget);
+    addDockWidget(static_cast<Qt::DockWidgetArea>(2), printingSelectorDockWidget);
+
+    splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Vertical);
+    splitDockWidget(cardInfoDockWidget, deckDockWidget, Qt::Horizontal);
+
+    QTimer::singleShot(100, this, SLOT(freeDocksSize()));
+}
+
+void TabDeckEditorVisual::retranslateUi()
+{
+    deckMenu->setTitle(tr("&Visual Deck Editor"));
+
+    cardInfoDockWidget->setWindowTitle(tr("Card Info"));
+    deckDockWidget->setWindowTitle(tr("Deck"));
+    filterDockWidget->setWindowTitle(tr("Filters"));
+
+    viewMenu->setTitle(tr("&View"));
+    cardInfoDockMenu->setTitle(tr("Card Info"));
+    deckDockMenu->setTitle(tr("Deck"));
+    filterDockMenu->setTitle(tr("Filters"));
+    printingSelectorDockMenu->setTitle(tr("Printing"));
+
+    aCardInfoDockVisible->setText(tr("Visible"));
+    aCardInfoDockFloating->setText(tr("Floating"));
+
+    aDeckDockVisible->setText(tr("Visible"));
+    aDeckDockFloating->setText(tr("Floating"));
+
+    aFilterDockVisible->setText(tr("Visible"));
+    aFilterDockFloating->setText(tr("Floating"));
+
+    aPrintingSelectorDockVisible->setText(tr("Visible"));
+    aPrintingSelectorDockFloating->setText(tr("Floating"));
+
+    aResetLayout->setText(tr("Reset layout"));
+}
+
+// Method uses to sync docks state with menu items state
+bool TabDeckEditorVisual::eventFilter(QObject *o, QEvent *e)
+{
+    if (e->type() == QEvent::Close) {
+        if (o == cardInfoDockWidget) {
+            aCardInfoDockVisible->setChecked(false);
+            aCardInfoDockFloating->setEnabled(false);
+        } else if (o == deckDockWidget) {
+            aDeckDockVisible->setChecked(false);
+            aDeckDockFloating->setEnabled(false);
+        } else if (o == filterDockWidget) {
+            aFilterDockVisible->setChecked(false);
+            aFilterDockFloating->setEnabled(false);
+        } else if (o == printingSelectorDockWidget) {
+            aPrintingSelectorDockVisible->setChecked(false);
+            aPrintingSelectorDockFloating->setEnabled(false);
+        }
+    }
+    if (o == this && e->type() == QEvent::Hide) {
+        LayoutsSettings &layouts = SettingsCache::instance().layouts();
+        layouts.setDeckEditorLayoutState(saveState());
+        layouts.setDeckEditorGeometry(saveGeometry());
+        layouts.setDeckEditorCardSize(cardInfoDockWidget->size());
+        layouts.setDeckEditorFilterSize(filterDockWidget->size());
+        layouts.setDeckEditorDeckSize(deckDockWidget->size());
+        layouts.setDeckEditorPrintingSelectorSize(printingSelectorDockWidget->size());
+    }
+    return false;
+}
+
+void TabDeckEditorVisual::dockVisibleTriggered()
+{
+    QObject *o = sender();
+    if (o == aCardInfoDockVisible) {
+        cardInfoDockWidget->setHidden(!aCardInfoDockVisible->isChecked());
+        aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
+        return;
+    }
+
+    if (o == aDeckDockVisible) {
+        deckDockWidget->setHidden(!aDeckDockVisible->isChecked());
+        aDeckDockFloating->setEnabled(aDeckDockVisible->isChecked());
+        return;
+    }
+
+    if (o == aFilterDockVisible) {
+        filterDockWidget->setHidden(!aFilterDockVisible->isChecked());
+        aFilterDockFloating->setEnabled(aFilterDockVisible->isChecked());
+        return;
+    }
+
+    if (o == aPrintingSelectorDockVisible) {
+        printingSelectorDockWidget->setHidden(!aPrintingSelectorDockVisible->isChecked());
+        aPrintingSelectorDockFloating->setEnabled(aPrintingSelectorDockVisible->isChecked());
+        return;
+    }
+}
+
+void TabDeckEditorVisual::dockFloatingTriggered()
+{
+    QObject *o = sender();
+    if (o == aCardInfoDockFloating) {
+        cardInfoDockWidget->setFloating(aCardInfoDockFloating->isChecked());
+        return;
+    }
+
+    if (o == aDeckDockFloating) {
+        deckDockWidget->setFloating(aDeckDockFloating->isChecked());
+        return;
+    }
+
+    if (o == aFilterDockFloating) {
+        filterDockWidget->setFloating(aFilterDockFloating->isChecked());
+        return;
+    }
+
+    if (o == aPrintingSelectorDockFloating) {
+        printingSelectorDockWidget->setFloating(aPrintingSelectorDockFloating->isChecked());
+        return;
+    }
+}
+
+void TabDeckEditorVisual::dockTopLevelChanged(bool topLevel)
+{
+    QObject *o = sender();
+    if (o == cardInfoDockWidget) {
+        aCardInfoDockFloating->setChecked(topLevel);
+        return;
+    }
+
+    if (o == deckDockWidget) {
+        aDeckDockFloating->setChecked(topLevel);
+        return;
+    }
+
+    if (o == filterDockWidget) {
+        aFilterDockFloating->setChecked(topLevel);
+        return;
+    }
+
+    if (o == printingSelectorDockWidget) {
+        aPrintingSelectorDockFloating->setChecked(topLevel);
+        return;
+    }
+}
\ No newline at end of file
diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.h b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.h
new file mode 100644
index 000000000..b77beede8
--- /dev/null
+++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.h
@@ -0,0 +1,50 @@
+#ifndef WINDOW_DECKEDITORVISUAL_H
+#define WINDOW_DECKEDITORVISUAL_H
+
+#include "../tab.h"
+#include "tab_deck_editor_visual_tab_widget.h"
+
+class TabDeckEditorVisual : public AbstractTabDeckEditor
+{
+    Q_OBJECT
+protected slots:
+    void loadLayout() override;
+    void restartLayout() override;
+    void freeDocksSize() override;
+    void refreshShortcuts() override;
+
+    bool eventFilter(QObject *o, QEvent *e) override;
+    void dockVisibleTriggered() override;
+    void dockFloatingTriggered() override;
+    void dockTopLevelChanged(bool topLevel) override;
+
+protected:
+    TabDeckEditorVisualTabWidget *tabContainer;
+
+    QVBoxLayout *centralFrame;
+    QVBoxLayout *searchAndDatabaseFrame;
+    QHBoxLayout *searchLayout;
+    QDockWidget *searchAndDatabaseDock;
+    QWidget *centralWidget;
+
+public:
+    explicit TabDeckEditorVisual(TabSupervisor *_tabSupervisor);
+    void retranslateUi() override;
+    QString getTabText() const override;
+    void changeModelIndexAndCardInfo(const ExactCard &activeCard);
+    void changeModelIndexToCard(const ExactCard &activeCard);
+    void createDeckAnalyticsDock();
+    void createMenus() override;
+    void createSearchAndDatabaseFrame();
+    void createCentralFrame();
+
+public slots:
+    void onDeckChanged() override;
+    void showPrintingSelector() override;
+    void
+    processMainboardCardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
+    void processCardClickDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
+    bool actSaveDeckAs() override;
+};
+
+#endif
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
similarity index 64%
rename from cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
rename to cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
index 82aeb05a6..f42b1ff70 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
+++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
@@ -3,17 +3,6 @@
 #include "../../interface/widgets/visual_database_display/visual_database_display_widget.h"
 #include "../abstract_tab_deck_editor.h"
 
-/**
- * @brief Constructs the TabDeckEditorVisualTabWidget.
- * @param parent The parent QWidget.
- * @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.
- */
 TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent,
                                                            AbstractTabDeckEditor *_deckEditor,
                                                            DeckListModel *_deckModel,
@@ -25,10 +14,11 @@ TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent,
     this->setTabsClosable(true); // Enable tab closing
     connect(this, &QTabWidget::tabCloseRequested, this, &TabDeckEditorVisualTabWidget::handleTabClose);
 
+    // Set up the layout and add tab widget
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    visualDeckView = new VisualDeckEditorWidget(this, deckModel, _deckEditor->deckDockWidget->getSelectionModel());
+    visualDeckView = new VisualDeckEditorWidget(this, deckModel);
     visualDeckView->setObjectName("visualDeckView");
     connect(visualDeckView, &VisualDeckEditorWidget::activeCardChanged, this,
             &TabDeckEditorVisualTabWidget::onCardChanged);
@@ -45,13 +35,10 @@ TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent,
     connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::cardClickedDatabaseDisplay, this,
             &TabDeckEditorVisualTabWidget::onCardClickedDatabaseDisplay);
 
-    statsAnalyzer = new DeckListStatisticsAnalyzer(this, deckModel);
-    statsAnalyzer->analyze();
-
-    deckAnalytics = new DeckAnalyticsWidget(this, statsAnalyzer);
+    deckAnalytics = new DeckAnalyticsWidget(this, deckModel);
     deckAnalytics->setObjectName("deckAnalytics");
 
-    sampleHandWidget = new VisualDeckEditorSampleHandWidget(this, deckModel, statsAnalyzer);
+    sampleHandWidget = new VisualDeckEditorSampleHandWidget(this, deckModel);
 
     this->addNewTab(visualDeckView, tr("Visual Deck View"));
     this->addNewTab(visualDatabaseDisplay, tr("Visual Database Display"));
@@ -59,30 +46,16 @@ TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent,
     this->addNewTab(sampleHandWidget, tr("Sample Hand"));
 }
 
-/**
- * @brief Emits the cardChanged signal when a card is activated in the visual deck view.
- * @param activeCard The card that was activated.
- */
 void TabDeckEditorVisualTabWidget::onCardChanged(const ExactCard &activeCard)
 {
     emit cardChanged(activeCard);
 }
 
-/**
- * @brief Emits the cardChangedDatabaseDisplay signal when a card is hovered in the database display.
- * @param activeCard The card that was hovered.
- */
 void TabDeckEditorVisualTabWidget::onCardChangedDatabaseDisplay(const ExactCard &activeCard)
 {
     emit cardChangedDatabaseDisplay(activeCard);
 }
 
-/**
- * @brief Emits the cardClicked signal when a card is clicked in the visual deck view.
- * @param event The mouse event.
- * @param instance The widget instance of the clicked card.
- * @param zoneName The zone of the deck where the card is located.
- */
 void TabDeckEditorVisualTabWidget::onCardClickedDeckEditor(QMouseEvent *event,
                                                            CardInfoPictureWithTextOverlayWidget *instance,
                                                            QString zoneName)
@@ -90,77 +63,51 @@ void TabDeckEditorVisualTabWidget::onCardClickedDeckEditor(QMouseEvent *event,
     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 instance The widget instance of the clicked card.
- */
 void TabDeckEditorVisualTabWidget::onCardClickedDatabaseDisplay(QMouseEvent *event,
                                                                 CardInfoPictureWithTextOverlayWidget *instance)
 {
     emit cardClickedDatabaseDisplay(event, instance);
 }
 
-/**
- * @brief Adds a new tab with the given widget and title.
- * @param widget The widget to add.
- * @param title The title of the tab.
- */
 void TabDeckEditorVisualTabWidget::addNewTab(QWidget *widget, const QString &title)
 {
+    // Add new tab to the tab widget
     this->addTab(widget, title);
 }
 
-/**
- * @brief Removes the currently selected tab.
- */
 void TabDeckEditorVisualTabWidget::removeCurrentTab()
 {
+    // Remove the currently selected tab
     int currentIndex = this->currentIndex();
     if (currentIndex != -1) {
         this->removeTab(currentIndex);
     }
 }
 
-/**
- * @brief Sets the title of a tab at a given index.
- * @param index The index of the tab.
- * @param title The new title.
- */
 void TabDeckEditorVisualTabWidget::setTabTitle(int index, const QString &title)
 {
+    // Set the title of the tab at the given index
     if (index >= 0 && index < this->count()) {
         this->setTabText(index, title);
     }
 }
 
-/**
- * @brief Returns the currently selected tab widget.
- * @return Pointer to the current tab widget.
- */
 QWidget *TabDeckEditorVisualTabWidget::getCurrentTab() const
 {
+    // Return the currently selected tab widget
     return this->currentWidget();
 }
 
-/**
- * @brief Returns the number of tabs in the tab widget.
- * @return Number of tabs.
- */
 int TabDeckEditorVisualTabWidget::getTabCount() const
 {
+    // Return the number of tabs
     return this->count();
 }
 
-/**
- * @brief Handles the closing of a tab.
- * @param index The index of the tab to close.
- *
- * Removes the tab and deletes the widget to free memory.
- */
 void TabDeckEditorVisualTabWidget::handleTabClose(int index)
 {
+    // Handle closing of the tab at the given index
     QWidget *tab = this->widget(index);
     this->removeTab(index);
-    delete tab;
+    delete tab; // Delete the tab's widget to free memory
 }
diff --git a/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
new file mode 100644
index 000000000..36027f819
--- /dev/null
+++ b/cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
@@ -0,0 +1,62 @@
+#ifndef TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
+#define TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
+
+#include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
+#include "../../interface/widgets/printing_selector/printing_selector.h"
+#include "../../interface/widgets/visual_database_display/visual_database_display_widget.h"
+#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h"
+#include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
+#include "../abstract_tab_deck_editor.h"
+
+#include <QTabWidget>
+#include <QVBoxLayout>
+#include <QWidget>
+
+class TabDeckEditorVisualTabWidget : public QTabWidget
+{
+    Q_OBJECT
+
+public:
+    explicit TabDeckEditorVisualTabWidget(QWidget *parent,
+                                          AbstractTabDeckEditor *_deckEditor,
+                                          DeckListModel *_deckModel,
+                                          CardDatabaseModel *_cardDatabaseModel,
+                                          CardDatabaseDisplayModel *_cardDatabaseDisplayModel);
+
+    // Utility functions
+    void addNewTab(QWidget *widget, const QString &title);
+    void removeCurrentTab();
+    void setTabTitle(int index, const QString &title);
+    QWidget *getCurrentTab() const;
+    int getTabCount() const;
+
+    VisualDeckEditorWidget *visualDeckView;
+    DeckAnalyticsWidget *deckAnalytics;
+    VisualDatabaseDisplayWidget *visualDatabaseDisplay;
+    PrintingSelector *printingSelector;
+    VisualDeckEditorSampleHandWidget *sampleHandWidget;
+
+public slots:
+    void onCardChanged(const ExactCard &activeCard);
+    void onCardChangedDatabaseDisplay(const ExactCard &activeCard);
+    void onCardClickedDeckEditor(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
+    void onCardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
+
+signals:
+    void cardChanged(const ExactCard &activeCard);
+    void cardChangedDatabaseDisplay(const ExactCard &activeCard);
+    void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
+    void cardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
+
+private:
+    QVBoxLayout *layout; // Layout for the tab widget and other controls
+    AbstractTabDeckEditor *deckEditor;
+    DeckListModel *deckModel;
+    CardDatabaseModel *cardDatabaseModel;
+    CardDatabaseDisplayModel *cardDatabaseDisplayModel;
+
+private slots:
+    void handleTabClose(int index); // Slot for closing a tab
+};
+
+#endif // TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
similarity index 76%
rename from cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
rename to cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
index 0cbcb641a..ea8822213 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
+++ b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
@@ -1,10 +1,13 @@
 #include "tab_deck_storage_visual.h"
 
+#include "../../database/model/card_database_model.h"
+#include "../../interface/widgets/cards/deck_preview_card_picture_widget.h"
 #include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
 #include "../tab_supervisor.h"
+#include "pb/command_deck_del.pb.h"
 
 #include <QMessageBox>
-#include <libcockatrice/protocol/pb/command_deck_del.pb.h>
+#include <QMouseEvent>
 
 TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor)
     : Tab(_tabSupervisor), visualDeckStorageWidget(new VisualDeckStorageWidget(this))
@@ -24,12 +27,11 @@ TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor)
 
 void TabDeckStorageVisual::actOpenLocalDeck(const QString &filePath)
 {
-    std::optional<LoadedDeck> deckOpt =
-        DeckLoader::loadFromFile(filePath, DeckFileFormat::getFormatFromName(filePath), true);
-    if (!deckOpt) {
+    DeckLoader deckLoader;
+    if (!deckLoader.loadFromFile(filePath, DeckLoader::getFormatFromName(filePath), true)) {
         QMessageBox::critical(this, tr("Error"), tr("Could not open deck at %1").arg(filePath));
         return;
     }
 
-    emit openDeckEditor(deckOpt.value());
+    emit openDeckEditor(&deckLoader);
 }
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.h
similarity index 77%
rename from cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h
rename to cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.h
index ccf752e67..10cd3b0cb 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h
+++ b/cockatrice/src/tabs/visual_deck_storage/tab_deck_storage_visual.h
@@ -1,17 +1,11 @@
-/**
- * @file tab_deck_storage_visual.h
- * @ingroup Tabs
- * @brief TODO: Document this.
- */
-
 #ifndef TAB_DECK_STORAGE_VISUAL_H
 #define TAB_DECK_STORAGE_VISUAL_H
 
 #include "../tab.h"
 
-struct LoadedDeck;
 class AbstractClient;
 class CommandContainer;
+class DeckLoader;
 class DeckPreviewWidget;
 class QFileSystemModel;
 class QGroupBox;
@@ -27,9 +21,7 @@ class TabDeckStorageVisual final : public Tab
     Q_OBJECT
 public:
     explicit TabDeckStorageVisual(TabSupervisor *_tabSupervisor);
-    void retranslateUi() override
-    {
-    }
+    void retranslateUi() override{};
     [[nodiscard]] QString getTabText() const override
     {
         return tr("Visual Deck Storage");
@@ -39,7 +31,7 @@ public slots:
     void actOpenLocalDeck(const QString &filePath);
 
 signals:
-    void openDeckEditor(const LoadedDeck &deck);
+    void openDeckEditor(const DeckLoader *deckLoader);
 
 private:
     VisualDeckStorageWidget *visualDeckStorageWidget;
diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp b/cockatrice/src/utility/card_info_comparator.cpp
similarity index 100%
rename from libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
rename to cockatrice/src/utility/card_info_comparator.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.h b/cockatrice/src/utility/card_info_comparator.h
similarity index 60%
rename from libcockatrice_card/libcockatrice/card/card_info_comparator.h
rename to cockatrice/src/utility/card_info_comparator.h
index b8d9c47e6..18535c85a 100644
--- a/libcockatrice_card/libcockatrice/card/card_info_comparator.h
+++ b/cockatrice/src/utility/card_info_comparator.h
@@ -1,14 +1,9 @@
-/**
- * @file card_info_comparator.h
- * @ingroup Cards
- * @brief TODO: Document this.
- */
-
 #ifndef CARD_INFO_COMPARATOR_H
 #define CARD_INFO_COMPARATOR_H
 
-#include "card_info.h"
+#include "../card/card_info.h"
 
+#include <QStringList>
 #include <QVariant>
 #include <Qt>
 
@@ -22,8 +17,8 @@ private:
     QStringList m_properties; // List of properties to sort by
     Qt::SortOrder m_order;
 
-    [[nodiscard]] QVariant getProperty(const CardInfoPtr &card, const QString &property) const;
-    [[nodiscard]] bool compareVariants(const QVariant &a, const QVariant &b) const;
+    QVariant getProperty(const CardInfoPtr &card, const QString &property) const;
+    bool compareVariants(const QVariant &a, const QVariant &b) const;
 };
 
 #endif // CARD_INFO_COMPARATOR_H
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h b/cockatrice/src/utility/card_set_comparator.h
similarity index 91%
rename from libcockatrice_card/libcockatrice/card/set/card_set_comparator.h
rename to cockatrice/src/utility/card_set_comparator.h
index 96f1052a9..d68376cca 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h
+++ b/cockatrice/src/utility/card_set_comparator.h
@@ -1,13 +1,7 @@
-/**
- * @file card_set_comparator.h
- * @ingroup CardSets
- * @brief TODO: Document this.
- */
-
 #ifndef SET_PRIORITY_COMPARATOR_H
 #define SET_PRIORITY_COMPARATOR_H
 
-#include "../card_info.h"
+#include "../card/card_info.h"
 
 class SetPriorityComparator
 {
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp
similarity index 88%
rename from libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp
rename to cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp
index 0ec159737..a7776cbec 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp
+++ b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.cpp
@@ -1,6 +1,6 @@
 #include "deck_list_sort_filter_proxy_model.h"
 
-#include "deck_list_model.h"
+#include "../deck/deck_list_model.h"
 
 bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
@@ -11,8 +11,8 @@ bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QMode
     bool rightIsCard = src->data(right, Qt::UserRole + 1).toBool();
 
     if (!leftIsCard || !rightIsCard) {
-        QString lName = src->data(left.siblingAtColumn(DeckListModelColumns::CARD_NAME), Qt::EditRole).toString();
-        QString rName = src->data(right.siblingAtColumn(DeckListModelColumns::CARD_NAME), Qt::EditRole).toString();
+        QString lName = src->data(left.siblingAtColumn(1), Qt::EditRole).toString();
+        QString rName = src->data(right.siblingAtColumn(1), Qt::EditRole).toString();
         return lName.localeAwareCompare(rName) < 0;
     }
 
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h
similarity index 67%
rename from libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h
rename to cockatrice/src/utility/deck_list_sort_filter_proxy_model.h
index 94742795d..d21907c84 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h
+++ b/cockatrice/src/utility/deck_list_sort_filter_proxy_model.h
@@ -1,14 +1,9 @@
-/**
- * @file deck_list_sort_filter_proxy_model.h
- * @ingroup DeckEditorCardGroupWidgets
- * @brief TODO: Document this.
- */
-
 #ifndef COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H
 #define COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H
 
+#include "../database/card_database_manager.h"
+
 #include <QSortFilterProxyModel>
-#include <libcockatrice/card/database/card_database_manager.h>
 
 class DeckListSortFilterProxyModel : public QSortFilterProxyModel
 {
@@ -25,7 +20,7 @@ public:
     }
 
 protected:
-    [[nodiscard]] bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
 
 private:
     QStringList sortCriteria;
diff --git a/cockatrice/src/interface/key_signals.cpp b/cockatrice/src/utility/key_signals.cpp
similarity index 100%
rename from cockatrice/src/interface/key_signals.cpp
rename to cockatrice/src/utility/key_signals.cpp
diff --git a/cockatrice/src/interface/key_signals.h b/cockatrice/src/utility/key_signals.h
similarity index 84%
rename from cockatrice/src/interface/key_signals.h
rename to cockatrice/src/utility/key_signals.h
index 3404dca9e..32e656c76 100644
--- a/cockatrice/src/interface/key_signals.h
+++ b/cockatrice/src/utility/key_signals.h
@@ -1,10 +1,3 @@
-/**
- * @file key_signals.h
- * @ingroup Core
- * @ingroup UI
- * @brief TODO: Document this.
- */
-
 #ifndef KEYSIGNALS_H
 #define KEYSIGNALS_H
 
diff --git a/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp b/cockatrice/src/utility/levenshtein.cpp
similarity index 100%
rename from libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
rename to cockatrice/src/utility/levenshtein.cpp
diff --git a/libcockatrice_utility/libcockatrice/utility/levenshtein.h b/cockatrice/src/utility/levenshtein.h
similarity index 65%
rename from libcockatrice_utility/libcockatrice/utility/levenshtein.h
rename to cockatrice/src/utility/levenshtein.h
index e83235470..b9b05a13c 100644
--- a/libcockatrice_utility/libcockatrice/utility/levenshtein.h
+++ b/cockatrice/src/utility/levenshtein.h
@@ -1,9 +1,3 @@
-/**
- * @file levenshtein.h
- * @ingroup Core
- * @brief TODO: Document this.
- */
-
 #ifndef LEVENSHTEIN_H
 #define LEVENSHTEIN_H
 
diff --git a/cockatrice/src/interface/logger.cpp b/cockatrice/src/utility/logger.cpp
similarity index 83%
rename from cockatrice/src/interface/logger.cpp
rename to cockatrice/src/utility/logger.cpp
index d6df065e8..0184146ae 100644
--- a/cockatrice/src/interface/logger.cpp
+++ b/cockatrice/src/utility/logger.cpp
@@ -4,7 +4,6 @@
 
 #include <QApplication>
 #include <QDateTime>
-#include <QDebug>
 #include <QLocale>
 #include <QSysInfo>
 #include <iostream>
@@ -52,15 +51,19 @@ void Logger::openLogfileSession()
     }
 
     fileHandle.setFileName(LOGGER_FILENAME);
-    if (!fileHandle.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
-        qWarning() << "Logger failed to open" << LOGGER_FILENAME << "for writing";
-        return;
-    }
+    fileHandle.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text);
     fileStream.setDevice(&fileHandle);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     fileStream << "Log session started at " << QDateTime::currentDateTime().toString() << Qt::endl;
     fileStream << getClientVersion() << Qt::endl;
     fileStream << getSystemArchitecture() << Qt::endl;
     fileStream << getClientInstallInfo() << Qt::endl;
+#else
+    fileStream << "Log session started at " << QDateTime::currentDateTime().toString() << endl;
+    fileStream << getClientVersion() << endl;
+    fileStream << getSystemArchitecture() << endl;
+    fileStream << getClientInstallInfo() << endl;
+#endif
     logToFileEnabled = true;
 }
 
@@ -70,7 +73,11 @@ void Logger::closeLogfileSession()
         return;
 
     logToFileEnabled = false;
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     fileStream << "Log session closed at " << QDateTime::currentDateTime().toString() << Qt::endl;
+#else
+    fileStream << "Log session closed at " << QDateTime::currentDateTime().toString() << endl;
+#endif
     fileHandle.close();
 }
 
@@ -92,7 +99,11 @@ void Logger::internalLog(const QString &message)
     std::cerr << message.toStdString() << std::endl; // Print to stdout
 
     if (logToFileEnabled) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         fileStream << message << Qt::endl; // Print to fileStream
+#else
+        fileStream << message << endl; // Print to fileStream
+#endif
     }
 }
 
diff --git a/cockatrice/src/interface/logger.h b/cockatrice/src/utility/logger.h
similarity index 95%
rename from cockatrice/src/interface/logger.h
rename to cockatrice/src/utility/logger.h
index 59244e226..b90644b36 100644
--- a/cockatrice/src/interface/logger.h
+++ b/cockatrice/src/utility/logger.h
@@ -1,9 +1,3 @@
-/**
- * @file logger.h
- * @ingroup Core
- * @brief TODO: Document this.
- */
-
 #ifndef LOGGER_H
 #define LOGGER_H
 
diff --git a/libcockatrice_utility/libcockatrice/utility/macros.h b/cockatrice/src/utility/macros.h
similarity index 100%
rename from libcockatrice_utility/libcockatrice/utility/macros.h
rename to cockatrice/src/utility/macros.h
diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp b/cockatrice/src/utility/sequence_edit.cpp
similarity index 99%
rename from cockatrice/src/interface/widgets/utility/sequence_edit.cpp
rename to cockatrice/src/utility/sequence_edit.cpp
index a34f39042..c5f0fd1c1 100644
--- a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
+++ b/cockatrice/src/utility/sequence_edit.cpp
@@ -1,10 +1,11 @@
 #include "sequence_edit.h"
 
-#include "../../../client/settings/cache_settings.h"
+#include "../settings/cache_settings.h"
 
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QToolTip>
+#include <utility>
 
 SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWidget(parent)
 {
diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.h b/cockatrice/src/utility/sequence_edit.h
similarity index 92%
rename from cockatrice/src/interface/widgets/utility/sequence_edit.h
rename to cockatrice/src/utility/sequence_edit.h
index a5fe1a1c6..e2ce6845e 100644
--- a/cockatrice/src/interface/widgets/utility/sequence_edit.h
+++ b/cockatrice/src/utility/sequence_edit.h
@@ -1,13 +1,8 @@
-/**
- * @file sequence_edit.h
- * @ingroup UI
- * @brief TODO: Document this.
- */
-
 #ifndef SEQUENCEEDIT_H
 #define SEQUENCEEDIT_H
 
 #include <QEvent>
+#include <QKeySequence>
 #include <QLineEdit>
 #include <QPushButton>
 #include <QWidget>
diff --git a/cockatrice/translations/cockatrice_cs.ts b/cockatrice/translations/cockatrice_cs.ts
index c210315c7..6df7f7949 100644
--- a/cockatrice/translations/cockatrice_cs.ts
+++ b/cockatrice/translations/cockatrice_cs.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Nastavit žeton...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nová hodnota pro žeton &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,81 +36,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -118,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -131,312 +129,251 @@ 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"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>Nastavení vzhledu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <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/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>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/dialogs/dlg_settings.cpp" line="663"/>
         <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/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <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/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <source>Enable left justification</source>
         <translation>Zapnout </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <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/dialogs/dlg_settings.cpp" line="692"/>
         <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/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximální velikost písma pro informace na kartách</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>Blokovat &amp; Uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>Blokovat &amp; IP Adresu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>Banovat I&amp;D klienta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Typ banu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;trvalý ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;dočasný ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dní:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Hodin:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minut:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Trvání banu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Uveďte prosím důvod pro ban.
 Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Uveďte prosám důvod pro ban, který uvidí banovaná osoba.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Zrušit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Zabanovat uživatele ze serveru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
@@ -444,22 +381,22 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -467,32 +404,32 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Edice</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Sesílací cena</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Typ karty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>S/O</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Barva(y)</translation>
     </message>
@@ -500,101 +437,96 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>A</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>NEBO</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>A NE</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>NEBO NE</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Barva</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>Edice</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Sesílací cena</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>Počet Many</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Vzácnost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Síla</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Obrana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Oddanost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Formát</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -602,22 +534,22 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +557,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -648,294 +580,172 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Přesunout</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Síla / odolnost</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>jejich ruka</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1ova/ina ruka</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>jejich knihovnu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1ovu/inu knihovnu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>jejich knihovny</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1ovy/iny knihovny</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>jejich knihovnu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1ovu/inu knihovnu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>jejich knihovnu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>%1ovu/inu knihovnu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>jejich knihovna</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1ova/ina knihovna</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>jejich hřbitov</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1ův/in hřbitov</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>jejich exil</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1ův/in exil</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>jejich sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1ův/in sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>jejich sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1ův/in sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -944,7 +754,7 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -952,60 +762,15 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1013,47 +778,47 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,97 +826,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +914,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1177,114 +932,109 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1042,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,227 +1050,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>Úspěch</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>Aktualizuji...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation>Vyberte cestu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>Spoilery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <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/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <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/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <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/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <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="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Karta</translation>
     </message>
@@ -1528,12 +1245,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,17 +1258,17 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,7 +1276,7 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,62 +1284,62 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,166 +1347,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1813,58 +1472,54 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Připraven začít</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1872,19 +1527,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1892,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Stahuji...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Známí hostitelé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Znovu načíst seznam serverů se známými veřejnými servery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Nový hostitel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Jméno:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hostitel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>Jméno &amp;hráče:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>H&amp;eslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Uložit heslo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>A&amp;utomatické připojení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Automaticky se připojit k poslednímu přihlášení při otevření Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>Jestli máte potíže se připájením nebo registrací, kontaktujte pracovníky servery pro pomoc! Pouze Anglicky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Webová stránka</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Připojit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Přihlášení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Připojit k serveru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>Komunikační port</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Varování přihlášení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Jméno hráče nemůže být prázdné</translation>
     </message>
@@ -2041,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Pamatovat si nastavení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Popis:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>H&amp;ráči:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Typ hry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Heslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Jen pro &amp;přátele</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Jen pro &amp;registrované</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Omezení připojení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>&amp;Diváci se mohou dívat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Diváci &amp;potřebují ke sledování heslo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Diváci mohou &amp;chatovat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Diváci mohou vidět do &amp;rukou</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Diváci</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;Smazat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Vytvořit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Informace o hře</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Chyba serveru.</translation>
     </message>
@@ -2164,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Jméno:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>B&amp;arva:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>bílá</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>modrá</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>černá</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>červená</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>zelená</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>vícebarevný</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>bezbarvý</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;S/O:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Poznámka:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Token se při odchodu z bojiště zničí</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Data tokenů</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Ukázat &amp;všechny tokeny</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Ukázat tokeny z tohto &amp;balíčku</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Vybrat token ze seznamu.</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Vytvořit token</translation>
     </message>
@@ -2262,53 +1907,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2316,40 +1961,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Nebyl vybrán obrázek.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Pro změnu avatara vyberte nový obrázek.
 Pro odstranění současného avatara potvrďte bez vybrání nového obrázku.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Prohlížet...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Změnit avatara</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Otevřít obrázek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Soubory obrázků (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Vybrán neplatný obrázek</translation>
     </message>
@@ -2357,17 +2002,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2375,38 +2020,38 @@ Pro odstranění současného avatara potvrďte bez vybrání nového obrázku.<
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Staré heslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nové heslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Potvrdit nové heslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Změnit heslo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Nová hesla nejsou stejná.</translation>
     </message>
@@ -2414,93 +2059,93 @@ Pro odstranění současného avatara potvrďte bez vybrání nového obrázku.<
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Jméno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>B&amp;arva</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>bílá</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>modrá</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>černá</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>červená</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>zelená</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>vícebarevná</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>bezbarvá</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;S/O</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Poznámka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Data k tokenu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Přidat token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Odstranit token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>Upravit vlastní tokeny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Zadejte prosím jméno pro token:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>Vybrané jméno se nemůže shodovat s již existující kartou nebo tokenem.
@@ -2510,27 +2155,27 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>E-mail:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Země:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Nespecifikováno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Skutečné jméno:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Upravit uživatelský profil</translation>
     </message>
@@ -2538,143 +2183,137 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>bez limitu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5 Minut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Popis hry:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>Jméno &amp;tvůrce:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>Typ &amp;hry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>&amp;minimálně:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>&amp;maximálně:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Maximální počet hráčů</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Omezení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Filtrovat hry</translation>
     </message>
@@ -2682,52 +2321,52 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hostitel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>Jméno &amp;hráče:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>Emailová adresa musí být vyplněna.</translation>
     </message>
@@ -2735,37 +2374,37 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hostitel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Jméno hráče:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Jméno hráče musí být vyplněno.</translation>
     </message>
@@ -2773,86 +2412,86 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hostitel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Jméno hráče:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Token:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Nové Heslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Vyplňte jméno hráče.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>Vyplňte token.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>Vyplňte nové heslo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>Hesla se neshodují.</translation>
     </message>
@@ -2860,7 +2499,7 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -2868,146 +2507,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Neplatný formát balíčku.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Nahrát balíček</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3015,91 +2571,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hostitel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>Jméno &amp;hráče:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>H&amp;eslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Heslo (znovu):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Email (znovu):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Země:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Neznámý</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Skutečné jméno:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Registrovat se na server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Vaše hesla se neshodují.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Vaše emailové adresy se neshodují.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Vyplňte jméno hráče.</translation>
     </message>
@@ -3107,17 +2663,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -3125,55 +2681,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3190,7 +2731,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3207,7 +2748,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2757,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3225,7 +2766,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3234,7 +2775,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3243,59 +2784,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Vzhled</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>Rozhraní</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Zvuk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Skratky</translation>
     </message>
@@ -3303,39 +2844,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3343,17 +2884,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>Další</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>Předchozí</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Tip</translation>
     </message>
@@ -3361,164 +2902,168 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Znovu instalovat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Přerušit stahování</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Hledám aktualizace...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Aktualizace byly skontrolovány</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Žádná dostupná aktualizace</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice je v aktuální verzi!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Aktuální verze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Dostupná aktualizace</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Je dostupná nová verze Cockatrice!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Nová verze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Chcete aktualizovat nyní?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Chyba aktualizace</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Došlo k chybě při kontrole aktualizací:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Došlo k chybě při stahování aktualizace:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Instaluji...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3526,162 +3071,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3689,47 +3102,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3737,44 +3150,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3782,7 +3189,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>Zde napište svůj filtr:</translation>
     </message>
@@ -3790,325 +3197,244 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Špatné heslo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Do této hry je divákům přístup zakázán.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>Hra je plná.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>Hra již neexistuje.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Hra je určena jen pro registrované.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Hra je dostupná jen pro přátele zakládajícícho.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Zakladatel hry vás ignoruje.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Připojit ke hře</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Heslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtrovat hry:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>Z&amp;rušit filtr:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>V&amp;ytvořit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>&amp;Připojit se</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>P&amp;řipojit se jako divák</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Hry</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>heslo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>jen pro přátele</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>jen pro registrované</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>může chatovat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>vidět do rukou</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>může vidět do rukou</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>nepovolené</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Místnost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Doba od otevření</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Zakladatel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Omezení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Hráči</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Diváci</translation>
     </message>
@@ -4116,1285 +3442,891 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>Na serveru je maximální počet uživatelů, skuste později.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Z vaší adresy jde mnoho současných připojení.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Neplatné uživatelské jméno.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Připojení uzavřeno</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>Server přerušil spojení.
 Důvod: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Počet hráčů</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Vložte počet hráčů.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Hráč %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>O Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Překlad:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Vypršel časový limit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>S tímto uživatelským jménem jste již připojeni.
 Přerušte spojení a znovu se přihlašte.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Chyba socketu: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>Snažíte se připojit na zastaralý server. Prosíme, stáhněte si nižší verzi Cockatrice, nebo se připojte k odpovídajícímu serveru.
 Lokální verze je %1, verze serveru je %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>Váš klient je zastaralý. Prosíme, aktualizujte Cockatrice na vyšší verzi.
 Lokální verze je %1, verze serveru je %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Připojování k %1...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Odpojeno</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Připojit...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Odpojit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>Spustit &amp;lokální hru...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Celá obrazovka</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Nastavení...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Konec</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;Nápověda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;O Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
         <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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,862 +4334,668 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/server/message_log_widget.cpp" line="160"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/server/message_log_widget.cpp" line="176"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="179"/>
+        <location filename="src/server/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="184"/>
+        <location filename="src/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>kartu</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="305"/>
         <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 exiluje %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation>Hra začíná.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/server/message_log_widget.cpp" line="710"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/server/message_log_widget.cpp" line="726"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -6265,206 +5003,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Zpráva:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1451"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1452"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -6472,17 +5167,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -6490,62 +5185,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -6553,57 +5248,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Konec kola</translation>
     </message>
@@ -6611,213 +5306,703 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal 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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <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.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>&amp;Zobrazit hřbitov</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>&amp;Zobrazit exilnuté karty</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>Hráč &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;Hřbitov</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;Exilnuté karty</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;Ruka</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>&amp;Zobrazit knihovnu</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>Zobrazit &amp;vrchní karty knihovny...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>&amp;Zobrazit sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;Líznout kartu</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>L&amp;íznout karty...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>&amp;Vrátit zpět poslední líznutí</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>&amp;Mulliganovat</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>Přesunout vrchní karty do &amp;hřbitova...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>&amp;Exilnout vrchní karty...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>Dát kartu na &amp;spodek</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>&amp;Sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Knihovna</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>&amp;Žetony</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>&amp;Odtapnout všechny permanenty</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>H&amp;odit kostkou...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>&amp;Vytvořit token...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>V&amp;ytvořit další token</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>&amp;Všem hráčům</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>&amp;Chat</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>Zobrazit vrchní karty knihovny</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
         <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.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <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.cpp" line="3188"/>
         <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.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>Líznout karty</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>Počet:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>Přesunout vrchní karty do hřbitova</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>Exilnout vrchní karty</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <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.cpp" line="3534"/>
         <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.cpp" line="3653"/>
         <source>Set annotation</source>
-        <translation type="unfinished"/>
+        <translation>Nastavit poznámku</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player.cpp" line="3654"/>
         <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
+        <translation>Vložte novou poznámku:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <source>Set counters</source>
-        <translation type="unfinished"/>
+        <translation>Nastavit žetony</translation>
     </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <source>&amp;Counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingDisabledInfoWidget</name>
-    <message>
-        <location filename="src/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>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</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/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</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/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6825,7 +6010,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"/>
     </message>
@@ -6833,17 +6018,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6851,132 +6036,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6984,162 +6103,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -7147,17 +6239,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Průběh nahrávání</translation>
     </message>
@@ -7165,149 +6257,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Místnosti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Připojit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Místnost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Hráči</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation type="unfinished"/>
     </message>
@@ -7315,27 +6361,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Dlouhý název</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -7343,53 +6389,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7397,12 +6443,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -7410,13 +6456,13 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -7425,58 +6471,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -7484,48 +6517,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -7533,27 +6566,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -7561,17 +6594,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -7579,289 +6612,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>Aktualizovat &amp;zprávu serveru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Administrační funkce serveru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>&amp;Odemknout funkce</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>&amp;Zamknout funkce</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7869,55 +6779,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7925,22 +6848,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7948,139 +6871,139 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>Lokální systém souborů</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Balíčky na serveru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Otevřít v editoru balíčků</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Nahrát balíček</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Stáhnout balíček</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>Nová složka</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Vložit jméno balíčku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>Tentobalíček nemá jméno.
 Prosím vložte jméno:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Bezejmenný balíček</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>Název nové složky:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8088,17 +7011,17 @@ Prosím vložte jméno:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8106,7 +7029,7 @@ Prosím vložte jméno:</translation>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8114,390 +7037,406 @@ Prosím vložte jméno:</translation>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <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/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>&amp;Hra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <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/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <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/client/tabs/tab_game.cpp" line="236"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <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/client/tabs/tab_game.cpp" line="257"/>
         <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/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>&amp;Chat:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>Ukončit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation>Opustit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
-        <source>You have been kicked out of the game.</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
+        <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -8505,37 +7444,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;Odejít</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 opustil server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 se připojil k serveru.</translation>
     </message>
@@ -8543,185 +7482,105 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -8729,47 +7588,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;Chat:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Chatovat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;Místnost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Opustit místnost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>Píšete příliš intenzivně. Počkejte pár sekund.</translation>
     </message>
@@ -8777,35 +7636,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -8813,97 +7672,87 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8911,38 +7760,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"/>
@@ -8951,12 +7800,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -8964,13 +7808,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation type="unfinished"/>
     </message>
@@ -8978,13 +7822,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"/>
@@ -8993,42 +7837,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -9036,7 +7880,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
@@ -9044,206 +7888,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <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 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 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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -9251,173 +8073,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Místo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Administrátor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Registrovaný</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Neregistrovaný</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation type="unfinished"/>
     </message>
@@ -9425,152 +8247,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <source>General interface settings</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation>Animace</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9578,241 +8385,86 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9820,27 +8472,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9848,7 +8500,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/client/ui/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 +8508,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9876,37 +8528,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9914,93 +8556,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10008,25 +8602,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10034,52 +8649,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10087,7 +8697,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10095,22 +8705,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10118,17 +8728,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10136,43 +8746,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"/>
     </message>
@@ -10180,133 +8790,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10314,72 +8924,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -10387,7 +8997,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Česky (Czech)</translation>
     </message>
@@ -10395,12 +9005,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -10408,1058 +9018,991 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Síla a obrana</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Herní fáze</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>Herní oblast</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>Pohled</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Průběh hry</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>Odtapnutí</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>Lízání</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>Útok</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>Bránění</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>Zranění</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Knihovna</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>Vzdát hru</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts
index b272214fe..bdeeb622f 100644
--- a/cockatrice/translations/cockatrice_de.ts
+++ b/cockatrice/translations/cockatrice_de.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>Zähler &amp;setzen...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Zähler setzen</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Neuer Wert für den Zähler &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Setnamen und -Nummer parsen (falls verfügbar)</translation>
     </message>
@@ -36,83 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="501"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="513"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="501"/>
         <source>There are no cards in your deck to be exported</source>
         <translation>Es gibt keine Karten in Ihrem Deck zum Exportieren</translation>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
-        <translation>Analysepanel hinzufügen</translation>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="513"/>
+        <source>No deck was selected to be exported.</source>
+        <translation>Es wurde kein Deck zum Exportieren ausgewählt.</translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation>Aktualisierungsnotizen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation>Administrator Notizen für %1</translation>
     </message>
@@ -120,12 +118,12 @@ Bitte überprüfen Sie, ob das Verzeichnis bearbeitet werden kann und versuchen
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
         <source>Mainboard</source>
         <translation>Hauptdeck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
         <source>Sideboard</source>
         <translation>Nebendeck</translation>
     </message>
@@ -133,199 +131,176 @@ 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/dialogs/dlg_settings.cpp" line="445"/>
         <source> seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="645"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="645"/>
         <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/dialogs/dlg_settings.cpp" line="683"/>
         <source>Theme settings</source>
         <translation>Darstellungseinstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Current theme:</source>
         <translation>Aktuelles Theme:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="685"/>
         <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/dialogs/dlg_settings.cpp" line="686"/>
         <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/dialogs/dlg_settings.cpp" line="687"/>
         <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/dialogs/dlg_settings.cpp" line="688"/>
         <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="690"/>
         <source>Menu settings</source>
         <translation>Einstellungsmenü</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="693"/>
         <source>Card rendering</source>
         <translation>Kartendarstellung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="694"/>
         <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/dialogs/dlg_settings.cpp" line="695"/>
         <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"/>
-        <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>
+        <location filename="src/dialogs/dlg_settings.cpp" line="697"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
+        <translation>Überschreiben aller Kartenbilder mit persönlichen Set-Präferenzen (Vor-AnbieterID Wechselverhalten) [Benötigt Klientenneustart]</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="700"/>
         <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/dialogs/dlg_settings.cpp" line="701"/>
         <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/dialogs/dlg_settings.cpp" line="702"/>
         <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/dialogs/dlg_settings.cpp" line="704"/>
         <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/dialogs/dlg_settings.cpp" line="705"/>
         <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/dialogs/dlg_settings.cpp" line="706"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="708"/>
         <source> rows</source>
         <translation>Reihen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="707"/>
         <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/dialogs/dlg_settings.cpp" line="710"/>
         <source>Card counters</source>
         <translation>Kartenzähler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="714"/>
         <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/dialogs/dlg_settings.cpp" line="717"/>
         <source>Hand layout</source>
         <translation>Handdarstellung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="718"/>
         <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/dialogs/dlg_settings.cpp" line="719"/>
         <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/dialogs/dlg_settings.cpp" line="721"/>
         <source>Table grid layout</source>
         <translation>Spielfeldraster</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="722"/>
         <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/dialogs/dlg_settings.cpp" line="723"/>
         <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/dialogs/dlg_settings.cpp" line="724"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximale Schriftgröße für die Anzeige von Informationen auf Karten:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation>Deck im Deck-Editor öffnen</translation>
-    </message>
-</context>
 <context>
     <name>BackgroundSources</name>
     <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
+        <location filename="src/client/ui/widgets/general/background_sources.h" line="29"/>
         <source>Theme</source>
         <translation>Thema</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
+        <location filename="src/client/ui/widgets/general/background_sources.h" line="30"/>
         <source>Art crop of random card</source>
         <translation>Bildausschnitt von zufälliger Karte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
+        <location filename="src/client/ui/widgets/general/background_sources.h" line="31"/>
         <source>Art crop of background.cod deck file</source>
         <translation>Bildausschnitt von Hintergrund.cod Deckdatei</translation>
     </message>
@@ -333,112 +308,112 @@ Bitte überprüfen Sie, ob das Verzeichnis bearbeitet werden kann und versuchen
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>&amp;Benutzername</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>&amp;IP-Adresse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>Client I&amp;D bannen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Art des Banns</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;permanenter Bann</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;temporärer Bann</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Tage:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Stunden:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minuten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Länge des Banns</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Bitte geben Sie den Grund für den Bann ein.
 Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nicht gesehen werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Bitte geben Sie den Grund ein, den die gebannte Person sehen kann.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Entferne alle Nachrichten dieses Nutzers in allen Räumen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Benutzer vom Server bannen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Bitte wählen Sie einen Namens-, Adress- oder Client-ID-Bann oder eine Kombination aus diesen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Wenn Sie das Namensbannkästchen auswählen, muss ein Wert für den Namen eingegeben werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Wenn Sie das Adressbannkästchen auswählen, muss ein Wert für die IP eingegeben werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Wenn Sie das Client-ID-Kästchen auswählen, muss ein Wert für die Client-ID eingegeben werden.</translation>
     </message>
@@ -446,22 +421,22 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>Keine Antwort vom Veröffentlichungsaktualisierungsserver erhalten.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Ungültige Antwort vom Veröffentlichungsaktualisierungsserver erhalten.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>Keine Antwort vom Dateiaktualisierungsserver erhalten.</translation>
     </message>
@@ -469,32 +444,32 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/database/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/database/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Editionen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/database/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Manakosten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/database/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Kartentyp</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/database/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>S/W</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/database/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Farbe(n)</translation>
     </message>
@@ -502,101 +477,96 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>UND</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>ODER</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>UND NICHT</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>ODER NICHT</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation>Name (Exakt)</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Farbe</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>Edition</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Manakosten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>Manawert</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Seltenheit</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Stärke</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Widerstandskraft</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Loyalität</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation>Haupttyp</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation>Untertyp</translation>
     </message>
@@ -604,22 +574,22 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="68"/>
         <source>Image</source>
         <translation>Bild</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="69"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Both</source>
         <translation>Beide</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="73"/>
         <source>View transformation</source>
         <translation>Transformation anzeigen</translation>
     </message>
@@ -627,22 +597,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="366"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="411"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="424"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="430"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -650,27 +620,17 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation>Set:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation>Sammlernummer:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation>Zugehörige Karten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation>Unbekannte Karte:</translation>
     </message>
@@ -678,124 +638,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="273"/>
         <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="304"/>
         <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="337"/>
         <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="385"/>
         <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="402"/>
         <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="425"/>
         <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="426"/>
         <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="427"/>
         <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="429"/>
         <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="430"/>
         <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="431"/>
         <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="433"/>
         <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 type="unfinished"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="434"/>
+        <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="436"/>
         <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="439"/>
         <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="440"/>
         <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="441"/>
         <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="442"/>
         <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="443"/>
         <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="444"/>
         <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="446"/>
         <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="451"/>
         <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="454"/>
         <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="457"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>&amp;Zähler setzen (%1)...</translation>
     </message>
@@ -803,7 +763,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation>Kartengröße</translation>
     </message>
@@ -811,133 +771,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="170"/>
         <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="170"/>
         <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="174"/>
         <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="175"/>
         <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="177"/>
         <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="178"/>
         <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="189"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
         <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"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <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="183"/>
         <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="185"/>
         <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="185"/>
         <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="188"/>
         <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="188"/>
         <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="190"/>
         <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="190"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation>%1&apos;s Exil</translation>
     </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <source>their sideboard</source>
+        <comment>look at zone</comment>
+        <translation>ihres Nebendecks</translation>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <source>%1&apos;s sideboard</source>
+        <comment>look at zone</comment>
+        <translation>%1&apos;s Nebendeck</translation>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <source>their sideboard</source>
+        <comment>nominative</comment>
+        <translation>ihres Nebendecks</translation>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <source>%1&apos;s sideboard</source>
+        <comment>nominative</comment>
+        <translation>%1&apos;s Nebendeck</translation>
+    </message>
     <message>
         <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
-        <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="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"/>
         <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="204"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>%1&apos;s individuelle Zone &apos;%2&apos;</translation>
@@ -946,7 +906,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/database/parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Parsingfehler in Zeile %1 Spalte %2:</translation>
     </message>
@@ -954,7 +914,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/database/parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Parsingfehler in Zeile %1 Spalte %2:</translation>
     </message>
@@ -973,41 +933,10 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
         <translation>Individuelle Zone &apos;%1&apos; ansehen</translation>
     </message>
 </context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation>Feld hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation>Feld entfernen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation>Layout speichern</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation>Layout laden</translation>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation>Kartendatenbank</translation>
-    </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/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Karteninformation</translation>
     </message>
@@ -1015,47 +944,47 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation>Suche nach Kartennamen (oder Suchausdrücken)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="203"/>
         <source>Add to Deck</source>
         <translation>Zum Deck hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
         <source>Add to Sideboard</source>
         <translation>Zum Sideboard hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="220"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="256"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="257"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Karte zum &amp;Sideboard hinzufügen</translation>
     </message>
@@ -1063,97 +992,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
         <source>Select Printing</source>
         <translation>Auswahl der Auflage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>Deck &amp;name:</source>
         <translation>Deck&amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation>Bannerkarte/Sichtbarkeitseinstellungen von Tags</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
         <source>Show banner card selection menu</source>
         <translation>Bannerkartenauswahlmenü anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
         <source>Show tags selection menu</source>
         <translation>Tagauswahlmenü anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Kommentare:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
         <source>Group by:</source>
         <translation>Gruppieren nach:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation>Format:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
         <source>Hash:</source>
         <translation>Hash:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
         <source>&amp;Increment number</source>
         <translation>&amp;Zahl erhöhen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
         <source>&amp;Decrement number</source>
         <translation>&amp;Zahl verringern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
         <source>&amp;Remove row</source>
         <translation>&amp;Reihe entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
         <source>Swap card to/from sideboard</source>
         <translation>Karte ins/aus dem Sideboard tauschen</translation>
     </message>
@@ -1161,17 +1080,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation>Auswahl löschen</translation>
     </message>
@@ -1179,114 +1098,114 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>&amp;Deck Editor</source>
         <translation>&amp;Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;New deck</source>
         <translation>&amp;Neues Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>&amp;Load deck...</source>
         <translation>&amp;Deck laden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="154"/>
         <source>Load recent deck...</source>
         <translation>Laden der letzten Decks...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Clear</source>
         <translation>Alles entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="156"/>
         <source>&amp;Save deck</source>
         <translation>&amp;Deck speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Save deck &amp;as...</source>
         <translation>&amp;Deck speichern unter...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Deck aus &amp;Zwischenablage laden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Edit deck in clipboard</source>
         <translation>Deck in Zwischenablage bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="166"/>
         <source>Annotated</source>
         <translation>Kommentiert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="168"/>
         <source>Not Annotated</source>
         <translation>Nicht kommentiert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Save deck to clipboard</source>
         <translation>Deck in Zwischenablage speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>Annotated (No set info)</source>
         <translation>Komentiert (keine Setinformationen)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>Not Annotated (No set info)</source>
         <translation>Nicht kommentiert (keine Setinformationen)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>&amp;Print deck...</source>
         <translation>&amp;Deck drucken...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Load deck from online service...</source>
         <translation>Deck von Onlineservice laden....</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="174"/>
         <source>&amp;Send deck to online service</source>
         <translation>&amp;Deck an Onlineservice senden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>Create decklist (decklist.org)</source>
         <translation>Deckliste erstellen (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="176"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation>Deckliste erstellen (decklist.xyz)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="177"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation>Deck analysieren (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="178"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation>Deck analysieren (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="180"/>
         <source>&amp;Close</source>
         <translation>&amp;Schließen</translation>
     </message>
@@ -1294,7 +1213,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation>Auflagenauswahl</translation>
     </message>
@@ -1302,227 +1221,194 @@ 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/dialogs/dlg_settings.cpp" line="1190"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1253"/>
         <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/dialogs/dlg_settings.cpp" line="1084"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <source>Success</source>
         <translation>Erfolgreich</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1084"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1123"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1123"/>
         <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/dialogs/dlg_settings.cpp" line="1130"/>
         <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/dialogs/dlg_settings.cpp" line="1130"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1150"/>
         <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/dialogs/dlg_settings.cpp" line="1150"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1255"/>
         <source>Edit URL</source>
         <translation>URL bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1247"/>
         <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/dialogs/dlg_settings.cpp" line="1249"/>
         <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/dialogs/dlg_settings.cpp" line="1250"/>
         <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/dialogs/dlg_settings.cpp" line="1251"/>
         <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/dialogs/dlg_settings.cpp" line="1254"/>
         <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/dialogs/dlg_settings.cpp" line="1256"/>
         <source>Remove URL</source>
         <translation>URL entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1257"/>
         <source>Day(s)</source>
         <translation>Tag(e)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Updating...</source>
         <translation>Aktualisiere...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <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/dialogs/dlg_settings.cpp" line="1235"/>
         <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/dialogs/dlg_settings.cpp" line="1236"/>
         <source>Spoilers</source>
         <translation>Spoiler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1237"/>
         <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/dialogs/dlg_settings.cpp" line="1238"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1239"/>
         <source>Last Change</source>
         <translation>Letzte Änderung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1240"/>
         <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/dialogs/dlg_settings.cpp" line="1241"/>
         <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/dialogs/dlg_settings.cpp" line="1242"/>
         <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/dialogs/dlg_settings.cpp" line="1243"/>
         <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/dialogs/dlg_settings.cpp" line="1244"/>
         <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/dialogs/dlg_settings.cpp" line="1245"/>
         <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/dialogs/dlg_settings.cpp" line="1246"/>
         <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/dialogs/dlg_settings.cpp" line="1248"/>
         <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/dialogs/dlg_settings.cpp" line="1252"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>Arbeitsspeicher-Cache für Bilder die gerade nicht angezeigt werden</translation>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation>Rückgängig machen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation>Wiederholen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation>Rückgängig machen/Wiederholen Verlauf</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation>Einen Eintrag anklicken um zu diesem Zeitpunkt im Verlauf zurückzukehren</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation>[wiederholen] </translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation>[rückgängig machen] </translation>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Count</source>
         <translation>Anzahl</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <source>Set</source>
         <translation>Festlegen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="209"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="211"/>
         <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="src/deck/deck_list_model.cpp" line="205"/>
         <source>Card</source>
         <translation>Karte</translation>
     </message>
@@ -1530,12 +1416,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/deck/deck_loader.cpp" line="23"/>
         <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/deck/deck_loader.cpp" line="23"/>
         <source>All files (*.*)</source>
         <translation>Alle Dateien (*.*)</translation>
     </message>
@@ -1543,17 +1429,17 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation>Modus: Exakte Übereinstimmung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation>Modus: Enthält</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation>Farbidentitätsfiltermodus (UND/ODER/NICHT Verknüpfungen der Filter)</translation>
     </message>
@@ -1561,7 +1447,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation>Tags bearbeiten ...</translation>
     </message>
@@ -1569,62 +1455,62 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation>Decktagsmanager</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>Verwalte Decktags. Wähle Tags nach Bedarf aus oder füge neue hinzu:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Neuen Tag hinzufügen (bspw. Aggro)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation>Tag hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation>Tags filtern...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation>Standardtags bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation>Ungültige Eingabe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation>Tagname kann nicht leer sein!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation>Tag duplizieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation>Dieser Tag existiert bereits.</translation>
     </message>
@@ -1632,166 +1518,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
         <source>Delete failed</source>
         <translation>Löschen fehlgeschlagen</translation>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation>Deck umbenennen von &quot;%1&quot; zu &quot;%2&quot;</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation>Kommentare aktualisiert (davor %1 Zeichen, jetzt %2 Zeichen)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation>Bannerkarte setzen als %1 (%2)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation>Tags geändert</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation>Format setzen zu %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation>(%1): %2 (%3) %4 hinzugefügt</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Added</source>
-        <translation>Hinzugefügt</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation>Entfernt</translation>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="24"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="36"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="36"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>Der Server hat eine ungültige Antwort geliefert.</translation>
     </message>
@@ -1799,75 +1627,76 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="123"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Load deck...</source>
         <translation>Deck laden...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="124"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Load remote deck...</source>
         <translation>Deck vom Server laden...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
         <source>Load from clipboard...</source>
         <translation>Aus der Zwischenablage laden...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
         <source>Load from website...</source>
         <translation>Von Internetseite laden....</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
         <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation>Deck entladen</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
         <source>Ready to start</source>
         <translation>Bereit zum Start</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
         <source>Force start</source>
         <translation>Zwangsstart</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
         <source>Sideboard unlocked</source>
         <translation>Sideboard entsperrt</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
         <source>Sideboard locked</source>
         <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="272"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
         <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="272"/>
         <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="284"/>
         <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="347"/>
         <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="349"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -1875,12 +1704,12 @@ Dies wirft alle nicht bereiten Spieler aus dem Spiel.</translation>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation>Deckformatkonvertierung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
@@ -1889,7 +1718,7 @@ Tags können nur zu Decks im .cod Format hinzugefügt werden.
 Möchten sie das Deck ins .cod Format konvertieren?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation>Auswahl speichern und automatisch in der Zukunft anwenden</translation>
     </message>
@@ -1897,148 +1726,148 @@ Möchten sie das Deck ins .cod Format konvertieren?</translation>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Lade herunter...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Bekannte Hosts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation>Den derzeit gespeicherten Server löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Aktualisiere die Serverliste der bekannten öffentlichen Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Neuer Host</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Server:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>Spieler&amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;asswort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>Passwort &amp;speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>a&amp;utomatisch verbinden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Automatisch mit dem letzten Login verbinden, wenn sich Cockatrice öffnet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>Falls Probleme mit der Verbindung oder Registrierung bestehen, kontaktieren Sie das Personal für Hilfe!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Webseite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Passwort zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation>Passwort vergessen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Verbinden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>Serverkontakt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Verbinde zum Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>Server URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>Kommunikationsport</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>Einzigartiger Servername</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Verbindungswarnung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>Sie müssen Ihr neues Verbindungsprofil benennen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Verbindungswarnung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Der Spielername kann nicht leer sein.</translation>
     </message>
@@ -2046,122 +1875,117 @@ Möchten sie das Deck ins .cod Format konvertieren?</translation>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Einstellungen speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Beschreibung:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>&amp;Spieler:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>Allgemeines</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Spieltyp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Passwort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Nur &amp;Freunde können teilnehmen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Nur &amp;registrierte Benutzer können teilnehmen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Teilnahmebedingungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>Zuschauer erlauben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Zuschauer benötigen das Passwort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Zuschauer können &amp;chatten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Zuschauer sehen die Hände</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>Spiel als Zuschauer erstellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Zuschauer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation>Anfangslebenspunktzahl</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="105"/>
         <source>Open decklists in lobby</source>
         <translation>Offene Decklisten in Lobby</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation>Spiel als Richter erstellen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="114"/>
         <source>Game setup options</source>
         <translation>Spielaufsetzungsoptionen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="165"/>
         <source>&amp;Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="171"/>
         <source>Create game</source>
         <translation>Spiel erstellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="217"/>
         <source>Game information</source>
         <translation>&amp;Spielinformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="306"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="306"/>
         <source>Server error.</source>
         <translation>Serverfehler.</translation>
     </message>
@@ -2169,97 +1993,97 @@ Möchten sie das Deck ins .cod Format konvertieren?</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Name:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Spielstein</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Farbe:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>weiß</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>blau</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>schwarz</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>rot</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>grün</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>mehrfarbig</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>farblos</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;Kampfwerte:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Hinweis:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>Spielstein &amp;zerstören, wenn er das Spielfeld verlässt</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation>Verdeckt erstellen (versteckt nur den Namen)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Spielstein-Daten</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>&amp;Alle möglichen Spielsteine zeigen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Spielsteine dieses &amp;Decks zeigen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Spielstein aus Liste auswählen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Spielstein erstellen</translation>
     </message>
@@ -2267,53 +2091,53 @@ Möchten sie das Deck ins .cod Format konvertieren?</translation>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation>Tags bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation>Bestätigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation>Tag eingeben und Eingabetaste drücken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation>✖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation>Ungültige Eingabe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation>Tagname kann nicht leer sein!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation>Tag duplizieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation>Dieser Tag existiert bereits</translation>
     </message>
@@ -2321,40 +2145,40 @@ Möchten sie das Deck ins .cod Format konvertieren?</translation>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Kein Bild gewählt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Um Ihren Avatar zu wechseln, wählen Sie ein neues Bild.
 Um Ihren derzeitigen Avatar zu entfernen, bestätigen Sie, ohne ein neues Bild zu wählen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Durchsuchen...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Avatar wechseln</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Bild öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Bild-Dateien (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Ungültiges Bild gewählt.</translation>
     </message>
@@ -2362,17 +2186,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation>Ungültige Deckliste.</translation>
     </message>
@@ -2380,38 +2204,38 @@ Um Ihren derzeitigen Avatar zu entfernen, bestätigen Sie, ohne ein neues Bild z
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Altes Passwort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Neues Passwort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Bestätige neues Passwort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Passwort ändern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Das Passwort ist zu kurz.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Die neuen Passwörter stimmen nicht überein.</translation>
     </message>
@@ -2419,93 +2243,93 @@ Um Ihren derzeitigen Avatar zu entfernen, bestätigen Sie, ohne ein neues Bild z
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Farbe:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>weiß</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>blau</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>schwarz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>rot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>grün</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>mehrfarbig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>farblos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;Kampfwerte:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Hinweis:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Spielstein-Daten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Spielstein hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Spielstein entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>Benutzerdefinierte Spielsteine bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Bitte geben Sie den Namen des Spielsteins ein:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>Es existiert bereits eine Karte oder ein Spielstein mit dem gewählten Namen.
@@ -2515,27 +2339,27 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>E-Mail:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Land:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Undefiniert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Echter Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Benutzerprofil bearbeiten</translation>
     </message>
@@ -2543,143 +2367,142 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>keine Begrenzung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5 Minuten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10 Minuten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30 Minuten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1 Stunde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2 Stunden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>„Nur Freunde“ Spiele ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation>Volle Spiele ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation>Bereits begonnene Spiele ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation>Passwortgeschützte Spiele ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>Spiele von „Ignorierten Benutzern“ ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation>Nicht von Freunden erstellte Spiele verstecken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="43"/>
         <source>Hide games with forced open decklists</source>
         <translation>Spiele mit erzwungenen offenen Decklisten verstecken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="51"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Neuer als:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="56"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Spielbeschreibung:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="60"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Name des Erstellers:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="70"/>
         <source>General</source>
         <translation>Allgemeines</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="86"/>
         <source>&amp;Game types</source>
         <translation>Spiel&amp;typen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="91"/>
         <source>at &amp;least:</source>
         <translation>&amp;mindestens:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="98"/>
         <source>at &amp;most:</source>
         <translation>&amp;höchstens:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="111"/>
         <source>Maximum player count</source>
         <translation>Maximale Spielerzahl</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="123"/>
         <source>Restrictions</source>
         <translation>Einschränkungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Zeige Spiele nur, wenn &amp;Zuschauer erlaubt sind</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Zeige für Zuschauer passwo&amp;rtgeschützte Spiele</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="133"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Zeige nur, wenn Zuschauer den &amp;Chat nutzen können</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="135"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Zeige nur, wenn Zuschauer die &amp;Hände sehen können</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="145"/>
         <source>Spectators</source>
         <translation>Zuschauer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="178"/>
         <source>Filter games</source>
         <translation>Spiele filtern</translation>
     </message>
@@ -2687,52 +2510,52 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation>Setze Passwortherausforderungswarnung zurück</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Ein Problem ist aufgetreten. Bitte erneut ein neues Passwort anfordern.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation>Gebe die Informationen des Servers und Kontos, für das ein neues Passwort angefordert werden soll, an.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>Spieler&amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>E-Mail:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation>Setze Passwortherausforderung zurück</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation>Setze Passwortherausforderungsfehler zurück</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>Die E-Mail-Adresse kann nicht leer sein.</translation>
     </message>
@@ -2740,37 +2563,37 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation>Gebe die Informationen des Servers, für den ein neues Passwort angefordert werden soll, an.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>Spieler&amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation>Passwortrücksetzungsanfrage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation>Passwortrücksetzungsfehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Der Spielername kann nicht leer sein.</translation>
     </message>
@@ -2778,86 +2601,86 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation>Passwortrücksetzungswarnung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Ein Problem ist aufgetreten. Bitte erneut ein neues Passwort anfordern.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation>Gebe den erhaltenen Token und das neue Passwort ein, um das neue Passwort zu setzen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>Spieler&amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Spielstein:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Neues Passwort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Passwort zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Der Spielername kann nicht leer sein.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation>Passwortrücksetzungsfehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>Der Spielstein kann nicht leer sein.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>Das neue Passwort kann nicht leer sein.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation>Das Passwort ist zu kurz.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>Die Passwörter stimmen nicht überein.</translation>
     </message>
@@ -2865,7 +2688,7 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation>Deck laden</translation>
     </message>
@@ -2873,17 +2696,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Ungültige Deckliste.</translation>
     </message>
@@ -2891,45 +2714,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/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
+        <location filename="src/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
+        <location filename="src/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
         <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/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2949,78 +2772,45 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Deck laden</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation 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/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation>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/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation>Basilisk</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation>Ungültiger Filter</translation>
     </message>
@@ -3028,92 +2818,92 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Geben Sie Ihre Informationen und die Informationen des Servers, bei dem Sie sich registrieren wollen, an.
 Die E-Mail-Adresse wird zur Accountverifikation genutzt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>Spieler&amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;asswort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Passwort (Wiederholung)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>E-Mail:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>E-Mail (Wiederholung)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Land:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Undefiniert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Echter Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Auf Server registrieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Registrierungswarnung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>Das Passwort ist zu kurz.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Ihre Passwörter stimmen nicht überein, bitte versuchen Sie es erneut.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Ihre Mailadressen stimmen nicht überein, bitte versuchen Sie es erneut.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Der Spielername kann nicht leer sein.</translation>
     </message>
@@ -3121,17 +2911,17 @@ Die E-Mail-Adresse wird zur Accountverifikation genutzt.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation>Anzahl der Seiten:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation>Anzahl der Würfel:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation>Würfeln</translation>
     </message>
@@ -3139,55 +2929,40 @@ Die E-Mail-Adresse wird zur Accountverifikation genutzt.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation>Ungeänderte Karten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation>Geänderte Karten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation>Sets auswählen, um sie zu aktivieren. Per Drag-and-Drop kann die Reihenfolge und damit die Priorität geändert werden. Karten verwenden die Druckversion des aktivierten Sets mit der höchsten Priorität.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation>Alle Setinformationen löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation>Alle auf bevorzugt setzen</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation>Drucke in Masse modifizieren.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation>Alle Druckinformation gelöscht.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation>Alle Drucke auf bevorzugt setzen.</translation>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1823"/>
         <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/dialogs/dlg_settings.cpp" line="1831"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3204,7 +2979,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/dialogs/dlg_settings.cpp" line="1837"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3221,7 +2996,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/dialogs/dlg_settings.cpp" line="1843"/>
         <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 +3009,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/dialogs/dlg_settings.cpp" line="1849"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3243,7 +3018,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/dialogs/dlg_settings.cpp" line="1853"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3252,7 +3027,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/dialogs/dlg_settings.cpp" line="1857"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3265,59 +3040,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/dialogs/dlg_settings.cpp" line="1865"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1885"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <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/dialogs/dlg_settings.cpp" line="1886"/>
         <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/dialogs/dlg_settings.cpp" line="1898"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1900"/>
         <source>General</source>
         <translation>Allgemeines</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1901"/>
         <source>Appearance</source>
         <translation>Erscheinungsbild</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1902"/>
         <source>User Interface</source>
         <translation>Benutzeroberfläche</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1903"/>
         <source>Card Sources</source>
         <translation>Kartenquellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1904"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1905"/>
         <source>Sound</source>
         <translation>Töne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1906"/>
         <source>Shortcuts</source>
         <translation>Tastaturkürzel</translation>
     </message>
@@ -3325,12 +3100,12 @@ Möchten Sie die Einstellung des Datenbankspeicherorts ändern?</translation>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation>Kartenaktualisierungsüberprüfung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/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>
@@ -3339,27 +3114,27 @@ Bitte wählen Sie aus, wie der Kartendatenbankaktualisierer ausgeführt werden s
 Sie können das Verhalten jederzeit im &quot;Allgemein&quot;-Tab der Einstellungen ändern.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation>Im Vordergrund ausführen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation>Im Hintergrund ausführen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation>Immer im Hintergrund ausführen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation>Nicht erneut fragen und nicht ausführen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation>Dieses Mal nicht ausführen</translation>
     </message>
@@ -3367,17 +3142,17 @@ Sie können das Verhalten jederzeit im &quot;Allgemein&quot;-Tab der Einstellung
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>Vor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>Zurück</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Tipp des Tages</translation>
     </message>
@@ -3385,166 +3160,170 @@ Sie können das Verhalten jederzeit im &quot;Allgemein&quot;-Tab der Einstellung
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Momentaner Veröffentlichungskanal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Neu installieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Download abbrechen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Downloadseite öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation>Auf Clientaktualisierungen prüfen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>Ihre Version von Cockatrice hat keine SSL-Unterstützung, dadurch können Sie keine Aktualisierungen automatisch herunterladen!
 Bitte besuchen Sie die Downloadseite, um Cockatrice manuell zu aktualisieren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation>Lade Aktualisierung herunter: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Suche nach Aktualisierungen...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Suche nach Aktualisierungen abgeschlossen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Keine Aktualisierung verfügbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice ist aktuell!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>Sie verwenden bereits die aktuellste Version des gewählten Veröffentlichungskanals.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Momentane Version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Ausgewählter Veröffentlichungskanal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Aktualisierung verfügbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Eine neue Cockatrice-Version ist verfügbar!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Neue Version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>Veröffentlicht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Änderungsprotokoll</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Möchten Sie jetzt aktualisieren?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation>Leider hat der automatische Updater keinen kompatiblen Download gefunden.
 Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation>Bitte prüfen Sie die &lt;a href=&apos;%1&apos;&gt;Veröffentlichungsseite&lt;/a&gt; auf unserer Github-Seite und laden Sie die Version für Ihr Betriebssystem herunter.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Aktualisierungsfehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Während der Suche nach Aktualisierungen ist ein Fehler aufgetreten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Während des Herunterladens der Aktualisierung ist ein Fehler aufgetreten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Installiere...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice kann das Installationsprogramm nicht öffnen. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Versuchen Sie manuell zu aktualisieren, indem Sie Cockatrice beenden und das Installationsprogramm aufrufen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>Downloadverzeichnis</translation>
     </message>
@@ -3552,162 +3331,30 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Lösche den Log beim Schließen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation>In die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Fehlerprotokoll</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation>Zieh-Wahrscheinlichkeitseinstellungen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation>Kriterien:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation>Kartenname</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation>Untertyp</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation>Manawert</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation>Genauheit:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation>mindestens</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation>genau</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation>Menge (N):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation>Karten die gezogen wurden (M):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation>Karten</translation>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Odds (%)</source>
-        <translation>Wahrscheinlichkeit (%)</translation>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/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>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation>%1% von %2 Decks</translation>
     </message>
@@ -3715,47 +3362,47 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <translation>Card Hoarder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <translation>Card Kingdom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <translation>Card Market</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <translation>Von Angesicht zu Angesicht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <translation>Manapool</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <translation>MTG Stocks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <translation>Scg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <translation>Tcgl</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation>Tcgplayer</translation>
     </message>
@@ -3763,44 +3410,38 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation>%1% Synergie</translation>
     </message>
 </context>
 <context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation>Spielwechsler</translation>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <source>Combos</source>
+        <translation>Kombos</translation>
     </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <source>Average Deck</source>
+        <translation>Durchschnittliches Deck</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation>Game Changer</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
         <source>Budget</source>
         <translation>Budget</translation>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
-        <source>Combos</source>
-        <translation>Kombos</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
-        <source>Average Deck</source>
-        <translation>Durchschnittliches Deck</translation>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation>Salz:</translation>
     </message>
@@ -3816,22 +3457,22 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation>Löschen bestätigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation>Sind Sie sicher, dass Sie den Filter &apos;%1&apos; löschen wollen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation>Löschen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation>Löschen des Filters &apos;%1&apos; fehlgeschlagen.</translation>
     </message>
@@ -3839,22 +3480,22 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
+        <location filename="src/game/game_event_handler.cpp" line="406"/>
         <source>kicked by game host or moderator</source>
         <translation>Von Spielhost oder Moderator gekickt</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
+        <location filename="src/game/game_event_handler.cpp" line="409"/>
         <source>player left the game</source>
         <translation>Spieler hat das Spiel verlassen</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
+        <location filename="src/game/game_event_handler.cpp" line="412"/>
         <source>player disconnected from server</source>
         <translation>Spieler hat die Verbindung zum Server getrennt</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
+        <location filename="src/game/game_event_handler.cpp" line="416"/>
         <source>reason unknown</source>
         <translation>Grund unbekannt</translation>
     </message>
@@ -3862,279 +3503,226 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="221"/>
+        <location filename="src/game/game_selector.cpp" line="224"/>
+        <location filename="src/game/game_selector.cpp" line="227"/>
+        <location filename="src/game/game_selector.cpp" line="230"/>
+        <location filename="src/game/game_selector.cpp" line="233"/>
+        <location filename="src/game/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="320"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="221"/>
         <source>Please join the appropriate room first.</source>
         <translation>Bitte betreten Sie erst den entsprechenden Raum.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="224"/>
         <source>Wrong password.</source>
         <translation>Falsches Passwort.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="227"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>In diesem Spiel sind keine Zuschauer zugelassen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="230"/>
         <source>The game is already full.</source>
         <translation>Das Spiel ist bereits voll.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="233"/>
         <source>The game does not exist any more.</source>
         <translation>Dieses Spiel gibt es nicht mehr.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="236"/>
         <source>This game is only open to registered users.</source>
         <translation>Dieses Spiel kann nur von registrierten Benutzern betreten werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="239"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Dieses Spiel kann nur von Freunden des Erstellers betreten werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="242"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Der Ersteller dieses Spiels ignoriert Sie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="265"/>
         <source>Join Game</source>
         <translation>Spiel beitreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="268"/>
         <source>Spectate Game</source>
         <translation>Spiel beobachten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="271"/>
         <source>Game Information</source>
         <translation>Spielinformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation>Spiel als Richter beitreten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation>Spiel als Richter zuschauen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="305"/>
         <source>Join game</source>
         <translation>Spiel beitreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="305"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="320"/>
         <source>Please join the respective room first.</source>
         <translation>Bitte betreten Sie zuerst den entsprechenden Raum.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>&amp;Filter games</source>
         <translation>Spiele &amp;filtern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="364"/>
         <source>C&amp;lear filter</source>
         <translation>Filter &amp;zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>C&amp;reate</source>
         <translation>E&amp;rstellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>&amp;Join</source>
         <translation>&amp;Beitreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation>Als Richter beitreten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="368"/>
         <source>J&amp;oin as spectator</source>
         <translation>Als Zuschauer beitreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation>Als Richter-Zuschauer beitreten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="389"/>
         <source>Games shown: %1 / %2</source>
         <translation>Angezeigte Spiele: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="391"/>
         <source>Games</source>
         <translation>Spiele</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation>Alle Typen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation>Nach Spielnamen filtern...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation>Nach Spieltyp/Format filtern</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation>Nicht von Freunden erstellte Spiele ausblenden</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation>Volle Spiele ausblenden</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation>Gestartete Spiele ausblenden</translation>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 Tag</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 h</numerusform><numerusform>%1%2 h</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation>neu</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>nur Freunde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>nur reg. Benutzer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
+        <location filename="src/game/games_model.cpp" line="157"/>
         <source>open decklists</source>
         <translation>Offene Decklisten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can chat</source>
         <translation>können chatten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="191"/>
         <source>see hands</source>
         <translation>sehen Hände</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="196"/>
         <source>can see hands</source>
         <translation>können Hände sehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="201"/>
         <source>not allowed</source>
         <translation>nicht erlaubt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="219"/>
         <source>Room</source>
         <translation>Raum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="223"/>
         <source>Age</source>
         <translation>Alter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Creator</source>
         <translation>Ersteller</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="237"/>
         <source>Restrictions</source>
         <translation>Bedingungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="241"/>
         <source>Players</source>
         <translation>Spieler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="249"/>
         <source>Spectators</source>
         <translation>Zuschauer</translation>
     </message>
@@ -4142,143 +3730,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/dialogs/dlg_settings.cpp" line="392"/>
         <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/dialogs/dlg_settings.cpp" line="199"/>
         <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/dialogs/dlg_settings.cpp" line="274"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="284"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="294"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="324"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="334"/>
         <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/dialogs/dlg_settings.cpp" line="362"/>
         <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/dialogs/dlg_settings.cpp" line="363"/>
         <source>Language:</source>
         <translation>Sprache:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="366"/>
         <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/dialogs/dlg_settings.cpp" line="368"/>
         <source>Paths</source>
         <translation>Pfade</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="371"/>
         <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/dialogs/dlg_settings.cpp" line="372"/>
         <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/dialogs/dlg_settings.cpp" line="373"/>
         <source>Filters directory:</source>
         <translation>Filterverzeichnis:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="374"/>
         <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/dialogs/dlg_settings.cpp" line="375"/>
         <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/dialogs/dlg_settings.cpp" line="376"/>
         <source>Card database:</source>
         <translation>Kartendatenbank:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="377"/>
         <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/dialogs/dlg_settings.cpp" line="378"/>
         <source>Token database:</source>
         <translation>Spielsteindatenbank:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="379"/>
         <source>Update channel</source>
         <translation>Aktualisierungskanal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="381"/>
         <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/dialogs/dlg_settings.cpp" line="382"/>
         <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/dialogs/dlg_settings.cpp" line="384"/>
         <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/dialogs/dlg_settings.cpp" line="386"/>
         <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/dialogs/dlg_settings.cpp" line="387"/>
         <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/dialogs/dlg_settings.cpp" line="388"/>
         <source> days</source>
         <translation>Tage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="389"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
         <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/dialogs/dlg_settings.cpp" line="391"/>
         <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/dialogs/dlg_settings.cpp" line="400"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation>Letzte Aktualisierungsprüfung am %1 (vor %2 Tagen)</translation>
     </message>
@@ -4286,47 +3874,42 @@ 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="66"/>
         <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="68"/>
         <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="71"/>
         <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="72"/>
         <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="73"/>
         <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"/>
-        <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="74"/>
         <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="75"/>
         <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="76"/>
         <source>Reveal random card to...</source>
         <translation>Zufällige Karte vorzeigen für ...</translation>
     </message>
@@ -4334,88 +3917,57 @@ 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="60"/>
         <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="63"/>
         <source>&amp;View hand</source>
         <translation>&amp;Hand ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation>Hand nach ... sortieren</translation>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="64"/>
+        <source>&amp;Sort hand</source>
+        <translation>&amp;Hand sortieren</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation>Name</translation>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="65"/>
+        <source>Take &amp;mulligan</source>
+        <translation>Mulligan nehmen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation>Manawert</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <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"/>
-        <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"/>
-        <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="67"/>
         <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="68"/>
         <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="69"/>
         <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="70"/>
         <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="71"/>
         <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="73"/>
         <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"/>
-        <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="74"/>
         <source>Reveal r&amp;andom card to...</source>
         <translation>Zufällige Karten an ... vorzeigen</translation>
     </message>
@@ -4423,52 +3975,47 @@ 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/client/ui/widgets/general/home_widget.cpp" line="183"/>
         <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/client/ui/widgets/general/home_widget.cpp" line="187"/>
         <source>Browse Decks</source>
         <translation>Decks durchsuchen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="191"/>
         <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/client/ui/widgets/general/home_widget.cpp" line="195"/>
         <source>Browse EDHRec</source>
         <translation>EDHRec durchsuchen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation>Archidekt durchsuchen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="198"/>
         <source>View Replays</source>
         <translation>Wiederholung ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="202"/>
         <source>Quit</source>
         <translation>Verlassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="217"/>
         <source>Connecting...</source>
         <translation>Verbinden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="221"/>
         <source>Connect</source>
         <translation>Verbinden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
+        <location filename="src/client/ui/widgets/general/home_widget.cpp" line="227"/>
         <source>Play</source>
         <translation>Spielen</translation>
     </message>
@@ -4476,275 +4023,239 @@ 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="177"/>
         <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="180"/>
         <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="181"/>
         <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="182"/>
         <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="183"/>
         <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="184"/>
         <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="185"/>
         <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="186"/>
         <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="187"/>
         <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="188"/>
         <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="189"/>
         <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="190"/>
         <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="192"/>
         <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="193"/>
         <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="194"/>
         <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="196"/>
         <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="198"/>
         <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="199"/>
         <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="200"/>
         <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="201"/>
         <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="202"/>
         <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="203"/>
         <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 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="204"/>
         <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 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="205"/>
         <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="206"/>
         <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="208"/>
         <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="209"/>
         <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="210"/>
         <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="211"/>
         <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="212"/>
         <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="213"/>
         <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="214"/>
         <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 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="215"/>
         <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 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="216"/>
         <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="217"/>
         <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"/>
-        <source>&amp;All players</source>
-        <translation>&amp;Alle Spieler</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <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"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation>Anzahl der Karten: (max. %1)</translation>
-    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>Der Server hat seine maximale Benutzeranzahl erreicht. Bitte versuchen Sie es später noch einmal.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Es gibt zu viele gleichzeitige Verbindungen von Ihrer Adresse.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Gebannt von einem Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Voraussichtliches Ende: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>Dieser Bann ist unbefristet.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Planmäßige Serverabschaltung.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Ungültiger Benutzername.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>Sie wurden abgemeldet, da Sie sich an einer anderen Stelle angemeldet haben.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Verbindung geschlossen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>Der Server hat Ihre Verbindung beendet.
 Grund: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4755,574 +4266,584 @@ Alle laufenden Spiele werden beendet.
 Grund für die Abschaltung: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Planmäßige Serverabschaltung</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Erfolgreich</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Registrierung angenommen.
 Login läuft.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Accountaktivierung angenommen.
 Login läuft.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Spieleranzahl</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Bitte die Spieleranzahl eingeben:</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Spieler %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Aufgezeichnetes Spiel laden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>Über Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice Webseite</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Projektmanager:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>frühere Projektmanager:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>Entwickler:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>unsere Entwickler</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>Hilf bei der Entwicklung!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Übersetzer:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>Unsere Übersetzer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>Hilf bei der Übersetzung!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Unterstützung:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Problem melden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Fehlersuche</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Server Zeitüberschreitung</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>Ihrem Client scheinen Funktionen, die der Server für die Verbindung benötigt, zu fehlen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>Um Ihren Client zu aktualisieren, gehen Sie auf &apos;Hilfe -&gt; Auf Clientaktualisierungen prüfen&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Falscher Benutzername oder Passwort. Bitte überprüfe deine Login Informationen und versuche es erneut.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Es gibt bereits eine aktive Verbindung mit diesem Benutzernamen.
 Bitte schließen Sie diese Verbindung zuerst und versuchen Sie es dann erneut.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Sie sind gebannt bis: %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Sie sind auf unbestimmte Zeit gebannt.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>Diese Server benötigt eine Benutzerregistrierung. Möchten Sie sich jetzt registrieren?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation>Dieser Server verlangt Client-IDs. Entweder das Erzeugen der ID schlägt fehl oder Sie verwenden einen modifizierten Client.
 Bitte starten Sie ihren Client neu, um es erneut zu versuchen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>Ein interner Fehler ist aufgetreten, bitte starten Sie Cockatrice neu, bevor Sie es erneut versuchen.
 Falls der Fehler erneut auftritt, versichern Sie sich, dass Sie die neuste Softwareversion verwenden, und kontaktieren Sie falls nötig die Softwareentwickler.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Accountaktivierung</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>Ihr Account wurde noch nicht aktiviert.
 Sie müssen den Aktivierungstoken aus der Aktivierungsemail verwenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>Server voll</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Unbekannter Login-Fehler: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 Dies bedeutet normalerweise, dass Ihre Clientversion veraltet ist und der Server eine Antwort geschickt hat, die Ihr Client nicht versteht.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>Ihr Benutzername muss diesen Regeln entsprechen:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>%1 - %2 Zeichen lang</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>kann %1 Kleinbuchstaben beinhalten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>NICHT</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>kann %1 Großbuchstaben beinhalten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>kann %1 Zahlen beinhalten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>kann folgende Sonderzeichen beinhalten: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>Das erste Zeichen kann %1 ein Sonderzeichen sein</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation>Keine inakzeptable Sprache wie durch folgende Serverregeln festgelegt:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>kann keines der folgenden Wörter enthalten: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>kann keinem der folgenden Ausdrücke entsprechen: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>Sie können nur A-Z, a-z, 0-9, _, ., und - in Ihrem Benutzernamen verwenden.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>Registrierung verweigert</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>Momentan ist die Registrierung auf diesem Server deaktiviert</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>Es existiert bereits ein Account mit dem gleichen Benutzernamen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>Es ist erforderlich, eine korrekte Emailadresse während der Registrierung anzugeben.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>Scheinbar versuchen Sie, ein neues Benutzerkonto auf diesem Server zu registrieren, obwohl Sie bereits ein Konto mit der verwendeten E-Mailadresse haben. Dieser Server beschränkt die Anzahl an Benutzerkonten, die ein Nutzer pro E-Mailadresse registrieren kann. Bitte kontaktieren Sie den Server-Betreiber für weitere Hilfe oder um Ihre Zugangsinformationen zu erhalten.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>Passwort zu kurz.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>Registrierung aufgrund eines technischen Problems des Servers fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation>Verbindung zum Server verloren.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>Unbekannter Registrierungsfehler: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>Accountaktivierung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Netzwerkfehler: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>Sie versuchen sich an einem veralteten Server anzumelden. Bitte verwenden Sie eine ältere Cockatrice-Version oder melden Sie sich an einem aktuellen Server an.
 Lokale Version ist %1, Serverversion ist %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>Ihr Cockatrice-Client ist veraltet. Bitte laden Sie sich die neueste Version herunter.
 Lokale Version ist %1, Serverversion ist %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Verbinde zu %1...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>Registrierung bei %1 als %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>nicht verbunden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Verbunden, Anmeldung bei %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation>Fordere vergessenes Password von %1 als %2 an...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Verbinden...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>Verbindung &amp;trennen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>&amp;Lokales Spiel starten...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Aufgezeichnetes Spiel abspielen...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Vollbild</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>Auf Server &amp;registrieren...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation>Passwort wiede&amp;rherstellen...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Einstellungen...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>Aktionen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>K&amp;artendatenbank</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation>Editionen &amp;verwalten...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Bearbeite benutzerdefinierte Spiels&amp;teine...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>Öffne den Ordner für benutzerdefinierte Kartenbilder</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>Öffne den Ordner für benutzerdefinierte Sets</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>Benutzerdefinierte Karten/Sets hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation>Neu laden der Kartendatenbank</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Über Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Tipp des Tages</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>Auf Clientaktualisierungen prüfen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation>Nach Kartenaktualisierungen suchen...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation>Prüfe auf Kartenaktualisierungen (automatisch)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation>Statuszeile anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation>Fehlerprotokoll ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation>Einstellungsordner öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation>Ein-/Ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>Neue Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice wurde installiert</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>Kartendatenbank</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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 +4852,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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Einstellungen öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <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/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5364,17 +4885,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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>Editionen ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Willkommen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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 +4904,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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <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/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation>Unbekannter Fehler aufgetreten.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,863 +4973,674 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation>Lade Sets/Karten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <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/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation>Passwort zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <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>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation>Mana-Basis Konfiguration</translation>
-    </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>Anzeigetyp:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation>Torte</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation>Leiste</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation>kombinierteLeiste</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation>Farben filtern (optional):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </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/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation>Manabasis</translation>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation>Gruppieren nach:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation>Farbe</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation>Untertyp</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation>Stärke</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation>Widerstandskraft</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation>Filter (optional):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation>Anzeigen der Hauptleistenreihe</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation>Anzeige der per-Kategoriereihen</translation>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation>Manakurve</translation>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation>Anzeigetyp:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation>Torte</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation>Leiste</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation>kombinierteLeiste</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation>Farben filtern (optional):</translation>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation>Manahingabe</translation>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation>Oberster Anzeigetyp:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation>Torte</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation>Leiste</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation>Farben:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation>Anzeige der per-Farbenreihen</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation>%1 Pips (%2 Karten)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation>%1 Mana (%2 Karten)</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation>Manaerzeugung + Hingabe </translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation>Manaverteilungseinstellungen</translation>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/message_log_widget.cpp" line="43"/>
         <source> from play</source>
         <translation>vom Spielfeld</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
+        <location filename="src/server/message_log_widget.cpp" line="45"/>
         <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/server/message_log_widget.cpp" line="47"/>
         <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/server/message_log_widget.cpp" line="49"/>
         <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/server/message_log_widget.cpp" line="54"/>
         <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/server/message_log_widget.cpp" line="56"/>
         <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/server/message_log_widget.cpp" line="61"/>
         <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/server/message_log_widget.cpp" line="63"/>
         <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/server/message_log_widget.cpp" line="69"/>
         <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/server/message_log_widget.cpp" line="71"/>
         <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/server/message_log_widget.cpp" line="76"/>
         <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/server/message_log_widget.cpp" line="78"/>
         <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/server/message_log_widget.cpp" line="83"/>
         <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/server/message_log_widget.cpp" line="85"/>
         <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/server/message_log_widget.cpp" line="89"/>
         <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/server/message_log_widget.cpp" line="91"/>
         <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/server/message_log_widget.cpp" line="93"/>
         <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/server/message_log_widget.cpp" line="119"/>
         <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/server/message_log_widget.cpp" line="120"/>
         <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/server/message_log_widget.cpp" line="127"/>
         <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/server/message_log_widget.cpp" line="128"/>
         <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/server/message_log_widget.cpp" line="135"/>
         <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/server/message_log_widget.cpp" line="146"/>
         <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/server/message_log_widget.cpp" line="155"/>
         <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/server/message_log_widget.cpp" line="165"/>
         <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/server/message_log_widget.cpp" line="169"/>
         <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/server/message_log_widget.cpp" line="185"/>
         <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/server/message_log_widget.cpp" line="188"/>
         <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/server/message_log_widget.cpp" line="193"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="206"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="216"/>
         <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/server/message_log_widget.cpp" line="222"/>
         <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/server/message_log_widget.cpp" line="236"/>
         <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/server/message_log_widget.cpp" line="238"/>
         <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/server/message_log_widget.cpp" line="249"/>
         <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/server/message_log_widget.cpp" line="251"/>
         <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/server/message_log_widget.cpp" line="261"/>
         <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/server/message_log_widget.cpp" line="296"/>
         <source>a card</source>
         <translation>eine Karte</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="313"/>
+        <location filename="src/server/message_log_widget.cpp" line="319"/>
         <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/server/message_log_widget.cpp" line="321"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="328"/>
         <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/server/message_log_widget.cpp" line="330"/>
         <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/server/message_log_widget.cpp" line="334"/>
         <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/server/message_log_widget.cpp" line="337"/>
         <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
+        <location filename="src/server/message_log_widget.cpp" line="340"/>
         <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="349"/>
+        <location filename="src/server/message_log_widget.cpp" line="343"/>
         <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/server/message_log_widget.cpp" line="363"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <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/server/message_log_widget.cpp" line="375"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="384"/>
         <source>bottom</source>
         <translation>untersten</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="384"/>
         <source>top</source>
         <translation>obersten</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="392"/>
         <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/server/message_log_widget.cpp" line="395"/>
         <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/server/message_log_widget.cpp" line="401"/>
         <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/server/message_log_widget.cpp" line="406"/>
         <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/server/message_log_widget.cpp" line="411"/>
         <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/server/message_log_widget.cpp" line="417"/>
         <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/server/message_log_widget.cpp" line="423"/>
         <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/server/message_log_widget.cpp" line="428"/>
         <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/server/message_log_widget.cpp" line="434"/>
         <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/server/message_log_widget.cpp" line="442"/>
         <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/server/message_log_widget.cpp" line="449"/>
         <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/server/message_log_widget.cpp" line="458"/>
         <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/server/message_log_widget.cpp" line="463"/>
         <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/server/message_log_widget.cpp" line="469"/>
         <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/server/message_log_widget.cpp" line="474"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="502"/>
         <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/server/message_log_widget.cpp" line="511"/>
         <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/server/message_log_widget.cpp" line="516"/>
         <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/server/message_log_widget.cpp" line="522"/>
         <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/server/message_log_widget.cpp" line="528"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="542"/>
         <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/server/message_log_widget.cpp" line="546"/>
         <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/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="559"/>
         <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/server/message_log_widget.cpp" line="566"/>
         <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/server/message_log_widget.cpp" line="568"/>
         <source>reversed</source>
         <translation>umgekehrt</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="568"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="576"/>
         <source>Heads</source>
         <translation>Kopf</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="576"/>
         <source>Tails</source>
         <translation>Zahl</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="577"/>
         <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/server/message_log_widget.cpp" line="581"/>
         <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/server/message_log_widget.cpp" line="588"/>
         <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/server/message_log_widget.cpp" line="598"/>
         <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/server/message_log_widget.cpp" line="626"/>
         <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/server/message_log_widget.cpp" line="632"/>
         <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/server/message_log_widget.cpp" line="643"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation><numerusform>%1 platziert %2 &quot;%3&quot; Zähler auf %4 (jetzt %5).</numerusform><numerusform>%1 platziert %2 &quot;%3&quot; Zähler auf %4 (jetzt %5).</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
+        <location filename="src/server/message_log_widget.cpp" line="645"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation><numerusform>%1 entfernt %2 &quot;%3&quot; Marke(n) von %4 (jetzt %5).</numerusform><numerusform>%1 entfernt %2 &quot;%3&quot; Zähler von %4 (jetzt %5).</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/server/message_log_widget.cpp" line="663"/>
         <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/server/message_log_widget.cpp" line="675"/>
         <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/server/message_log_widget.cpp" line="677"/>
         <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/server/message_log_widget.cpp" line="696"/>
         <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/server/message_log_widget.cpp" line="701"/>
         <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/server/message_log_widget.cpp" line="704"/>
         <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/server/message_log_widget.cpp" line="713"/>
         <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/server/message_log_widget.cpp" line="716"/>
         <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/server/message_log_widget.cpp" line="734"/>
         <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/server/message_log_widget.cpp" line="734"/>
         <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/server/message_log_widget.cpp" line="737"/>
         <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/server/message_log_widget.cpp" line="737"/>
         <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/server/message_log_widget.cpp" line="753"/>
         <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/server/message_log_widget.cpp" line="757"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="767"/>
         <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/server/message_log_widget.cpp" line="782"/>
         <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/server/message_log_widget.cpp" line="790"/>
         <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/server/message_log_widget.cpp" line="793"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 legt die zuletzt gezogene Karte zurück (%2)</translation>
     </message>
@@ -6316,110 +5648,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/dialogs/dlg_settings.cpp" line="1496"/>
         <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/dialogs/dlg_settings.cpp" line="1497"/>
         <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/dialogs/dlg_settings.cpp" line="1498"/>
         <source>Edit Message</source>
         <translation>Nachricht bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1499"/>
         <source>Remove Message</source>
         <translation>Nachricht entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1448"/>
         <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/dialogs/dlg_settings.cpp" line="1448"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1461"/>
         <source>Message:</source>
         <translation>Nachricht:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1461"/>
         <source>Edit message</source>
         <translation>Nachricht bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1479"/>
         <source>Chat settings</source>
         <translation>Chat Einstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1480"/>
         <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/dialogs/dlg_settings.cpp" line="1481"/>
         <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/dialogs/dlg_settings.cpp" line="1482"/>
         <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/dialogs/dlg_settings.cpp" line="1483"/>
         <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/dialogs/dlg_settings.cpp" line="1485"/>
         <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/dialogs/dlg_settings.cpp" line="1486"/>
         <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/dialogs/dlg_settings.cpp" line="1487"/>
         <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/dialogs/dlg_settings.cpp" line="1488"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1489"/>
         <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/dialogs/dlg_settings.cpp" line="1490"/>
         <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/dialogs/dlg_settings.cpp" line="1491"/>
         <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/dialogs/dlg_settings.cpp" line="1492"/>
         <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/dialogs/dlg_settings.cpp" line="1493"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1494"/>
         <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/dialogs/dlg_settings.cpp" line="1495"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Wörter durch Leerzeichen trennen, nur alphanumerische Zeichen</translation>
     </message>
@@ -6432,37 +5764,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 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;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>
@@ -6470,52 +5797,52 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/card/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation>Kartentyp</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/card/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation>Manawert</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/card/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation>Farbe(n)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/card/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation>Loyalität</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/card/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation>Hauptkartentyp</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/card/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation>Manakosten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/card/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation>S/W</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/card/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation>Seite</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/card/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation>Layout</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/card/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation>Farbidentität</translation>
     </message>
@@ -6523,17 +5850,17 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation>Karten, die sich überschneiden:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation>Prozentzahl der Überschneidungen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation>Richtung der Überschreitung:</translation>
     </message>
@@ -6541,62 +5868,62 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation>Unbekannte Phase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation>Enttappen</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation>Versorgung</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation>Ziehen</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation>Erste Hauptphase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation>Anfangssegment des Kampfes</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation>Angreifer deklarieren</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation>Blocker deklarieren</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation>Kampfschaden</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation>Ende des Kampfes</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation>Zweite Hauptphase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation>Ende/Aufräumen</translation>
     </message>
@@ -6604,57 +5931,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Ende-des-Zuges-Segment</translation>
     </message>
@@ -6662,7 +5989,7 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="269"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>de</translation>
@@ -6671,138 +5998,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="149"/>
         <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="150"/>
+        <location filename="src/game/player/player_actions.cpp" line="163"/>
+        <location filename="src/game/player/player_actions.cpp" line="236"/>
+        <location filename="src/game/player/player_actions.cpp" line="265"/>
+        <location filename="src/game/player/player_actions.cpp" line="299"/>
+        <location filename="src/game/player/player_actions.cpp" line="325"/>
+        <location filename="src/game/player/player_actions.cpp" line="397"/>
+        <location filename="src/game/player/player_actions.cpp" line="429"/>
+        <location filename="src/game/player/player_actions.cpp" line="601"/>
+        <location filename="src/game/player/player_actions.cpp" line="633"/>
+        <location filename="src/game/player/player_actions.cpp" line="750"/>
         <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="162"/>
         <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="235"/>
         <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="264"/>
         <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="298"/>
         <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="300"/>
         <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="324"/>
         <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="396"/>
+        <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="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"/>
+        <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="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"/>
+        <location filename="src/game/player/player_actions.cpp" line="600"/>
+        <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="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player_actions.cpp" line="632"/>
+        <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="644"/>
-        <source>Move bottom cards to %1</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="749"/>
         <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="854"/>
+        <location filename="src/game/player/player_actions.cpp" line="900"/>
         <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="1028"/>
         <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="1028"/>
+        <location filename="src/game/player/player_actions.cpp" line="1568"/>
         <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="1194"/>
         <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="1195"/>
         <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="1195"/>
         <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="1354"/>
         <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="1354"/>
         <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="1474"/>
         <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="1475"/>
         <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="1568"/>
         <source>Set counters</source>
         <translation>Zähler setzen</translation>
     </message>
@@ -6810,65 +6133,63 @@ 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="162"/>
+        <source>Reveal top cards of library</source>
+        <translation>Oberste Karten der Bibliothek vorzeigen</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/player_menu.cpp" line="163"/>
+        <source>Number of cards: (max. %1)</source>
+        <translation>Anzahl der Karten: (max. %1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/player_menu.cpp" line="211"/>
         <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="228"/>
         <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 type="unfinished"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="245"/>
+        <source>&amp;All players</source>
+        <translation>&amp;Alle Spieler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="249"/>
+        <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/client/ui/widgets/printing_selector/printing_selector.cpp" line="91"/>
         <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 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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="166"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="174"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="181"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="189"/>
         <source>Show Related cards</source>
         <translation>Zugehörige Karten anzeigen</translation>
     </message>
@@ -6876,7 +6197,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation>Suche nach Erweiterungsname oder Erweiterungskennzeichen</translation>
     </message>
@@ -6884,17 +6205,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation>Vorherige Karte im Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation>Massenauswahl</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation>Nächste Karte im Deck</translation>
     </message>
@@ -6902,40 +6223,32 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation>Alphabetisch</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation>Präferenz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>PtMenu</name>
     <message>
@@ -6997,37 +6310,37 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>Dienste</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>%1 ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>Andere ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>Alle anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>Schließe %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>Über %1</translation>
     </message>
@@ -7035,162 +6348,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatrice Kartendatenbank (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>Alle Dateien (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Aufgezeichnete Cockatrice-Spiele (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Hauptdeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Spielsteine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation>Existierende Datei überschreiben?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation>Alle speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation>Ja zu &amp;Allem</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation>&amp;Nein</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation>Nein zu Allem</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation>Erneut versuchen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation>Ignorieren</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation>Verwerfen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation>Anwenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation>Standard wiederherstellen</translation>
     </message>
@@ -7198,17 +6484,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Änderungsdatum</translation>
     </message>
@@ -7216,32 +6502,32 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>Spieler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>Behalten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>Startzeit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>Länge (Sekunden)</translation>
     </message>
@@ -7249,37 +6535,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;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>
@@ -7287,78 +6573,70 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Räume</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>Teil&amp;nehmen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Raum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>Berechtigungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Spieler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</source>
         <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SequenceEdit</name>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation>Wähle eine Aktion aus der Tabelle</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation>Gebe die für diese Aktion gewünschte Taste/Tastenkombination ein</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation>Ungültige Taste</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation>Tastenkürzel bereits in Verwendung durch:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation>Auf Standard zurücksetzen</translation>
     </message>
@@ -7366,27 +6644,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>Aktiviert</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>Editionsart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>Editionscode</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Langer Name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>Veröffentlichung</translation>
     </message>
@@ -7394,53 +6672,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/dialogs/dlg_settings.cpp" line="1671"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1694"/>
         <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/dialogs/dlg_settings.cpp" line="1672"/>
         <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/dialogs/dlg_settings.cpp" line="1679"/>
         <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/dialogs/dlg_settings.cpp" line="1680"/>
         <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/dialogs/dlg_settings.cpp" line="1689"/>
         <source>Section:</source>
         <translation>Abschnitt:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1690"/>
         <source>Action:</source>
         <translation>Aktion:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1691"/>
         <source>Shortcut:</source>
         <translation>Tastaturkürzel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1693"/>
         <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/dialogs/dlg_settings.cpp" line="1695"/>
         <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/dialogs/dlg_settings.cpp" line="1696"/>
         <source>Search by shortcut name</source>
         <translation>Suchen nach Name des Tastenkürzels</translation>
     </message>
@@ -7448,12 +6726,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Aktion</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Abkürzung</translation>
     </message>
@@ -7461,14 +6739,14 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Ihre Konfigurationsdatei enthielt ungültige Verknüpfungen.
 Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Die folgenden Verknüpfungen wurden auf den Standard gesetzt:
@@ -7478,17 +6756,17 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>G&amp;rund für die Abschaltung:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;Zeit bis zur Abschaltung (Minuten):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>Server abschalten</translation>
     </message>
@@ -7496,12 +6774,12 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
         <source>&amp;Sideboard</source>
         <translation>&amp;Nebendeck</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
+        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
         <source>&amp;View sideboard</source>
         <translation>&amp;Nebendeck ansehen</translation>
     </message>
@@ -7509,27 +6787,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/dialogs/dlg_settings.cpp" line="1573"/>
         <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/dialogs/dlg_settings.cpp" line="1574"/>
         <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/dialogs/dlg_settings.cpp" line="1575"/>
         <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/dialogs/dlg_settings.cpp" line="1576"/>
         <source>Sound settings</source>
         <translation>Toneinstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1577"/>
         <source>Master volume</source>
         <translation>Masterlautstärke</translation>
     </message>
@@ -7537,48 +6815,48 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation>Spoiler Saison ist beendet</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>spoiler.xml gelöscht. Bitte führe Oracle aus</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation>Spoiler Download fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation>Keine Internetverbindung</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation>Spoiler bereits aktuell</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation>Keine neuen Spoiler hinzugefügt</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation>Spoiler wurden aktualisiert!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation>Letzte Änderung:</translation>
     </message>
@@ -7586,27 +6864,27 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>Keine Antwort vom Veröffentlichungsaktualisierungsserver erhalten.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Ungültige Antwort vom Veröffentlichungsaktualisierungsserver erhalten.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>Keine Antwort vom Kennzeichnungsaktualisierungsserver.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Ungültige Antwort vom Kennzeichungsaktualisierungsserver.</translation>
     </message>
@@ -7614,17 +6892,17 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation>Zur Freundesliste hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation>Zur Liste ignorierter Benutzer hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation>Benutzerkonto</translation>
     </message>
@@ -7632,289 +6910,166 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>Server&amp;nachricht aktualisieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;Server abschalten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>Konfigu&amp;ration neuladen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Funktionen zur Serverwartung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation>Servermoderationsfunktionen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation>ID der Wiederholung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation>Zugang zur Wiederholung gewähren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation>Benutzername zur Aktivierung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation>Zwangsaktivierung des Benutzers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>&amp;Sperre aufheben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>Funktionen s&amp;perren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation>Erfolg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation>Zugang zur Wiederholung gewährt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation>Kein Zugang zur Freigabe der Wiederholung möglich. ID der Wiederholung ungültig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation>Kein Zugang zur Freigabe der Wiederholung möglich. Interner Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation>Benutzer erfolgreich freigeschaltet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation>Benutzer nicht freischaltbar. Benutzername ungültig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation>Benutzer nicht freischaltbar. Benutzer ist bereits freigeschaltet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation>Benutzer nicht freischaltbar. Interner Fehler</translation>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation>Aufsteigend.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation>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"/>
-        <source>Formats</source>
-        <translation>Formate</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation>Archidekt:</translation>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation>Karteninformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation>Kartendatenbank</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation>Auflage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>Sichtbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>Schwebend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <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/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Deck: %1</translation>
     </message>
@@ -7922,55 +7077,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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="142"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="304"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="306"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="307"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="313"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="310"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="314"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="317"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
         <source>Reset layout</source>
         <translation>Anordnung zurücksetzen</translation>
     </message>
@@ -7978,22 +7139,22 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation>Visuelle Deckansicht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation>Visuelle Datenbankanzeige</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation>Deckanalysen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation>Probehand</translation>
     </message>
@@ -8001,139 +7162,139 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>Lokales Dateisystem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Deckablage auf dem Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Im Deckeditor öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation>Deck oder Ordner umbenennen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Deck hochladen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Deck herunterladen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>Neuer Ordner</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation>Deckordner öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation>Lokalen Ordner umbenennen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation>Lokale Datei umbenennen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation>Neuer Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation>Umbenennen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation>Ungültige Deckdatei</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Decknamen eingeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>Diese Deckliste hat keinen Namen.
 Bitte geben Sie einen Namen ein:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Unbenanntes Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation>Hochladen des Decks zum Server fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>Lokale Datei löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Sind sie sicher, dass die ausgewählten Dateien gelöscht werden sollen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>Name für den neuen Ordner:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation>Deckablage</translation>
     </message>
@@ -8141,17 +7302,17 @@ Bitte geben Sie einen Namen ein:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation>Visuelle Deckablage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation>Deck an Stelle %1 konnte nicht geöffnet werden</translation>
     </message>
@@ -8159,7 +7320,7 @@ Bitte geben Sie einen Namen ein:</translation>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation>EDHREC:</translation>
     </message>
@@ -8167,224 +7328,229 @@ Bitte geben Sie einen Namen ein:</translation>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation>&amp;Karten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation>Beste Commander</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation>Nach Karte suchen...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation>Suche</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
         <source>EDHRec: </source>
+        <oldsource>EDHREC: </oldsource>
         <translation>EDHRec:</translation>
     </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/client/tabs/tab_game.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="887"/>
         <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/client/tabs/tab_game.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="279"/>
         <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/client/tabs/tab_game.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="345"/>
         <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/client/tabs/tab_game.cpp" line="283"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="343"/>
         <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/client/tabs/tab_game.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="344"/>
         <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/client/tabs/tab_game.cpp" line="286"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="357"/>
         <source>Replay Timeline</source>
         <translation>Zeitleiste der Aufzeichnung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="291"/>
         <source>&amp;Phases</source>
         <translation>&amp;Phasen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="294"/>
         <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/client/tabs/tab_game.cpp" line="296"/>
         <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/client/tabs/tab_game.cpp" line="299"/>
         <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/client/tabs/tab_game.cpp" line="302"/>
         <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/client/tabs/tab_game.cpp" line="305"/>
         <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/client/tabs/tab_game.cpp" line="308"/>
         <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/client/tabs/tab_game.cpp" line="311"/>
         <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/client/tabs/tab_game.cpp" line="314"/>
         <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/client/tabs/tab_game.cpp" line="317"/>
         <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/client/tabs/tab_game.cpp" line="320"/>
         <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/client/tabs/tab_game.cpp" line="322"/>
         <source>&amp;Concede</source>
         <translation>&amp;Aufgeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="326"/>
         <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/client/tabs/tab_game.cpp" line="329"/>
         <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/client/tabs/tab_game.cpp" line="332"/>
         <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/client/tabs/tab_game.cpp" line="335"/>
         <source>&amp;Say:</source>
         <translation>&amp;Sagen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="339"/>
         <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/client/tabs/tab_game.cpp" line="342"/>
         <source>&amp;View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="347"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="350"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="353"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="358"/>
         <source>Visible</source>
         <translation>Sichtbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="348"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="354"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="359"/>
         <source>Floating</source>
         <translation>Schwebend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="362"/>
         <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/client/tabs/tab_game.cpp" line="497"/>
         <source>Concede</source>
         <translation>Aufgeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="497"/>
         <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/client/tabs/tab_game.cpp" line="502"/>
         <source>Unconcede</source>
         <translation>Doch nicht aufgeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="503"/>
         <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/client/tabs/tab_game.cpp" line="521"/>
         <source>Leave game</source>
         <translation>Spiel verlassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="521"/>
         <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/client/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>Ein Spieler ist Spiel #%1 beigetreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 ist dem Spiel beigetreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>Sie wurden aus dem Spiel geworfen.</translation>
     </message>
@@ -8392,7 +7558,7 @@ Bitte geben Sie einen Namen ein:</translation>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
+        <location filename="src/client/tabs/tab_home.h" line="25"/>
         <source>Home</source>
         <translation>Zuhause</translation>
     </message>
@@ -8400,158 +7566,158 @@ Bitte geben Sie einen Namen ein:</translation>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>Zeit;SenderName;SenderIP;Nachricht;ZielID;ZielName</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>Raumlogs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>Spielelogs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>Chatlogs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>Sie müssen mindestens einen Filter auswählen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>Sie müssen eine gültige Anzahl an zu lokalisierenden Tagen auswählen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>Benutzername:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>IP-Adresse:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>Spielname:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>Spiel-ID:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>Nachricht:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>Hauptraum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>Spielraum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>Privater Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>Die letzten X Tage:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>Letzte Stunde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>Maximale Ergebnisse:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>Mindestens ein Filter ist notwendig.
 Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>Benutzerlogs anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>Filter entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>Logstandorte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>Datumsbereich</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>Maximale Ergebnisse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>Nachrichtenverlauf</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>Das Sammeln von Nachrichtenverlaufsinformationen ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Keine Nachrichten für die gewählten Filter.</translation>
     </message>
@@ -8559,37 +7725,37 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>Privater &amp;Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>Ver&amp;lassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - privater Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>Dieser Benutzer ignoriert dich. Er kann deine Nachrichten im Hauptchat nicht sehen und du kannst seinen Spielen nicht beitreten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>Private Nachricht von</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 hat den Server verlassen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 hat den Server betreten.</translation>
     </message>
@@ -8597,186 +7763,186 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="199"/>
         <source>Local file system</source>
         <translation>Lokales Dateisystem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="200"/>
         <source>Server replay storage</source>
         <translation>Wiederholungsablage auf dem Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="207"/>
         <source>Watch replay</source>
         <translation>Wiederholung abspielen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="203"/>
         <source>Rename</source>
         <translation>Umbenennen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="318"/>
         <source>New folder</source>
         <translation>Neuer Ordner</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="210"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="206"/>
         <source>Open replays folder</source>
         <translation>Wiederholungsorder öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="208"/>
         <source>Download replay</source>
         <translation>Wiederholung herunterladen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="209"/>
         <source>Toggle expiration lock</source>
         <translation>automatische Löschung umschalten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="211"/>
         <source>Get replay share code</source>
         <translation>Wiederholungscode zum Teilen erhalten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="566"/>
         <source>Look up replay by share code</source>
         <translation>Wiederholung durch einen Code zum Teilen nachschauen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="282"/>
         <source>Rename local folder</source>
         <translation>Umbenennen des lokalen Ordners</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="282"/>
         <source>Rename local file</source>
         <translation>Umbenennen der lokalen Datei</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="285"/>
         <source>New name:</source>
         <translation>Neuer Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="300"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="300"/>
         <source>Rename failed</source>
         <translation>Umbenennen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="318"/>
         <source>Name of new folder:</source>
         <translation>Name des neuen Ordners:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="333"/>
         <source>Delete local file</source>
         <translation>Lokale Datei löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="333"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Sind sie sicher, dass die ausgewählten Dateien gelöscht werden sollen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="490"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Sind sie sicher, dass die ausgewählten Wiederholungen gelöscht werden sollen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="537"/>
         <source>Failed to get code</source>
         <translation>Erhalten des Codes fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="541"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="602"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="539"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="600"/>
         <source>Either this server does not support replay sharing, or does not permit replay sharing for you.</source>
         <translation>Entweder unterstützt dieser Server das Teilen von Wiederholungen nicht, oder erlaubt dir das Teilen von Wiederholungen nicht.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="605"/>
         <source>Failed</source>
         <translation>Fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="545"/>
         <source>Could not get replay code</source>
         <translation>Wiederholungs-Code konnte nicht erhalten werden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="553"/>
         <source>Replay Share Code</source>
         <translation>Wiederholungscode zum Teilen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="555"/>
         <source>Others can use this code to add the replay to their list of remote replays:
 %1</source>
         <translation>Andere können diesen Code benutzen um diese Wiederholung zu ihrer Liste von Fremd-Wiederholungen hinzuzufügen:
 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="557"/>
         <source>Copy to clipboard</source>
         <translation>In die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="566"/>
         <source>Replay share code</source>
         <translation>Wiederholungscode zum Teilen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="587"/>
         <source>Replay code found</source>
         <translation>Wiederholungscode gefunden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="588"/>
         <source>Replay was added, or you already had access to it.</source>
         <translation>Wiederholung wurde hinzugefügt, oder du hattest bereits Zugang dazu.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="593"/>
         <source>Replay code not found</source>
         <translation>Wiederholungscode nicht gefunden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="598"/>
         <source>Failed to submit code</source>
         <translation>Einreichen des Codes fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="605"/>
         <source>Unexpected error</source>
         <translation>Unerwarteter Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="489"/>
         <source>Delete remote replay</source>
         <translation>Wiederholung vom Server löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="81"/>
         <source>Game Replays</source>
         <translation>Aufgezeichnete Spiele</translation>
     </message>
@@ -8784,47 +7950,47 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;Sagen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;Raum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>Raum ver&amp;lassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>Chat leeren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>Chat Einstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation>hat dich erwähnt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>Zum Anzeigen klicken.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>Sie überfluten den Chatraum. Bitte warten Sie ein paar Sekunden.</translation>
     </message>
@@ -8832,35 +7998,35 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation>Serverraumbeitritt fehlgeschlagen: der Raum existiert auf dem Server nicht.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation>Der Server denkt Sie seien im Serverraum, allerdings kann Ihr Client diesen nicht anzeigen. Versuchen Sie, Ihren Client neu zu starten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation>Sie haben nicht die erforderlichen Berechtigungen, um diesem Serverraum beizutreten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation>Beitritt des Serverraums aufgrund eines unbekannten Fehlers fehlgeschlagen: %1.</translation>
     </message>
@@ -8868,97 +8034,92 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="205"/>
         <source>Deck Editor</source>
         <translation>Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="206"/>
         <source>Visual Deck Editor</source>
         <translation>Visueller Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="207"/>
         <source>EDHRec</source>
         <translation>EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation>Archidekt</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="208"/>
         <source>Home</source>
         <translation>Zuhause</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="209"/>
         <source>&amp;Visual Deck Storage</source>
         <translation>&amp;Visuelle Deckablage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="210"/>
         <source>Visual Database Display</source>
         <translation>Visuelle Datenbankanzeige</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="211"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="212"/>
         <source>Account</source>
         <translation>Benutzerkonto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="213"/>
         <source>Deck Storage</source>
         <translation>Deckablage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="214"/>
         <source>Game Replays</source>
         <translation>Aufgezeichnete Spiele</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="215"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="216"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="275"/>
         <source>Are you sure?</source>
         <translation>Sind Sie sicher?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="276"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>Es sind noch Spiele offen. Wollen Sie das Programm trotzdem beenden?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="999"/>
         <source>Click to view</source>
         <translation>Zum Anzeigen klicken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1027"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Dein Freund %1 hat sich eingeloggt!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1068"/>
         <source>Unknown Event</source>
         <translation>Unbekanntes Ereignis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1069"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8969,39 +8130,39 @@ Dies könnte bedeuten, dass eine neue Version von Cockatrice verfügbar ist oder
 Um Ihren Client zu aktualisieren, navigieren Sie zu Hilfe -&gt; Auf Aktualisierungen prüfen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1074"/>
         <source>Idle Timeout</source>
         <translation>Inaktivitätszeitüberschreitung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1074"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Sie werden wegen Inaktivität abgemeldet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1078"/>
         <source>Promotion</source>
         <translation>Beförderung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1079"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation>Sie wurden befördert. Bitte loggen Sie sich aus und wieder ein, damit die Änderungen in Kraft treten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1083"/>
         <source>Warned</source>
         <translation>Gewarnt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1084"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>Sie haben eine Warnung erhalten aufgrund von %1.
 Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie eingeleitet. Sollten Sie Fragen haben, stellen Sie diese bitte über eine private Nachricht an einen Moderator.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1098"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>Sie haben die folgende Nachricht vom Server erhalten.
@@ -9011,12 +8172,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation>Datenbankanzeige</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation>Visuelle Datenbankanzeige</translation>
     </message>
@@ -9024,13 +8180,13 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="24"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="64"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="45"/>
         <source>Unable to analyze the deck.</source>
         <translation>Deckanalyse fehlgeschlagen.</translation>
     </message>
@@ -9038,14 +8194,14 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>Datei existiert nicht.
 </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>Öffnen der Datei fehlgeschlagen.
@@ -9055,42 +8211,42 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Leben</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Weiß</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Blau</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Schwarz</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Rot</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Grün</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Farblos</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Andere</translation>
     </message>
@@ -9098,7 +8254,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>Datei konnte nicht zum Lesen geöffnet werden.</translation>
     </message>
@@ -9106,206 +8262,206 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>Benutzer&amp;details</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>Privater &amp;Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Spiele dieses &amp;Benutzers anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>Zur &amp;Freundesliste hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Von &amp;Freundesliste entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>&amp;Ignorieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Nicht mehr &amp;ignorieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>Aus dem &amp;Spiel werfen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>Nutzer warnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Verwar&amp;nungsverlauf des Nutzers ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>Vom &amp;Server bannen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>&amp;Bannverlauf des Nutzers ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>Nutzer zum Moderator befördern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Moderator degradieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation>Nutzer zum Richter befördern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation>Richter degradieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation>Administratornotizen ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="88"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="92"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="84"/>
         <source>This user does not exist.</source>
         <translation>Dieser Benutzer existiert nicht.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="89"/>
         <source>You are being ignored by %1 and can&apos;t see their games.</source>
         <translation>Du wirst ignoriert von %1 und kannst ihre Spiele nicht sehen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="93"/>
         <source>Could not get %1&apos;s games.</source>
         <translation>Konnte Spiele von %1 nicht erhalten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="120"/>
         <source>%1&apos;s games</source>
         <translation>%1s Spiele</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="175"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="198"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="202"/>
         <source>Ban History</source>
         <translation>Bannverlauf</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="181"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>Bannzeit;Moderator;Banndauer;Banngrund;Sichtbarer Grund</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="199"/>
         <source>User has never been banned.</source>
         <translation>Nutzer wurde bisher nie gebannt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="203"/>
         <source>Failed to collect ban information.</source>
         <translation>Sammeln von Informationen über Bans fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="213"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="238"/>
         <source>Warning History</source>
         <translation>Warnungsverlauf</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="218"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>Warnungszeit;Moderator;Nutzername;Grund</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="235"/>
         <source>User has never been warned.</source>
         <translation>Nutzer wurde bisher nie gewarnt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="239"/>
         <source>Failed to collect warning information.</source>
         <translation>Sammeln von Informationen über Verwarnungen fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="247"/>
         <source>Failed to get admin notes.</source>
         <translation>Administratornotizen konnten nicht abgerufen werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="264"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="267"/>
         <source>Success</source>
         <translation>Erfolgreich</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="265"/>
         <source>Successfully promoted user.</source>
         <translation>Nutzer erfolgreich befördert.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully demoted user.</source>
         <translation>Nutzer erfolgreich degradiert.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="247"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed</source>
         <translation>Fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="272"/>
         <source>Failed to promote user.</source>
         <translation>Beförderung des Nutzers fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to demote user.</source>
         <translation>Degradierung des Nutzers fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="360"/>
         <source>Copy hash to clipboard</source>
         <translation>Kopiere Hash in die Zwischenablage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="380"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Nachrichten dieses Nutzers entfernen</translation>
     </message>
@@ -9313,173 +8469,173 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>Accountalter:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>Passwort ändern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>Avatar wechseln</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Administrator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Registrierter Benutzer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Unregistrierter Benutzer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation>Richter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation>Das eingegebene Passwort stimmt nicht mit dem Konto überein.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>Benutzerinformationen aktualisiert.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation>Benutzerinformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation>Echter Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation>Nutzerlevel:</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation><numerusform>%n Jahre,</numerusform><numerusform>%n Jahre,</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation><numerusform>%10%n Tage %20</numerusform><numerusform>%10%n Tage %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>Passwort eingeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation>Passwortverifikation benötigt, um die E-Mail-Adresse zu ändern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation>Ein Fehler ist während der Aktualisierung Ihrer Benutzerinformationen aufgetreten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>Dieser Server erlaubt Ihnen nicht, Ihre Benutzerinformationen zu aktualisieren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>Passwort geändert.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>Dieser Server erlaubt Ihnen nicht, Ihr Passwort zu ändern.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>Das neue Passwort ist zu kurz.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>Altes Passwort inkorrekt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>Avatar gewechselt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Dieser Server erlaubt Ihnen nicht, Ihren Avatar zu ändern.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>Ein Fehler ist während des Wechselns Ihres Avatars aufgetreten.</translation>
     </message>
@@ -9487,152 +8643,137 @@ 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/dialogs/dlg_settings.cpp" line="903"/>
         <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/dialogs/dlg_settings.cpp" line="904"/>
         <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/dialogs/dlg_settings.cpp" line="905"/>
         <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/dialogs/dlg_settings.cpp" line="906"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="907"/>
         <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/dialogs/dlg_settings.cpp" line="908"/>
         <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/dialogs/dlg_settings.cpp" line="909"/>
         <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 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/dialogs/dlg_settings.cpp" line="910"/>
         <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/dialogs/dlg_settings.cpp" line="911"/>
         <source>Notifications settings</source>
         <translation>Benachrichtigungseinstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="912"/>
         <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/dialogs/dlg_settings.cpp" line="913"/>
         <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/dialogs/dlg_settings.cpp" line="914"/>
         <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/dialogs/dlg_settings.cpp" line="915"/>
         <source>Animation settings</source>
         <translation>Animationseinstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="916"/>
         <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/dialogs/dlg_settings.cpp" line="917"/>
         <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/dialogs/dlg_settings.cpp" line="918"/>
         <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/dialogs/dlg_settings.cpp" line="919"/>
         <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/dialogs/dlg_settings.cpp" line="920"/>
         <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/dialogs/dlg_settings.cpp" line="922"/>
         <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/dialogs/dlg_settings.cpp" line="924"/>
         <source>do nothing</source>
         <translation>tue nichts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="926"/>
         <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/dialogs/dlg_settings.cpp" line="928"/>
         <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/dialogs/dlg_settings.cpp" line="929"/>
         <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/dialogs/dlg_settings.cpp" line="930"/>
         <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/dialogs/dlg_settings.cpp" line="931"/>
         <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/dialogs/dlg_settings.cpp" line="932"/>
         <source>Replay settings</source>
         <translation>Wiederholungsoptionen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="933"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Pufferzeit für Rückwärtsüberspringen durch Tastenkürzel</translation>
     </message>
@@ -9640,22 +8781,22 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation>Mit dem Server verbundene Nutzer: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation>Benutzer in diesem Raum: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation>Freunde online: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation>Ignorierte Benutzer online: %1 / %2</translation>
     </message>
@@ -9663,32 +8804,32 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
         <source>Increment all card counters</source>
         <translation>Alle Kartenzähler erhöhen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
         <source>&amp;Untap all permanents</source>
         <translation>&amp;Enttappe alle bleibenden Karten</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
         <source>R&amp;oll die...</source>
         <translation>&amp;Würfeln...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
         <source>&amp;Create token...</source>
         <translation>&amp;Spielstein erzeugen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
         <source>C&amp;reate another token</source>
         <translation>Einen weiteren Spielstein erzeugen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
         <source>Cr&amp;eate predefined token</source>
         <translation>&amp;Vordefinierten Spielstein erzeugen</translation>
     </message>
@@ -9696,185 +8837,63 @@ 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 type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <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="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation>Filtermodus (UND/ODER/NICHT Verknüpfungen der Filter)</translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation>Suchfilter....</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation>Filter speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation>Alle derzeit aktiven Filter in einer Datei speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation>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"/>
-        <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"/>
-        <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"/>
-        <source>Mode: Includes</source>
-        <translation>Modus: Enthält</translation>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation>Modus: Enthält</translation>
     </message>
@@ -9882,27 +8901,27 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
-        <translation>Nach Namen filtern... (Exakte Übereinstimmung)</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
+        <translation>Nach Namen filtern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation>Aus Deck laden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation>Alle Kartennamen im momentan geladenen Deck als Filter mit exakter Übereinstimmung anwenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation>Aus der Zwischenablage laden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation>Alle Kartennamen aus der Zwischenablage als Filter mit exakter Übereinstimmung anwenden</translation>
     </message>
@@ -9910,7 +8929,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/client/ui/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>
@@ -9918,19 +8937,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation>Modus: Enthält</translation>
     </message>
@@ -9938,37 +8957,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/client/ui/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 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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation>Modus: Enthält</translation>
     </message>
@@ -9976,93 +8985,50 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation>Suche nach Kartennamen (oder Suchausdrücken)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation>Visuell</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
         <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/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
         <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"/>
-        <source>Table</source>
-        <translation>Tisch</translation>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
-        <translation>Gruppieren nach:</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
+        <source>Save and load filters</source>
+        <translation>Filter speichern und laden</translation>
     </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>Wie Karten innerhalb ihrer Kategorien/Gruppierungen sortiert werden ändern</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
+        <source>Filter by exact card name</source>
+        <translation>Nach exaktem Kartennamen filtern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
-        <source>Sort by:</source>
-        <translation>Sortieren nach:</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
+        <source>Filter by card sub-type</source>
+        <translation>Nach Kartenuntertyp filtern</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>Klicken und ziehen, um die Sortierungsreihenfolge innerhalb von Gruppen zu ändern</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation>Wie Karten innerhalb ihrer Gruppierung sortiert werden einstellen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <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"/>
-        <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"/>
-        <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 type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
+        <source>Filter by set</source>
+        <translation>Nach Set filtern</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation>Probehandgröße</translation>
     </message>
@@ -10070,25 +9036,46 @@ 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"/>
-        <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>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
+        <source>Click and drag to change the sort order within the groups</source>
+        <translation>Klicken und ziehen, um die Sortierungsreihenfolge innerhalb von Gruppen zu ändern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation>Nach bester Entsprechung in der Datenbank suchen (mit automatischen Vorschlägen) und die bevorzugte Auflage beim Betätigen der Eingabetaste dem Deck hinzufügen</translation>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation>Wie Karten innerhalb ihrer Gruppierung sortiert werden einstellen</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
+        <source>Overlap Layout</source>
+        <translation>Überlappungsdarstellung</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation>Wie Karten innerhalb von Zonen angezeigt werden ändern (überlappend oder vollständig sichtbar)</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
+        <source>Flat Layout</source>
+        <translation>Flache Darstellung</translation>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation>Deckablage</translation>
     </message>
@@ -10096,52 +9083,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/client/ui/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/client/ui/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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="132"/>
+        <location filename="src/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation>Dateipfad</translation>
     </message>
@@ -10149,7 +9131,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation>Suche nach Dateinamen (oder Suchausdruck)</translation>
     </message>
@@ -10157,22 +9139,22 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation>Alphabetisch sortieren (Deckname)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation>Alphabetisch sortieren (Dateiname)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation>Nach Änderungsdatum sortieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation>Nach letztem Laden sortieren</translation>
     </message>
@@ -10180,17 +9162,17 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation>Datenbank wird geladen ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation>Geladene Dateien aktualisieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation>Einstellungen des Visuellen Deckeditors</translation>
     </message>
@@ -10198,43 +9180,43 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>Welche Warnung möchten Sie versenden?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Entferne alle Nachrichten dieses Nutzers in allen Räumen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>Abbre&amp;chen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>Nutzer aufgrund von Fehlverhalten warnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>Der zu warnende Nutzername kann nicht leer gelassen werden, bitte geben Sie einen Nutzernamen an.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>Warnungsart kann nicht leer gelassen werden, bitte wählen Sie die zu sendende Warnungsart.</translation>
     </message>
@@ -10242,133 +9224,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation>Standardreihenfolge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation>Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation>Kartenzeichnung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation>Tipps</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation>Notiz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation>Editionen verwalten</translation>
     </message>
@@ -10376,72 +9358,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="52"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="223"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="236"/>
         <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="240"/>
         <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="241"/>
         <source>pile view</source>
         <translation>Stapelansicht</translation>
     </message>
@@ -10449,7 +9431,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Deutsch (German)</translation>
     </message>
@@ -10457,12 +9439,12 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation>Verbinde beim Start</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation>Debugge in Datei</translation>
     </message>
@@ -10470,1058 +9452,1006 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>Hauptfenster</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Deck Editor</source>
         <translation>Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>Spielelobby</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation>Kartenmarken</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation>Spielermarken</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Stärke und Widerstandskraft</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Spielphasen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>Spielebereich</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation>Ausgewählte Karte verschieben</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>Ansehen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation>Oberste Karte verschieben</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation>Unterste Karte verschieben</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Spielmechanik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation>Ziehen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation>Chatraum</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation>Spielfenster</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation>Deck aus der Zwischenablage laden</translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Replays</source>
         <translation>Wiederholungen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation>Nach Kartenaktualisierungen suchen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation>Verbinden...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>Getrennt</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation>Registrieren...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation>Lokales Spiel starten...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation>Aufgezeichnetes Spiel ansehen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation>Deck analysieren (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation>Deck analysieren (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation>Alle Filter entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation>Ausgewählten Filter entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation>Karte entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation>Editionen verwalten...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation>Benutzerdefinierte Spielsteine bearbeiten...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation>Deck exportieren (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation>Deck exportieren (decklist.xyz)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation>Karte hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation>Deck laden...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Deck aus der Zwischenablage laden...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation>Deck in Zwischenablage bearbeiten, kommentiert</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation>Deck in Zwischenablage bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation>Neues Deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Benutzerdefinierten Bilderordner öffnen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation>Deck drucken...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation>Karte löschen</translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="684"/>
         <source>Reset Layout</source>
         <translation>Darstellung zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>Deck speichern</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation>Deck speichern unter...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Deck kommentiert in die Zwischenablage speichern</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation>Deck in die Zwischenablage speichern, kommentiert (keine Setinformationen)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation>Deck in die Zwischenablage speichern</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation>Deck in die Zwischenablage speichern (keine Setinformationen)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation>Lokales Deck laden...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation>Deck vom Server laden...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation>Bereit zum Start setzen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Sideboardsperre umschalten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation>Grüne Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation>Grüne Marke entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation>Grüne Marken setzen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation>Rote Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation>Rote Marke entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation>Rote Marken setzen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation>Lebensmarke hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation>Statuszeile anzeigen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation>Deck entladen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation>Zwangsstart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation>Kartenmarke hinzufügen (F)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation>Kartenmarke entfernen (F)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation>Kartenmarke setzen (F)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation>Kartenmarke hinzufügen (E)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation>Kartenmarke entfernen (E)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation>Kartenmarke setzen (E)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation>Kartenmarke hinzufügen (D)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation>Kartenmarke entfernen (D)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation>Kartenmarke setzen (D)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation>Kartenmarke hinzufügen (C)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation>Kartenmarke entfernen (C)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation>Kartenmarke setzen (C)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation>Kartenmarke hinzufügen (B)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation>Kartenmarke entfernen (B)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation>Kartenmarke setzen (B)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation>Kartenmarke hinzufügen (A)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation>Kartenmarke entfernen (A)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation>Kartenmarke setzen (A)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation>Lebensmarke entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation>Lebensmarken setzen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation>Weiße Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation>Weiße Marke entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation>Weiße Marken setzen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation>Blaue Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation>Blaue Marke entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation>Blaue Marken setzen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation>Schwarze Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation>Schwarze Marke entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation>Schwarze Marken setzen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation>Farblose Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation>Farblose Marke entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation>Farblose Marken setzen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation>Andere Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation>Andere Marke entfernen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation>Andere Marke setzen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/settings/shortcuts_settings.h" line="417"/>
         <source>Increment all card counters</source>
         <translation>Alle Kartenzähler erhöhen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="420"/>
         <source>Add Power (+1/+0)</source>
         <translation>Stärke hinzufügen (+1/+0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="423"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Stärke entfernen (-1/-0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="426"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Widerstandskraft nach Stärke verschieben (+1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="429"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Widerstandskraft hinzufügen (+0/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="432"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Widerstandskraft entfernen (-0/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="435"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Stärke nach Widerstandskraft verschieben (-1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="438"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Stärke und Widerstandskraft hinzufügen (+1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="441"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Stärke und Widerstandskraft entfernen (-1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="444"/>
         <source>Set Power and Toughness...</source>
         <translation>Stärke und Widerstandskraft setzen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="447"/>
         <source>Reset Power and Toughness</source>
         <translation>Stärke und Widerstandskraft zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Untap</source>
         <translation>Enttappen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="454"/>
         <source>Upkeep</source>
         <translation>Versorgung</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Draw</source>
         <translation>Ziehen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="457"/>
         <source>First Main Phase</source>
         <translation>Erste Hauptphase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Start Combat</source>
         <translation>Beginn des Kampfes</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Attack</source>
         <translation>Angriff</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="466"/>
         <source>Block</source>
         <translation>Blocken</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Damage</source>
         <translation>Schaden</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="469"/>
         <source>End Combat</source>
         <translation>Ende des Kampfes</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>Second Main Phase</source>
         <translation>Zweite Hauptphase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>End</source>
         <translation>Endsegment</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="477"/>
         <source>Next Phase</source>
         <translation>Nächste Phase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="480"/>
         <source>Next Phase Action</source>
         <translation>Nächste Phasenaktion</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="483"/>
         <source>Next Turn</source>
         <translation>Nächster Zug</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="486"/>
         <source>Hide Card in Reveal Window</source>
         <translation>Karte im Enthüllungsfenster verstecken</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="489"/>
         <source>Tap / Untap Card</source>
         <translation>Tappe / Enttappe Karte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="492"/>
         <source>Untap All</source>
         <translation>Alle enttappen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/settings/shortcuts_settings.h" line="495"/>
+        <source>Toggle Untap</source>
+        <translation>Enttappen umschalten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="498"/>
         <source>Turn Card Over</source>
         <translation>Karte herumdrehen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="501"/>
         <source>Peek Card</source>
         <translation>Karte ansehen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="504"/>
         <source>Play Card</source>
         <translation>Karte spielen</translation>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="507"/>
         <source>Attach Card...</source>
         <translation>Karte anlegen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="510"/>
         <source>Unattach Card</source>
         <translation>Karte lösen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="513"/>
         <source>Clone Card</source>
         <translation>Karte klonen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="516"/>
         <source>Create Token...</source>
         <translation>Spielstein erstellen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="519"/>
         <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/settings/shortcuts_settings.h" line="522"/>
         <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/settings/shortcuts_settings.h" line="525"/>
         <source>Set Annotation...</source>
         <translation>Notiz setzen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="528"/>
         <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/settings/shortcuts_settings.h" line="531"/>
         <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/settings/shortcuts_settings.h" line="534"/>
         <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"/>
-        <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/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="600"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <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/settings/shortcuts_settings.h" line="548"/>
+        <location filename="src/settings/shortcuts_settings.h" line="619"/>
         <source>Top of Library</source>
         <translation>Obere Karte der Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="551"/>
+        <location filename="src/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="605"/>
         <source>Battlefield, Face Down</source>
         <translation>Spielfeld, verdeckt</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <source>Battlefield</source>
         <translation>Spielfeld</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="559"/>
+        <source>Sort Hand</source>
+        <translation>Hand sortieren</translation>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="565"/>
         <source>Library</source>
         <translation>Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="568"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="571"/>
         <source>Top Cards of Library</source>
         <translation>Oberste Karten der Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="574"/>
         <source>Bottom Cards of Library</source>
         <translation>Unterste Karten der Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="577"/>
         <source>Close Recent View</source>
         <translation>Schließe letzte Ansicht</translation>
     </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/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="589"/>
+        <location filename="src/settings/shortcuts_settings.h" line="611"/>
         <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 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/settings/shortcuts_settings.h" line="594"/>
+        <location filename="src/settings/shortcuts_settings.h" line="616"/>
         <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="622"/>
         <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/settings/shortcuts_settings.h" line="625"/>
         <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/settings/shortcuts_settings.h" line="628"/>
         <source>Draw Arrow...</source>
         <translation>Pfeil zeichnen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <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/settings/shortcuts_settings.h" line="634"/>
         <source>Leave Game</source>
         <translation>Spiel verlassen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <source>Concede</source>
         <translation>Aufgeben</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="639"/>
         <source>Roll Dice...</source>
         <translation>Würfeln...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="642"/>
         <source>Shuffle Library</source>
         <translation>Bibliothek mischen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="645"/>
         <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/settings/shortcuts_settings.h" line="648"/>
         <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/settings/shortcuts_settings.h" line="651"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <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"/>
-        <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/settings/shortcuts_settings.h" line="654"/>
         <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/settings/shortcuts_settings.h" line="657"/>
         <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/settings/shortcuts_settings.h" line="660"/>
         <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/settings/shortcuts_settings.h" line="663"/>
         <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/settings/shortcuts_settings.h" line="666"/>
         <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"/>
-        <source>Sort Hand by Name</source>
-        <translation>Hand sortieren nach Name</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation>Hand sortieren nach Typ</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <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"/>
-        <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"/>
-        <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/settings/shortcuts_settings.h" line="669"/>
         <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/settings/shortcuts_settings.h" line="672"/>
         <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/settings/shortcuts_settings.h" line="675"/>
         <source>Unfocus Text Box</source>
         <translation>Textboxfokus aufheben</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="678"/>
         <source>Focus Chat</source>
         <translation>Chat fokussieren</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="681"/>
         <source>Clear Chat</source>
         <translation>Chat leeren</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="687"/>
         <source>Refresh</source>
         <translation>Aktualisieren</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="690"/>
         <source>Skip Forward</source>
         <translation>Vorspulen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="693"/>
         <source>Skip Backward</source>
         <translation>Zurückspulen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="696"/>
         <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/settings/shortcuts_settings.h" line="699"/>
         <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/settings/shortcuts_settings.h" line="702"/>
         <source>Play/Pause</source>
         <translation>Abspielen/Pausieren</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="705"/>
         <source>Toggle Fast Forward</source>
         <translation>Schnelldurchlauf umschalten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Home</source>
         <translation>Zuhause</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="712"/>
         <source>Visual Deck Storage</source>
         <translation>Visuelle Deckablage</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="716"/>
         <source>Deck Storage</source>
         <translation>Deckablage</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="720"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="722"/>
         <source>Account</source>
         <translation>Benutzerkonto</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="723"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="727"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_el.ts b/cockatrice/translations/cockatrice_el.ts
index 5bd3b2826..31ba81c2a 100644
--- a/cockatrice/translations/cockatrice_el.ts
+++ b/cockatrice/translations/cockatrice_el.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Ρύθμιση μετρητή...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Ρύθμιση μετρητή</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Νέα τιμή για τον μετρητή &apos;%1&apos;</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,81 +36,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -118,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -131,312 +129,251 @@ 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"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>Ρυθμίσεις θέματος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Τρέχον θέμα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation>Άνοιγμα φακέλου θεμάτων</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>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/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation>Απόδοση κάρτας</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
         <translation>Διάταξη χειρός</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <source>Enable left justification</source>
         <translation>Ενεργοποιήστε την αριστερή αιτιολόγηση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <source>Table grid layout</source>
         <translation>Διάταξη πλέγματος πίνακα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="692"/>
         <source>Invert vertical coordinate</source>
         <translation>Ανατροπή κάθετης συντεταγμένης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Μέγιστο μέγεθος γραμματοσειράς για πληροφορίες που εμφανίζονται στις κάρτες:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>απαγόρευση και όνομα χρήστη</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>απαγόρευση &amp; διεύθυνση IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>απαγόρευση εξυπηρετητή I&amp;D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Τύπος απαγόρευσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;μόνιμη απαγόρευση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;προσωρινή απαγόρευση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Μέρες:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Ώρες:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Λεπτά:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Διάρκεια της απαγόρευσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Παρακαλώ καταχωρίστε τον λόγο της απαγόρευσης.
 Αυτό αποθηκεύεται μόνο για τους επόπτες και δεν μπορεί να το δει το αποκλεισμένο άτομο.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Παρακαλώ καταχωρίστε τον λόγο της απαγόρευσης που θα είναι ορατή στο αποκλεισμένο άτομο.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;Εντάξει</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Άκυρο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Απαγόρευση χρήστη από τον διακομιστή</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Για την απαγόρευση πρέπει να επιλέξετε ένα όνομα, μία IP, ένα clientId, ή κάποιο συνδυασμό των τριών.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Πρέπει να έχετε μια τιμή στην απαγόρευση ονόματος όταν επιλέγετε το πλαίσιο ελέγχου απαγόρευσης ονόματος.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Πρέπει να έχετε μια τιμή στην απαγόρευση ip όταν επιλέγετε το πλαίσιο ελέγχου απαγόρευσης ip.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Πρέπει να έχετε μια τιμή στην απαγόρευση clientid όταν επιλέγετε το πλαίσιο ελέγχου απαγόρευσης clientid.</translation>
     </message>
@@ -444,22 +381,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -467,32 +404,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Σετς</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Το κόστος του Μάνα</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Είδος κάρτας</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Χρώμα(τα)</translation>
     </message>
@@ -500,101 +437,96 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Τύπος</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Χρώμα</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Κείμενο</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Σπανιότητα</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Δύναμη</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Σκληρότητα</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -602,22 +534,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +557,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -648,294 +580,172 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Μετακίνηση σε</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Επίθεση / άμυνα</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>το χέρι τους</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1&apos;s χέρι</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>η βιβλιοθήκη τους</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1&apos;s βιβλιοθήκη</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>της βιβλιοθήκης τους</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <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="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>η βιβλιοθήκη τους</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>η βιβλιοθήκη τους</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>η βιβλιοθήκη τους</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>το νεκροταφείο τους</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <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/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>η εξορία τους</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <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/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>το sideboard τους</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>το sideboard τους</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <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/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -944,7 +754,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -952,60 +762,15 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1013,47 +778,47 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,97 +826,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +914,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1177,114 +932,109 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1042,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,227 +1050,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>Επιτυχία</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>Αριθμός</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Κάρτα</translation>
     </message>
@@ -1528,12 +1245,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,17 +1258,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,7 +1276,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,62 +1284,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,166 +1347,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>Δεν ήταν δυνατή η ανάλυση της απάντησης από το διακομιστή.</translation>
     </message>
@@ -1813,58 +1472,54 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1872,19 +1527,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1892,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Γνωστοί Hosts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Νέος Host</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Όνομα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Θύρα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>Όνομα &amp;παίχτη:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>Κωδικός:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Αποθήκευση Κωδικού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>Α&amp;υτόματη σύνδεση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Συνδεθείτε αυτόματα στην πιο πρόσφατη σύνδεση όταν ανοίγει το Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Διακομιστής</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Σύνδεση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Προειδοποίηση σύνδεσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>Πρέπει να ονομάσετε το νέο προφίλ σύνδεσης.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Προειδοποίηση σύνδεσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Το όνομα παίκτη δεν μπορεί να είναι άδειο.</translation>
     </message>
@@ -2041,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Θυ&amp;μηθείτε τις ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Περιγραφή:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>Π&amp;αίχτες:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Είδος παιχνιδιού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Κωδικός:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Μόνο &amp;φίλοι μπορούν να συμμετάσχουν</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Μόνο &amp;εγγεγραμμένοι χρήστες μπορούν να συμμετάσχουν</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Περιορισμοί συμμετοχής</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>Οι &amp;θεατές μπορούν να παρακολουθήσουν</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Οι θεατές &amp;χρειάζονται κωδικό για να παρακολουθήσουν</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Οι θεατές μπορούν να &amp;συζητήσουν</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Οι θεατές μπορούν να δουν τα &amp;χέρια</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Θεατές</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;Καθάρισε</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Δημιουργία παιχνιδιού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Πληροφορίες παιχνιδιού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Σφάλμα Διακομιστή.</translation>
     </message>
@@ -2164,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Όνομα:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>Χ&amp;ρώμα:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>άσπρο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>μπλε</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>μαύρο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>κόκκινο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>πράσινο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>πολύχρωμο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>άχρωμο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Σχόλιο:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;κατέστρεψε το token όταν φύγει από το τραπέζι</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Στοιχεία token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Εμφάνισε &amp;όλα τα tokens</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Εμφάνιση tokens από αυτό το &amp;deck</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Επέλεξε token από τη λίστα</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Δημιουργία token</translation>
     </message>
@@ -2262,53 +1907,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2316,40 +1961,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Δεν έχει επιλεγεί εικόνα.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Για να αλλάξετε το avatar σας, επιλέξτε μια νέα εικόνα
 Για να καταργήσετε το τρέχον avatar, επιβεβαιώστε χωρίς να επιλέξετε μια νέα εικόνα.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Εξέτασε...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Αλλαγή avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Άνοιγμα εικόνας</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Αρχεία εικόνας (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Επιλέχθηκε μη έγκυρη εικόνα.</translation>
     </message>
@@ -2357,17 +2002,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2375,38 +2020,38 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Παλιός κωδικός:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Νέος κωδικός:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Επιβεβαιώστε τον καινούριο σας κωδικό:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Αλλαγή κωδικού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Ο κωδικός σας είναι πολύ μικρός.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Οι νέοι κωδικοί πρόσβασης δεν ταιριάζουν.</translation>
     </message>
@@ -2414,93 +2059,93 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Όνομα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>Χ&amp;ρώμα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>άσπρο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>μπλε</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>μαύρο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>κόκκινο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>πράσινο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>πολύχρωμο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>άχρωμο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Σχόλιο:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Στοιχεία token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Προσθήκη token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Αφαίρεση token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Παρακαλώ εισάγετε το όνομα του token:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation type="unfinished"/>
@@ -2509,27 +2154,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Χώρα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Απροσδιόριστο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Πραγματικό όνομα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Επεξεργασία προφίλ χρήστη</translation>
     </message>
@@ -2537,143 +2182,137 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>Παιχνίδι και &amp;περιγραφή:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Όνομα δημιουργού:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>&amp;Είδη παιχνιδιού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>το &amp;λιγότερο:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>το &amp;περισσότερο:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Μέγιστος αριθμός παικτών</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Περιορισμοί</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Φίλτρο παιχνιδιών</translation>
     </message>
@@ -2681,52 +2320,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Θύρα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>Όνομα &amp;παίχτη:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>Η διεύθυνση e-mail δεν μπορεί να είναι άδεια</translation>
     </message>
@@ -2734,37 +2373,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Θύρα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>Όνομα &amp;παίχτη:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Το όνομα παίκτη δεν μπορεί να είναι άδειο.</translation>
     </message>
@@ -2772,86 +2411,86 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Θύρα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>Όνομα &amp;παίχτη:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Token:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Νέος κωδικός:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Το όνομα παίκτη δεν μπορεί να είναι άδειο.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>Οι κωδικοί πρόσβασης δεν ταιριάζουν.</translation>
     </message>
@@ -2859,7 +2498,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -2867,146 +2506,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Μη έγκυρο deck list</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Φόρτωση deck</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3014,91 +2570,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Θύρα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>Όνομα &amp;παίχτη:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Κωδικός (ξανά):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Διεύθυνση e-mail (ξανά):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Χώρα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Απροσδιόριστο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Πραγματικό όνομα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Εγγραφή σε διακομιστή</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Προειδοποίηση Εγγραφής</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>Ο κωδικός σας είναι πολύ μικρός.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Οι κωδικοί δεν ταιριάζουν, παρακαλώ προσπαθήστε ξανά</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Το όνομα παίκτη δεν μπορεί να είναι άδειο.</translation>
     </message>
@@ -3106,17 +2662,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -3124,55 +2680,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3183,7 +2724,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3200,7 +2741,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2750,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/dialogs/dlg_settings.cpp" line="1819"/>
         <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/dialogs/dlg_settings.cpp" line="1823"/>
         <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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3232,59 +2773,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Εμφάνιση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>Διεπαφή Χρήστη</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Ήχος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Συντομεύσεις</translation>
     </message>
@@ -3292,39 +2833,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3332,17 +2873,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
@@ -3350,164 +2891,168 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Τρέχον κανάλι έκδοσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Επανεγκατάσταση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Ακύρωση Κατεβάσματος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Άνοιγμα Σελίδας Κατεβάσματος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Ο έλεγχος για ενημερώσεις ολοκληρώθηκε</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Καμία Διαθέσιμη Ενημέρωση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Το Cockatrice είναι πλήρως ενημερωμένο!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>Ήδη τρέχετε την πιό πρόσφατη έκδοση διαθέσιμη σε αυτό το κανάλι.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Τρέχουσα έκδοση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Επιλεγμένο κανάλι έκδοσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Υπάρχει Διαθέσιμη Ενημέρωση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Μία νέα έκδοση του Cockatrice είναι διαθέσιμη!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Νέα έκδοση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Αρχείο Αλλαγών</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Θέλετε να ενημερώσετε τώρα;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3515,162 +3060,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3678,47 +3091,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3726,44 +3139,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3771,7 +3178,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation type="unfinished"/>
     </message>
@@ -3779,325 +3186,244 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Λάθος κωδικός.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Κωδικός:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>Καθάρισμα Φίλτρου</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>Δημιουργία</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>Είσοδος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>Είσοδος ως θεατής</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>κωδικός</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>μόνο φίλοι</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>μόνο εγγεγραμμένοι χρήστες</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>μπορούν να συνομιλήσουν</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>βλέπουν τα χέρια</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>μπορούν να δούν τα χέρια</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>δεν επιτρέπεται</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Δωμάτιο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Ηλικία</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Περιγραφή</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Δημιουργός</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Τύπος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Περιορισμοί</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Παίκτες</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Θεατές</translation>
     </message>
@@ -4105,1281 +3431,887 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>Έκδοση</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>Οι μεταφραστές μας</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Υποστήριξη:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Αναφορά Προβλήματος</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Αντιμετώπιση Προβλημάτων</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>Συχνές Ερωτήσεις</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Αποτυχημένη Σύνδεση</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Είστε αποκλεισμένος μέχρι %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Είστε αποκλεισμένος επ&apos; αόριστον.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>Ο σέρβερ απαιτεί εγγραφή. Θέλετε να εγγραφείτε τώρα;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Ενεργοποίηση λογαριασμού</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>Σέρβερ Πλήρης</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Άγνωστο σφάλμα σύνδεσης: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>Ο κωδικός είναι πολύ μικρός.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>Σύνδεση...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>Αποσύνδεση</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>Έναρξη τοπικού παιχνιδιού...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>Πλήρης οθόνη</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>Εγγραφή σε σέρβερ...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>Ρυθμίσεις...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>Έξοδος</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>Βάση δεδομένων καρτών</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>Βοήθεια</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>Σχετικά με το Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>Έλεγχος για ενημερώσεις</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>Βάση δεδομένων καρτών</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>Όχι</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Άνοιγμα ρυθμίσεων</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <source>New sets found</source>
         <translation>Βρέθηκαν νέα σετ</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
         <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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>Εμφάνιση σετ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Καλωσήρθατε</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Πληροφορίες</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,862 +4319,668 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation>Φόρτωση σετ/καρτών</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <source>Selected file cannot be found.</source>
         <translation>Το επιλεγμένο αρχείο δε βρέθηκε.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/server/message_log_widget.cpp" line="160"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/server/message_log_widget.cpp" line="176"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="179"/>
+        <location filename="src/server/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="184"/>
+        <location filename="src/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>μία κάρτα</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation>Το παιχνίδι ξεκίνησε.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/server/message_log_widget.cpp" line="710"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/server/message_log_widget.cpp" line="726"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -6250,206 +4988,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1451"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1452"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -6457,17 +5152,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -6475,62 +5170,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -6538,57 +5233,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation type="unfinished"/>
     </message>
@@ -6596,213 +5291,703 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal 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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
-        <source>View bottom cards of library</source>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
-        <source>Shuffle top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
-        <source>Shuffle bottom cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <source>(max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change power/toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change stats to:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
-        <source>Set annotation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
-        <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
-        <source>Set counters</source>
-        <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/player.cpp" line="769"/>
         <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/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
         <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>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</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/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <source>View bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <source>Shuffle top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1276"/>
+        <source>Shuffle bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <source>Which position should this card be placed:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <source>(max. %1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change power/toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change stats to:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3653"/>
+        <source>Set annotation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3654"/>
+        <source>Please enter the new annotation:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Set counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</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/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6810,7 +5995,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"/>
     </message>
@@ -6818,17 +6003,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6836,132 +6021,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6969,162 +6088,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -7132,17 +6224,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation type="unfinished"/>
     </message>
@@ -7150,149 +6242,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SayMenu</name>
-    <message>
-        <location filename="src/game/player/menu/say_menu.cpp" line="16"/>
-        <source>S&amp;ay</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SequenceEdit</name>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation type="unfinished"/>
     </message>
@@ -7300,27 +6346,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -7328,53 +6374,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7382,12 +6428,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -7395,13 +6441,13 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -7410,58 +6456,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -7469,48 +6502,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -7518,27 +6551,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -7546,17 +6579,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -7564,289 +6597,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7854,55 +6764,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7910,22 +6833,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7933,138 +6856,138 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="175"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8072,17 +6995,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8090,7 +7013,7 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8098,390 +7021,406 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <source>Next &amp;phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <source>Next &amp;turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="236"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
-        <source>You have been kicked out of the game.</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
+        <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -8489,37 +7428,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation type="unfinished"/>
     </message>
@@ -8527,185 +7466,105 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -8713,47 +7572,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation type="unfinished"/>
     </message>
@@ -8761,35 +7620,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -8797,97 +7656,87 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8895,38 +7744,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"/>
@@ -8935,12 +7784,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -8948,13 +7792,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation type="unfinished"/>
     </message>
@@ -8962,13 +7806,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"/>
@@ -8977,42 +7821,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -9020,7 +7864,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
@@ -9028,206 +7872,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <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 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 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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -9235,173 +8057,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>Εισάγετε κωδικό</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation type="unfinished"/>
     </message>
@@ -9409,152 +8231,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <source>General interface settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9562,241 +8369,86 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9804,27 +8456,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9832,7 +8484,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/client/ui/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 +8492,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9860,37 +8512,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9898,93 +8540,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -9992,25 +8586,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10018,52 +8633,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10071,7 +8681,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10079,22 +8689,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10102,17 +8712,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10120,43 +8730,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"/>
     </message>
@@ -10164,133 +8774,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10298,72 +8908,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -10371,7 +8981,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Ελληνικά (Greek)</translation>
     </message>
@@ -10379,12 +8989,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -10392,1058 +9002,991 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_en@pirate.ts b/cockatrice/translations/cockatrice_en@pirate.ts
index 40aa82530..d64dbe67d 100644
--- a/cockatrice/translations/cockatrice_en@pirate.ts
+++ b/cockatrice/translations/cockatrice_en@pirate.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,66 +36,66 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="247"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="232"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="261"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="262"/>
         <source>The decklist has been modified.
 Do you want to save the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="315"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="326"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="347"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="382"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="467"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="326"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="348"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="369"/>
         <source>The deck could not be saved.
 Please check that the directory is writable and try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="354"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="382"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="467"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
@@ -103,12 +103,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -116,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -129,316 +129,241 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="494"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="494"/>
         <source>Could not create themes directory at &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="532"/>
         <source>Theme settings</source>
         <translation>Theme settin&apos;s</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="533"/>
         <source>Current theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="534"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="536"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="537"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="539"/>
         <source>Card rendering</source>
         <translation>C-arrr-d Scribblin&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="540"/>
         <source>Display card names on cards having a picture</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="541"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="543"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="546"/>
         <source>Bump sets that the deck contains cards from to the top in the printing selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="547"/>
         <source>Scale cards on mouse over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="548"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="550"/>
         <source>Minimum overlap percentage of cards on the stack and in vertical hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="551"/>
         <source>Maximum initial height for card view window:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="552"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="554"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="553"/>
         <source>Maximum expanded height for card view window:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
-        <source>Card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
-        <source>Counter %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="556"/>
         <source>Hand layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="557"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="558"/>
         <source>Enable left justification</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="560"/>
         <source>Table grid layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="561"/>
         <source>Invert vertical coordinate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="562"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="563"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>Curse da landlubber&apos;s name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>Curse da landlubbers port o call</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>Curse da landlubber&apos;s Jolly Roger</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
-        <translation>Curse type</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Me hearty, enter t&apos; reason for t&apos; ban.
 This be only saved for captains and cannot be seen by t&apos; brutally banned scallywag.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Me hearty, enter t&apos; reason for t&apos; ban that be visible to t&apos; brutally banned scallywag.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>Aye</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>Belay that</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Banish the scurvy dog from the ship!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
@@ -446,22 +371,22 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -469,152 +394,142 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Fleets</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Magic tax</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Type &apos;o magic</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
-        <translation>Colour(z)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="7"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
-        <translation>AND</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="9"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
-        <translation>OR</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="11"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
-        <translation>AND NOT</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="13"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
-        <translation>OR NOT</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="23"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="src/game/filters/filter_card.cpp" line="25"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="27"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="29"/>
         <source>Text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="31"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="33"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="35"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="37"/>
         <source>Rarity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="39"/>
         <source>Power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="41"/>
         <source>Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="43"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="45"/>
         <source>Format</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="69"/>
         <source>Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="71"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Both</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="74"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="74"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -622,22 +537,22 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="288"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="332"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="345"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="351"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -645,323 +560,169 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="76"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
-        <source>Re&amp;veal to...</source>
+        <location filename="src/game/cards/card_item.cpp" line="81"/>
+        <source>&amp;Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
-        <source>&amp;Tap / Untap</source>
-        <extracomment>Turn sideways or back again</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
-        <source>T&amp;urn Over</source>
-        <extracomment>Turn face up/face down</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/cards/card_item.cpp" line="82"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Power / toughness</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone.cpp" line="72"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone.cpp" line="75"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone.cpp" line="79"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone.cpp" line="86"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone.cpp" line="86"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="92"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone.cpp" line="93"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="95"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
-        <source>their custom zone &apos;%1&apos;</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
-        <source>%1&apos;s custom zone &apos;%2&apos;</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CockatriceXml3Parser</name>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
-        <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CockatriceXml4Parser</name>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
-        <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +730,47 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="191"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="192"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/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="215"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/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="223"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="208"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="280"/>
         <source>Add card to &amp;maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="281"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1017,87 +778,52 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="71"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
-        <source>Mana Cost</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
-        <source>Colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="506"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="523"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="525"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
-        <source>Banner Card/Tags Visibility Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
-        <source>Show banner card selection menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
-        <source>Show tags selection menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="526"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
-        <source>Group by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="527"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="529"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="530"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="531"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="532"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1105,17 +831,17 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>&amp;Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1123,114 +849,109 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="144"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="145"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="146"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="161"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="154"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="160"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="171"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="173"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="166"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="168"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +959,7 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,166 +967,166 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="982"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1045"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="876"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="912"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="876"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="912"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="915"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="915"/>
         <source>One or more downloaded card pictures could not be cleared.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="922"/>
         <source>Add URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="922"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="942"/>
         <source>URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="942"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1047"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1039"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1041"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1042"/>
         <source>How long cached redirects for urls are valid for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1043"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1046"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1048"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1049"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="971"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1001"/>
         <source>Choose path</source>
         <translation>Map yer scurvy way</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1027"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1028"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1029"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1030"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1031"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1032"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1033"/>
         <source>Press the button to manually update without relaunching</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1034"/>
         <source>Do not close settings until manual update is complete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1035"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1036"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1037"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1038"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1040"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1044"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1413,27 +1134,27 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="src/deck/deck_list_model.cpp" line="181"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="src/deck/deck_list_model.cpp" line="185"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="src/deck/deck_list_model.cpp" line="187"/>
         <source>Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="src/deck/deck_list_model.cpp" line="189"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="src/deck/deck_list_model.cpp" line="183"/>
         <source>Card</source>
         <translation type="unfinished"/>
     </message>
@@ -1441,12 +1162,12 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/deck/deck_loader.cpp" line="22"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,25 +1175,20 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
-        <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="57"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1480,62 +1196,57 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="156"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="157"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="158"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="159"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="160"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="161"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
-        <source>Edit default tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="174"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="174"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="183"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="183"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1543,94 +1254,94 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="51"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="285"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="288"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="295"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="297"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="299"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="301"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="303"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="305"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="310"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="312"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="327"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="365"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="378"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="378"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="392"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="392"/>
         <source>Are you sure you want to delete the selected file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1638,108 +1349,82 @@ This be only saved for captains and cannot be seen by t&apos; brutally banned sc
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
-        <translation>The replay from the server is borked.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="124"/>
         <source>Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
         <source>Load remote deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
-        <source>Load from clipboard...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
-        <source>Load from website...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
         <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="192"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="264"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="264"/>
         <source>The selected file could not be loaded.</source>
-        <translation>Cap&apos;n yer file can&apos;t be loaded.</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
-        <source>Deck is greater than maximum file size.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
-        <source>Are you sure you want to force start?
-This will kick all non-ready players from the game.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
-        <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1747,148 +1432,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="44"/>
         <source>New Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="46"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="51"/>
         <source>&amp;Host:</source>
         <translation>&amp;Cap&apos;n</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="56"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="61"/>
         <source>Player &amp;name:</source>
         <translation>Matey &amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="66"/>
         <source>P&amp;assword:</source>
         <translation>&amp;A stupendously secret code:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="72"/>
         <source>&amp;Save password</source>
         <translation>Record t&apos; &amp;stupendously secret code</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="74"/>
         <source>A&amp;uto connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="91"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="288"/>
         <source>Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="103"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="107"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="110"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="134"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="154"/>
         <source>Login</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="157"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="170"/>
         <source>Connect to Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="302"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="305"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="310"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="336"/>
         <source>Connection Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="336"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="351"/>
         <source>Connect Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="351"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -1896,117 +1581,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>Mateys:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>Stu&amp;pendously secret code:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="79"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="82"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Landlubbers be &amp;needin&apos; a stupendously secret code to watch</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Landlubbers can &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Landlubbers can see &amp;hands</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Landlubbers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="105"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Cap&apos;n? Thar be a problem wi&apos; t&apos; ship.</translation>
     </message>
@@ -2014,191 +1694,132 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Name:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;olor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>pure white</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>sea blue</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>deathly black</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>blood red</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>emerald green</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>colorless</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
-        <source>Create face-down (Only hides name)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="77"/>
         <source>Token data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="84"/>
         <source>Show &amp;all tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="86"/>
         <source>Show tokens from this &amp;deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="128"/>
         <source>Choose token from list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="146"/>
         <source>Create token</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgDefaultTagsEditor</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="45"/>
-        <source>Edit Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
-        <source>Add</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
-        <source>Confirm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
-        <source>Enter a tag and press Enter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
-        <source>✖</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
-        <source>Invalid Input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
-        <source>Tag name cannot be empty!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
-        <source>Duplicate Tag</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
-        <source>This tag already exists.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>No pic be picked!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
-        <translation>Change yer pic</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Open Pic</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Invalid pic be picked!</translation>
     </message>
@@ -2206,17 +1827,17 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2224,38 +1845,38 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Old stupendously secret code:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Freshly formed stupendously secret code:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Confirm freshly formed stupendously secret code:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Change t&apos; stupendously secret code</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>T&apos; freshly formed stupendously secret codes be failin&apos; to match!</translation>
     </message>
@@ -2263,93 +1884,93 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;olor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>pure white</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>sea blue</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>deathly black</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>blood red</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>emerald green</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>colorless</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="157"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="158"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation type="unfinished"/>
@@ -2358,27 +1979,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation type="unfinished"/>
     </message>
@@ -2386,142 +2007,132 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="50"/>
         <source>Game &amp;description:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="54"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Cap&apos;n name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="64"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="80"/>
         <source>&amp;Game types</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="85"/>
         <source>at &amp;least:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="92"/>
         <source>at &amp;most:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="105"/>
         <source>Maximum player count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="115"/>
         <source>Restrictions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="118"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="124"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="169"/>
         <source>Filter games</source>
         <translation type="unfinished"/>
     </message>
@@ -2529,52 +2140,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2582,37 +2193,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2620,86 +2231,86 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="58"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="103"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="111"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="121"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="116"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="121"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="127"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="127"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation type="unfinished"/>
     </message>
@@ -2707,7 +2318,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -2715,75 +2326,25 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <source>Load deck from clipboard</source>
         <translation>Find a flagship from t&apos; clipplank</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Invalid flagship list.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Find a flagship</translation>
     </message>
@@ -2791,37 +2352,37 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <source>Put top cards on stack until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -2829,91 +2390,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Cap&apos;n</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>Matey &amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>&amp;A stupendously secret code:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="318"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="353"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Board t&apos; ship</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="373"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="373"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2921,58 +2482,30 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgSelectSetForCards</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
-        <source>Unmodified Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
-        <source>Modified Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
-        <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
-        <source>Clear all set information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
-        <source>Set all to preferred</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1616"/>
         <source>Unknown Error loading card database</source>
         <translation>Cap&apos;n? Thar be a unknown problem wi&apos; t&apos; dock</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1624"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -2983,7 +2516,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1630"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -2994,7 +2527,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1636"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3003,21 +2536,21 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1642"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1646"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1650"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3026,117 +2559,77 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1658"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1668"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1678"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1669"/>
         <source>The path to your deck directory is invalid. Would you like to go back and set the correct path?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1679"/>
         <source>The path to your card pictures directory is invalid. Would you like to go back and set the correct path?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1691"/>
         <source>Settings</source>
         <translation>Cap&apos;n&apos;s orders</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1693"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1694"/>
         <source>Appearance</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1695"/>
         <source>User Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1696"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1697"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1698"/>
         <source>Sound</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1699"/>
         <source>Shortcuts</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgStartupCardCheck</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
-        <source>Card Update Check</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
-        <source>It has been more than %2 days since you last checked your card database for updates.
-Choose how you would like to run the card database updater.
-You can always change this behavior in the &apos;General&apos; settings tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
-        <source>Run in foreground</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
-        <source>Run in background</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
-        <source>Run in background and always from now on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
-        <source>Don&apos;t prompt again and don&apos;t run</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
-        <source>Don&apos;t run this time</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
@@ -3144,164 +2637,168 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="56"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="91"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="108"/>
         <source>Checking for updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3309,117 +2806,20 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="19"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Debug Log</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
-        <source>In %1 decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
-        <source>%1% of %2 decks</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecApiResponseCardPricesDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
-        <source>Card Hoarder</source>
-        <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="58"/>
-        <source>Card Kingdom</source>
-        <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="59"/>
-        <source>Card Market</source>
-        <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"/>
-        <source>Face 2-Face</source>
-        <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="61"/>
-        <source>Mana Pool</source>
-        <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="62"/>
-        <source>MTG Stocks</source>
-        <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="63"/>
-        <source>Scg</source>
-        <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="64"/>
-        <source>Tcgl</source>
-        <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="65"/>
-        <source>Tcgplayer</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
-        <source>%1% Synergy</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
-        <source>Combos</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
-        <source>Average Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <location filename="src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.cpp" line="35"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3427,174 +2827,128 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>FilterDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
-        <source>Confirm Delete</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
-        <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
-        <source>Delete Failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
-        <source>Failed to delete filter &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/game/game_selector.cpp" line="219"/>
+        <location filename="src/game/game_selector.cpp" line="222"/>
+        <location filename="src/game/game_selector.cpp" line="225"/>
+        <location filename="src/game/game_selector.cpp" line="228"/>
+        <location filename="src/game/game_selector.cpp" line="231"/>
+        <location filename="src/game/game_selector.cpp" line="234"/>
+        <location filename="src/game/game_selector.cpp" line="237"/>
+        <location filename="src/game/game_selector.cpp" line="240"/>
+        <location filename="src/game/game_selector.cpp" line="318"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/game/game_selector.cpp" line="219"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/game/game_selector.cpp" line="222"/>
         <source>Wrong password.</source>
         <translation>Ye don&apos;t know the stupendously secret code!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/game/game_selector.cpp" line="225"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Liliy-livered landlubbers - get off me ship!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/game/game_selector.cpp" line="228"/>
         <source>The game is already full.</source>
         <translation>T&apos; ship be full now.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/game/game_selector.cpp" line="231"/>
         <source>The game does not exist any more.</source>
         <translation>T&apos; ship be vanishin&apos;!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="234"/>
         <source>This game is only open to registered users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="237"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>T&apos; ship be only open for the cap&apos;n&apos;s first mates.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="240"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>T&apos; cap&apos;n be ignorin&apos; ye.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/game/game_selector.cpp" line="263"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/game/game_selector.cpp" line="266"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/game/game_selector.cpp" line="269"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/game/game_selector.cpp" line="303"/>
         <source>Join game</source>
         <translation>Board ship</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/game/game_selector.cpp" line="303"/>
         <source>Password:</source>
         <translation>Stupendously secret code:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/game/game_selector.cpp" line="318"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/game/game_selector.cpp" line="361"/>
         <source>&amp;Filter games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>C&amp;lear filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="364"/>
         <source>C&amp;reate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>&amp;Join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>J&amp;oin as spectator</source>
         <translation>B&amp;oard as landlubber</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/game/game_selector.cpp" line="387"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/game/game_selector.cpp" line="389"/>
         <source>Games</source>
         <translation>Ships</translation>
     </message>
@@ -3602,105 +2956,100 @@ You may have to manually download the new version.</source>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>stupendously secret code</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>first mates only</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="155"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Cap&apos;n</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Mateys</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Landlubbers</translation>
     </message>
@@ -3708,1241 +3057,825 @@ 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/dialogs/dlg_settings.cpp" line="320"/>
         <source>Reset all paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="149"/>
         <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/dialogs/dlg_settings.cpp" line="221"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="241"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="251"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="261"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="271"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="299"/>
         <source>Personal settings</source>
         <translation>Cap&apos;n&apos;s orders for t&apos; cap&apos;n</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="300"/>
         <source>Language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
         <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/dialogs/dlg_settings.cpp" line="305"/>
         <source>Paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="308"/>
         <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/dialogs/dlg_settings.cpp" line="309"/>
         <source>Decks directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
-        <source>Filters directory:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="310"/>
         <source>Replays directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="311"/>
         <source>Pictures directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="312"/>
         <source>Card database:</source>
         <translation>Dock:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="314"/>
         <source>Token database:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="315"/>
         <source>Update channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="316"/>
         <source>Check for client 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
-        <source>Don&apos;t check</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
-        <source>Prompt for update</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
-        <source>Check for card database updates every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
-        <source> days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="317"/>
         <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/dialogs/dlg_settings.cpp" line="318"/>
         <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/dialogs/dlg_settings.cpp" line="319"/>
         <source>Show tips on startup</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
-        <source>Last update check on %1 (%2 days ago)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <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="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>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="214"/>
-        <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>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="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="218"/>
-        <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>Move top cards to &amp;exile...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="221"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="224"/>
-        <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;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>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>Move bottom cards to &amp;graveyard...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="231"/>
-        <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>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="310"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
+        <location filename="src/client/ui/window_main.cpp" line="105"/>
+        <location filename="src/client/ui/window_main.cpp" line="458"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
+        <location filename="src/client/ui/window_main.cpp" line="108"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
+        <location filename="src/client/ui/window_main.cpp" line="111"/>
         <source>Banned by moderator</source>
         <translation>Cap&apos;n&apos;s thrown ye outta tha ship!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
+        <location filename="src/client/ui/window_main.cpp" line="114"/>
         <source>Expected end time: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
+        <location filename="src/client/ui/window_main.cpp" line="116"/>
         <source>This ban lasts indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
+        <location filename="src/client/ui/window_main.cpp" line="122"/>
         <source>Scheduled server shutdown.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
+        <location filename="src/client/ui/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="473"/>
         <source>Invalid username.</source>
         <translation>Yarrr, that ain&apos;t ye name ye scurvy landlubber!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
+        <location filename="src/client/ui/window_main.cpp" line="128"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="133"/>
         <source>Connection closed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
+        <location filename="src/client/ui/window_main.cpp" line="134"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
+        <location filename="src/client/ui/window_main.cpp" line="139"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
+        <location filename="src/client/ui/window_main.cpp" line="144"/>
         <source>Scheduled server shutdown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
+        <location filename="src/client/ui/window_main.cpp" line="183"/>
+        <location filename="src/client/ui/window_main.cpp" line="193"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="183"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
+        <location filename="src/client/ui/window_main.cpp" line="193"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
+        <location filename="src/client/ui/window_main.cpp" line="227"/>
         <source>Number of players</source>
         <translation>Number o&apos; mateys</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
+        <location filename="src/client/ui/window_main.cpp" line="227"/>
         <source>Please enter the number of players.</source>
         <translation>Me hearty, enter t&apos; number o&apos; mateys</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/client/ui/window_main.cpp" line="244"/>
+        <location filename="src/client/ui/window_main.cpp" line="251"/>
         <source>Player %1</source>
         <translation>Matey %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/client/ui/window_main.cpp" line="263"/>
         <source>Load replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/client/ui/window_main.cpp" line="315"/>
         <source>About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="317"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="318"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="318"/>
         <source>Project Manager:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="320"/>
         <source>Developers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Our Developers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Help Develop!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Translators:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Help Translate!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Support:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Report an Issue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/client/ui/window_main.cpp" line="372"/>
+        <location filename="src/client/ui/window_main.cpp" line="400"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="433"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="578"/>
+        <location filename="src/client/ui/window_main.cpp" line="588"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="608"/>
+        <location filename="src/client/ui/window_main.cpp" line="1194"/>
+        <location filename="src/client/ui/window_main.cpp" line="1240"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="372"/>
         <source>Server timeout</source>
         <translation>T&apos; ship be timin&apos; out!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="391"/>
         <source>Failed Login</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="392"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
+        <location filename="src/client/ui/window_main.cpp" line="393"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
+        <location filename="src/client/ui/window_main.cpp" line="401"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
+        <location filename="src/client/ui/window_main.cpp" line="411"/>
+        <location filename="src/client/ui/window_main.cpp" line="561"/>
         <source>You are banned until %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
+        <location filename="src/client/ui/window_main.cpp" line="413"/>
+        <location filename="src/client/ui/window_main.cpp" line="563"/>
         <source>You are banned indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
+        <location filename="src/client/ui/window_main.cpp" line="426"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
+        <location filename="src/client/ui/window_main.cpp" line="434"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
+        <location filename="src/client/ui/window_main.cpp" line="439"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="445"/>
         <source>Account activation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
+        <location filename="src/client/ui/window_main.cpp" line="446"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="457"/>
         <source>Server Full</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
+        <location filename="src/client/ui/window_main.cpp" line="463"/>
         <source>Unknown login error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
+        <location filename="src/client/ui/window_main.cpp" line="464"/>
+        <location filename="src/client/ui/window_main.cpp" line="580"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
+        <location filename="src/client/ui/window_main.cpp" line="476"/>
         <source>Your username must respect these rules:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="478"/>
         <source>is %1 - %2 characters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="479"/>
         <source>can %1 contain lowercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
+        <location filename="src/client/ui/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="490"/>
         <source>NOT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="481"/>
         <source>can %1 contain uppercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="484"/>
         <source>can %1 contain numeric characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
+        <location filename="src/client/ui/window_main.cpp" line="487"/>
         <source>can contain the following punctuation: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
+        <location filename="src/client/ui/window_main.cpp" line="490"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
+        <location filename="src/client/ui/window_main.cpp" line="497"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
+        <location filename="src/client/ui/window_main.cpp" line="507"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
+        <location filename="src/client/ui/window_main.cpp" line="513"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
+        <location filename="src/client/ui/window_main.cpp" line="519"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="545"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="556"/>
         <source>Registration denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
+        <location filename="src/client/ui/window_main.cpp" line="530"/>
         <source>Registration is currently disabled on this server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>There is already an existing account with the same user name.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
+        <location filename="src/client/ui/window_main.cpp" line="550"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="556"/>
         <source>Password too short.</source>
         <translation>The code be too piddly to be stupendously secret.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Unknown registration error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="588"/>
         <source>Account activation failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Socket error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
+        <location filename="src/client/ui/window_main.cpp" line="603"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
+        <location filename="src/client/ui/window_main.cpp" line="619"/>
         <source>Connecting to %1...</source>
         <translation>Boarding %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
+        <location filename="src/client/ui/window_main.cpp" line="623"/>
         <source>Registering to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Disconnected</source>
         <translation>Disembarked</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
+        <location filename="src/client/ui/window_main.cpp" line="629"/>
         <source>Connected, logging in at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
+        <location filename="src/client/ui/window_main.cpp" line="637"/>
+        <location filename="src/client/ui/window_main.cpp" line="642"/>
+        <location filename="src/client/ui/window_main.cpp" line="647"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="658"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Board ye ship...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="659"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Disembark</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="660"/>
         <source>Start &amp;local game...</source>
         <translation>Built &amp;local ship</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/client/ui/window_main.cpp" line="661"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="662"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/client/ui/window_main.cpp" line="663"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/client/ui/window_main.cpp" line="664"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Settings...</source>
         <translation>Cap&apos;n&apos;&amp;s orders</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>&amp;Exit</source>
         <translation>Dis&amp;embark</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="675"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="676"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="678"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="680"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="681"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>&amp;About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/client/ui/window_main.cpp" line="689"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
-        <source>Check for Card Updates (Automatic)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
-        <source>Show Status Bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/client/ui/window_main.cpp" line="691"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/client/ui/window_main.cpp" line="944"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <location filename="src/client/ui/window_main.cpp" line="945"/>
         <source>Congratulations on updating to Cockatrice %1!
 Oracle will now launch to update your card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/client/ui/window_main.cpp" line="949"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <location filename="src/client/ui/window_main.cpp" line="950"/>
         <source>Congratulations on installing Cockatrice %1!
 Oracle will now launch to install the initial card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1077"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <location filename="src/client/ui/window_main.cpp" line="1079"/>
         <source>Cockatrice is unable to load the card database.
 Do you want to update your card database now?
 If unsure or first time user, choose &quot;Yes&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/client/ui/window_main.cpp" line="1083"/>
+        <location filename="src/client/ui/window_main.cpp" line="1108"/>
         <source>Yes</source>
         <translation>AYE!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/client/ui/window_main.cpp" line="1084"/>
+        <location filename="src/client/ui/window_main.cpp" line="1109"/>
         <source>No</source>
         <translation>NAY!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/client/ui/window_main.cpp" line="1085"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/client/ui/window_main.cpp" line="1100"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <location filename="src/client/ui/window_main.cpp" line="1102"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/client/ui/window_main.cpp" line="1110"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/client/ui/window_main.cpp" line="1129"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/client/ui/window_main.cpp" line="1130"/>
         <source>Hi! It seems like you're running this version of Cockatrice for the first time.
 All the sets in the card database have been enabled.
 Read more about changing the set order or disabling specific sets and consequent effects in the &quot;Manage Sets&quot; dialog.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/client/ui/window_main.cpp" line="1140"/>
+        <location filename="src/client/ui/window_main.cpp" line="1290"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/client/ui/window_main.cpp" line="1140"/>
         <source>A card database update is already running.</source>
         <translation>A dock update be runnin&apos; already!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/client/ui/window_main.cpp" line="1195"/>
         <source>Unable to run the card database updater: </source>
         <translation>Cap&apos;n! We can&apos;t run the dock updater:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
-        <source>Card database update running.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <location filename="src/client/ui/window_main.cpp" line="1216"/>
         <source>Failed to start. The file might be missing, or permissions might be incorrect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/client/ui/window_main.cpp" line="1219"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <location filename="src/client/ui/window_main.cpp" line="1223"/>
         <source>Timed out. The process took too long to respond. The last waitFor...() function timed out.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <location filename="src/client/ui/window_main.cpp" line="1226"/>
         <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <location filename="src/client/ui/window_main.cpp" line="1230"/>
         <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/client/ui/window_main.cpp" line="1235"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/client/ui/window_main.cpp" line="1240"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
+        <location filename="src/client/ui/window_main.cpp" line="1291"/>
         <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.
 
@@ -4950,672 +3883,641 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
+        <location filename="src/client/ui/window_main.cpp" line="1319"/>
+        <location filename="src/client/ui/window_main.cpp" line="1325"/>
+        <location filename="src/client/ui/window_main.cpp" line="1353"/>
+        <location filename="src/client/ui/window_main.cpp" line="1357"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/client/ui/window_main.cpp" line="1319"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/client/ui/window_main.cpp" line="1325"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <location filename="src/client/ui/window_main.cpp" line="1354"/>
         <source>The new sets/cards have been added successfully.
 Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/client/ui/window_main.cpp" line="1357"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
+        <location filename="src/client/ui/window_main.cpp" line="1408"/>
+        <location filename="src/client/ui/window_main.cpp" line="1418"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
+        <location filename="src/client/ui/window_main.cpp" line="1409"/>
         <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/client/ui/window_main.cpp" line="1419"/>
         <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
+        <location filename="src/client/ui/window_main.cpp" line="1428"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaBaseWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
-        <source>Mana Base</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaCurveWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
-        <source>Mana Curve</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDevotionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
-        <source>Mana Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/server/message_log_widget.cpp" line="75"/>
         <source> from play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/server/message_log_widget.cpp" line="77"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/server/message_log_widget.cpp" line="79"/>
         <source> from exile</source>
         <translation>from the darkest depths o&apos; the lass&apos;s Davy Jones&apos; Locker</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/server/message_log_widget.cpp" line="81"/>
         <source> from their hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/server/message_log_widget.cpp" line="86"/>
         <source>the top card of %1&apos;s library</source>
         <translation>the top card o&apos; %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/server/message_log_widget.cpp" line="88"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/server/message_log_widget.cpp" line="93"/>
         <source> from the top of %1&apos;s library</source>
         <translation> from the top of %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/server/message_log_widget.cpp" line="95"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/server/message_log_widget.cpp" line="101"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>the bottom card o&apos; %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/server/message_log_widget.cpp" line="103"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/server/message_log_widget.cpp" line="108"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation> from the bottom o&apos; %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/server/message_log_widget.cpp" line="110"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/server/message_log_widget.cpp" line="115"/>
         <source> from %1&apos;s library</source>
         <translation> from %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/server/message_log_widget.cpp" line="117"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/server/message_log_widget.cpp" line="121"/>
         <source> from sideboard</source>
         <translation> from sideplank</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/server/message_log_widget.cpp" line="123"/>
         <source> from the stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
-        <source> from custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/server/message_log_widget.cpp" line="149"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <location filename="src/server/message_log_widget.cpp" line="150"/>
         <source>%1 is not revealing the top card %2 any longer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <location filename="src/server/message_log_widget.cpp" line="157"/>
         <source>%1 can now look at top card %2 at any time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <location filename="src/server/message_log_widget.cpp" line="158"/>
         <source>%1 no longer can look at top card %2 at any time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/server/message_log_widget.cpp" line="165"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/server/message_log_widget.cpp" line="175"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/server/message_log_widget.cpp" line="181"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/server/message_log_widget.cpp" line="188"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/server/message_log_widget.cpp" line="192"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/server/message_log_widget.cpp" line="208"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/server/message_log_widget.cpp" line="211"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/server/message_log_widget.cpp" line="215"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/server/message_log_widget.cpp" line="219"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/server/message_log_widget.cpp" line="227"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <location filename="src/server/message_log_widget.cpp" line="230"/>
         <source>%1 points from their %2 to %3&apos;s %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <location filename="src/server/message_log_widget.cpp" line="236"/>
         <source>%1 points from %2&apos;s %3 to their own %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <location filename="src/server/message_log_widget.cpp" line="242"/>
         <source>%1 points from %2&apos;s %3 to %4&apos;s %5.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
-        <source>%1 creates a face down token.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/server/message_log_widget.cpp" line="254"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/server/message_log_widget.cpp" line="263"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 be loadin&apos; a flagship (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <location filename="src/server/message_log_widget.cpp" line="265"/>
         <source>%1 has loaded a deck with %2 sideboard cards (%3).</source>
         <translation>%1 be loadin&apos; a flagship wi&apos; %2 sideplank cards (%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/server/message_log_widget.cpp" line="275"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/server/message_log_widget.cpp" line="310"/>
         <source>a card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/server/message_log_widget.cpp" line="316"/>
         <source>%1 gives %2 control over %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/server/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/server/message_log_widget.cpp" line="330"/>
         <source>%1 puts %2 into play%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/server/message_log_widget.cpp" line="333"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/server/message_log_widget.cpp" line="335"/>
         <source>%1 exiles %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/server/message_log_widget.cpp" line="337"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/server/message_log_widget.cpp" line="340"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <location filename="src/server/message_log_widget.cpp" line="342"/>
         <source>%1 puts %2%3 onto the bottom of their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/server/message_log_widget.cpp" line="344"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <location filename="src/server/message_log_widget.cpp" line="348"/>
         <source>%1 puts %2%3 into their library %4 cards from the top.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/server/message_log_widget.cpp" line="351"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/server/message_log_widget.cpp" line="354"/>
         <source>%1 plays %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
-        <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/server/message_log_widget.cpp" line="372"/>
         <source>%1 tries to draw from an empty library</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/server/message_log_widget.cpp" line="374"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/server/message_log_widget.cpp" line="384"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <location filename="src/server/message_log_widget.cpp" line="389"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <comment>top card for singular, top %3 cards for plural</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/server/message_log_widget.cpp" line="393"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/server/message_log_widget.cpp" line="393"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/server/message_log_widget.cpp" line="401"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/server/message_log_widget.cpp" line="404"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/server/message_log_widget.cpp" line="410"/>
         <source>The game has been closed.</source>
         <translation>T&apos; ship has been sunk!</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/server/message_log_widget.cpp" line="415"/>
         <source>The game has started.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/server/message_log_widget.cpp" line="421"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/server/message_log_widget.cpp" line="427"/>
         <source>%1 is now watching the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/server/message_log_widget.cpp" line="432"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/server/message_log_widget.cpp" line="439"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/server/message_log_widget.cpp" line="445"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <location filename="src/server/message_log_widget.cpp" line="451"/>
         <source>%1 is not ready to start the game any more.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <location filename="src/server/message_log_widget.cpp" line="460"/>
         <source>%1 shuffles their deck and draws a new hand of %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/server/message_log_widget.cpp" line="465"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/server/message_log_widget.cpp" line="471"/>
         <source>You are watching a replay of game #%1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/server/message_log_widget.cpp" line="476"/>
         <source>%1 is ready to start the game.</source>
         <translation>Yer mate %1 wants a duel!</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/server/message_log_widget.cpp" line="502"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <location filename="src/server/message_log_widget.cpp" line="504"/>
         <source>%1 card(s)</source>
         <comment>a card for singular, %1 cards for plural</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/server/message_log_widget.cpp" line="513"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/server/message_log_widget.cpp" line="518"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/server/message_log_widget.cpp" line="524"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/server/message_log_widget.cpp" line="530"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/server/message_log_widget.cpp" line="537"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/server/message_log_widget.cpp" line="545"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/server/message_log_widget.cpp" line="558"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/server/message_log_widget.cpp" line="565"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/server/message_log_widget.cpp" line="567"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/server/message_log_widget.cpp" line="567"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/server/message_log_widget.cpp" line="575"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/server/message_log_widget.cpp" line="575"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/server/message_log_widget.cpp" line="576"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/server/message_log_widget.cpp" line="580"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <location filename="src/server/message_log_widget.cpp" line="587"/>
         <source>%1 flips %2 coins. There are %3 heads and %4 tails.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/server/message_log_widget.cpp" line="597"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/server/message_log_widget.cpp" line="625"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/server/message_log_widget.cpp" line="631"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/server/message_log_widget.cpp" line="642"/>
+        <source>%1 places %2 %3 on %4 (now %5).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/server/message_log_widget.cpp" line="644"/>
+        <source>%1 removes %2 %3 from %4 (now %5).</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <location filename="src/server/message_log_widget.cpp" line="650"/>
+        <source>red counter(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <location filename="src/server/message_log_widget.cpp" line="653"/>
+        <source>yellow counter(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="src/server/message_log_widget.cpp" line="656"/>
+        <source>green counter(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/server/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/server/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/server/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/server/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <location filename="src/server/message_log_widget.cpp" line="713"/>
         <source>%1 changes the PT of %2 from nothing to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <location filename="src/server/message_log_widget.cpp" line="716"/>
         <source>%1 changes the PT of %2 from %3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/server/message_log_widget.cpp" line="724"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/server/message_log_widget.cpp" line="726"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/server/message_log_widget.cpp" line="744"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/server/message_log_widget.cpp" line="744"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/server/message_log_widget.cpp" line="747"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/server/message_log_widget.cpp" line="747"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/server/message_log_widget.cpp" line="763"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/server/message_log_widget.cpp" line="767"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/server/message_log_widget.cpp" line="772"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/server/message_log_widget.cpp" line="777"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/server/message_log_widget.cpp" line="793"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/server/message_log_widget.cpp" line="799"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/server/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -5623,201 +4525,163 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1289"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1290"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1291"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1241"/>
         <source>Add message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1241"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1254"/>
         <source>Message:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1254"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1272"/>
         <source>Chat settings</source>
         <translation>Cap&apos;n&apos;s orders for t&apos; chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1273"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1274"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1275"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1276"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1278"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1279"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1280"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1282"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1283"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1284"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1285"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1286"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1287"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1288"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="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="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="60"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="62"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -5825,17 +4689,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -5843,62 +4707,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="17"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="19"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="20"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="21"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="22"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="23"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="24"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="26"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -5906,57 +4770,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation>Step where ye be untappin&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation>Step where ye be upkeepin&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation>Step where ye be drawin&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/client/ui/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="162"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation>Step where ye begin fightin&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation>Step where ye be orderin&apos; ye men to board</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation>Step where ye be orderin&apos; ye men to repel boarders</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation>Step where people get hurt</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation>Step where ye stop fightin&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/client/ui/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="174"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Step where ye be endin&apos; ye turn</translation>
     </message>
@@ -5964,192 +4828,702 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="219"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
-        <source>View top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="666"/>
+        <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game/player/player.cpp" line="667"/>
+        <location filename="src/game/player/player.cpp" line="1141"/>
+        <location filename="src/game/player/player.cpp" line="1154"/>
+        <location filename="src/game/player/player.cpp" line="1227"/>
+        <location filename="src/game/player/player.cpp" line="1256"/>
+        <location filename="src/game/player/player.cpp" line="1290"/>
+        <location filename="src/game/player/player.cpp" line="1315"/>
+        <location filename="src/game/player/player.cpp" line="1387"/>
+        <location filename="src/game/player/player.cpp" line="1419"/>
+        <location filename="src/game/player/player.cpp" line="1590"/>
+        <location filename="src/game/player/player.cpp" line="1622"/>
+        <location filename="src/game/player/player.cpp" line="1738"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game/player/player.cpp" line="758"/>
+        <source>&amp;View graveyard</source>
+        <translation>&amp;View Davy Jones&apos; Locker</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="759"/>
+        <source>&amp;View exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="761"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>Matey &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="762"/>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="905"/>
+        <source>&amp;Graveyard</source>
+        <translation>Davy Jones&apos; Locker</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="763"/>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="906"/>
+        <source>&amp;Exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;Move hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <location filename="src/game/player/player.cpp" line="773"/>
+        <location filename="src/game/player/player.cpp" line="779"/>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="768"/>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="772"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;Hand</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <source>&amp;Move exile to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <source>&amp;View library</source>
+        <translation>&amp;View library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="785"/>
+        <source>&amp;View hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>View &amp;top cards o&apos; library...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>Reveal &amp;library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;Always reveal top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>&amp;View sideboard</source>
+        <translation>&amp;View sideplank</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;Draw card</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>D&amp;raw cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Undo last draw</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>Take &amp;mulligan</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>Play top card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="809"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>Move top cards to Davy Jones&apos; Locker</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="811"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>&amp;Reveal hand to...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>&amp;Sideboard</source>
+        <translation>&amp;Sideplank</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>&amp;Counters</source>
+        <translation>Pie&amp;ces o&apos; eight</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <source>&amp;Untap all permanents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>R&amp;oll die...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>&amp;Create token...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>C&amp;reate another token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="845"/>
+        <location filename="src/game/player/player.cpp" line="1092"/>
+        <source>&amp;All players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="855"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="856"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="857"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="859"/>
+        <source>&amp;Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <source>&amp;Hide</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="861"/>
+        <source>Play &amp;Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="863"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="866"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="869"/>
+        <source>&amp;Peek at card face</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Clone</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>Attac&amp;h to card...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>Unattac&amp;h</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="873"/>
+        <source>&amp;Draw arrow...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Increase power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Decrease power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="877"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="880"/>
+        <source>Increase power and decrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>Decrease power and increase toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="882"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="883"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Set annotation...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Red</source>
+        <translation>Blood red</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>Yellow</source>
+        <translation>Fool&apos;s gold</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>Green</source>
+        <translation>Emerald green</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="901"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="902"/>
+        <source>X cards from the top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="903"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1141"/>
+        <source>View top cards of library</source>
+        <translation>View top cards o&apos; library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1154"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game/player/player.cpp" line="1227"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player.cpp" line="1255"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
-        <source>Draw cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <source>Create tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game/player/player.cpp" line="3110"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game/player/player.cpp" line="3110"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game/player/player.cpp" line="1289"/>
+        <source>Draw hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1291"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1315"/>
+        <source>Draw cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1991"/>
+        <location filename="src/game/player/player.cpp" line="3669"/>
+        <source>Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1387"/>
+        <source>Move top cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="791"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="821"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1419"/>
+        <source>Move top cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1590"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1622"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1738"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1843"/>
+        <location filename="src/game/player/player.cpp" line="4189"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1991"/>
+        <source>Create tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3109"/>
+        <source>Place card X cards from top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3456"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game/player/player.cpp" line="3456"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game/player/player.cpp" line="3575"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game/player/player.cpp" line="3576"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game/player/player.cpp" line="3669"/>
         <source>Set counters</source>
-        <translation type="unfinished"/>
+        <translation>Set pieces o&apos; eight</translation>
     </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
-        <source>Player &quot;%1&quot;</source>
+        <location filename="src/game/player/player.cpp" line="3944"/>
+        <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
-        <source>&amp;Counters</source>
+        <location filename="src/game/player/player.cpp" line="4014"/>
+        <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/game/player/player.cpp" line="4062"/>
+        <source>Token: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4079"/>
+        <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="106"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="110"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6157,7 +5531,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"/>
     </message>
@@ -6165,17 +5539,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="17"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
-        <source>Bulk Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="20"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6183,124 +5552,66 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Descending</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="755"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="756"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/client/ui/window_main.cpp" line="757"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/client/ui/window_main.cpp" line="758"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="759"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="760"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="761"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6308,135 +5619,125 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="82"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/client/ui/window_main.cpp" line="83"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/client/ui/window_main.cpp" line="265"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="112"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="114"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="116"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
-        <source>Overwrite Existing File?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
-        <source>A .cod version of this deck already exists. Overwrite it?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="764"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="765"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="766"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="767"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="768"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="769"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/client/ui/window_main.cpp" line="777"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/client/ui/window_main.cpp" line="778"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -6444,17 +5745,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation type="unfinished"/>
     </message>
@@ -6462,108 +5763,70 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <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="60"/>
-        <source>&amp;View exile</source>
-        <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;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="67"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="56"/>
         <source>Joi&amp;n</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="63"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
@@ -6571,32 +5834,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SequenceEdit</name>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation type="unfinished"/>
     </message>
@@ -6604,27 +5867,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -6632,53 +5895,53 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1486"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <source>Do you really want to restore all default shortcuts?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1471"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1472"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1481"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1482"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1483"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1485"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1487"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1488"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6686,12 +5949,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -6699,13 +5962,13 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -6714,58 +5977,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1365"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1366"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1367"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1368"/>
         <source>Sound settings</source>
         <translation>Cap&apos;n&apos;s orders for t&apos; shanties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1369"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -6773,48 +6023,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -6822,27 +6072,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -6850,17 +6100,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -6868,112 +6118,112 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"/>
     </message>
@@ -6981,277 +6231,192 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="116"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Flagship: %1</translation>
     </message>
 </context>
-<context>
-    <name>TabDeckEditorVisual</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
-        <source>Visual Deck: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
-        <source>&amp;Visual Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
-        <source>Card Info</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
-        <source>Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
-        <source>&amp;View</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
-        <source>Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
-        <source>Visible</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
-        <source>Floating</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
-        <source>Reset layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabDeckEditorVisualTabWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
-        <source>Visual Deck View</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
-        <source>Visual Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
-        <source>Deck Analytics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
-        <source>Sample Hand</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>O&apos;er ship&apos;s flagship port</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Open in dock</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="175"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="374"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="511"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="179"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="351"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Enter flagship name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Unnamed flagship</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="351"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="389"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="389"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="548"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="548"/>
         <source>Are you sure you want to delete the selected decks?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="374"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="511"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -7259,17 +6424,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7277,404 +6442,381 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="22"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabEdhRecMain</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
-        <source>&amp;Cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
-        <source>Top Commanders</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
-        <source>Tags</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
-        <source>EDHRec: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="195"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1234"/>
         <source>Replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="195"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="209"/>
         <source>Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <source>Player List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="268"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>Messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="282"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="220"/>
         <source>&amp;Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="223"/>
         <source>&amp;Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>Next &amp;phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="228"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="231"/>
         <source>Next &amp;turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="234"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="237"/>
         <source>&amp;Remove all local arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="240"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="243"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="246"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="249"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="255"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="258"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="261"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="264"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="267"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="283"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="276"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="287"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="484"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="484"/>
         <source>Are you sure you want to concede this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="490"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="491"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="509"/>
         <source>Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="509"/>
         <source>Are you sure you want to leave this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1053"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
-        <source>You have been kicked out of the game.</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
-        <source>Home</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
+        <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="67"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="149"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="153"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="157"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="161"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="165"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="172"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="176"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="180"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="184"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="187"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="191"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="207"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="217"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="226"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="233"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>Message History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="271"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="277"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -7682,37 +6824,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation type="unfinished"/>
     </message>
@@ -7720,185 +6862,105 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="160"/>
         <source>Server replay storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Watch replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="273"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="170"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Download replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="237"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="237"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="240"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="255"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="255"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="273"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="288"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="288"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="448"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
-        <source>Failed to get code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Either this server does not support replay sharing, or does not permit replay sharing for you.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
-        <source>Failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
-        <source>Replay Share Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Others can use this code to add the replay to their list of remote replays:
-%1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="447"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -7906,47 +6968,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="144"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="145"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>&amp;Leave room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>Chat Settings...</source>
         <translation>Cap&apos;n&apos;s orders for t&apos; chat...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="161"/>
         <source> mentioned you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="169"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="214"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation type="unfinished"/>
     </message>
@@ -7954,35 +7016,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="223"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="209"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="214"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="219"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="224"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -7990,92 +7052,72 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="178"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
-        <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
-        <source>EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="179"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
-        <source>Visual Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="180"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="181"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="182"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="183"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="184"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="185"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="242"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="890"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="918"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="959"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="960"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8083,61 +7125,53 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="965"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="965"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="969"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="970"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="974"/>
         <source>Warned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="975"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="989"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabVisualDatabaseDisplay</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
-        <source>Visual Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation type="unfinished"/>
     </message>
@@ -8145,13 +7179,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"/>
@@ -8160,42 +7194,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -8203,7 +7237,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
@@ -8211,206 +7245,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="76"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="77"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <source>This user does not exist.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="93"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="163"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Ban History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="169"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="187"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="191"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="213"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="234"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="238"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="218"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="206"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="235"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="223"/>
         <source>User has never been warned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="227"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="247"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="235"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="255"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="253"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="255"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="247"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="235"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="260"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="262"/>
         <source>Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="260"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="262"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="348"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="368"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8418,173 +7430,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="321"/>
+        <location filename="src/server/user/user_info_box.cpp" line="342"/>
+        <location filename="src/server/user/user_info_box.cpp" line="366"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="321"/>
         <source>User information updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="271"/>
+        <location filename="src/server/user/user_info_box.cpp" line="324"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="332"/>
+        <location filename="src/server/user/user_info_box.cpp" line="345"/>
+        <location filename="src/server/user/user_info_box.cpp" line="348"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="355"/>
+        <location filename="src/server/user/user_info_box.cpp" line="369"/>
+        <location filename="src/server/user/user_info_box.cpp" line="373"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="234"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="272"/>
+        <location filename="src/server/user/user_info_box.cpp" line="333"/>
+        <location filename="src/server/user/user_info_box.cpp" line="356"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="325"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="342"/>
         <source>Password changed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="345"/>
         <source>This server does not permit you to change your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="348"/>
         <source>The new password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>The old password is incorrect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="366"/>
         <source>Avatar updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="369"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="373"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation type="unfinished"/>
     </message>
@@ -8592,137 +7604,102 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="707"/>
         <source>General interface settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="708"/>
         <source>&amp;Double-click cards to play them (instead of single-click)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="709"/>
         <source>&amp;Clicking plays all selected cards (instead of just the clicked card)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="710"/>
         <source>&amp;Play all nonlands onto the stack (not the battlefield) by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="711"/>
         <source>Close card view window when last card is removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
-        <source>Auto focus search bar when card view window is opened</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="712"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="713"/>
         <source>Use tear-off menus, allowing right click menus to persist on screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="714"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="715"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="716"/>
         <source>Notify in the taskbar for game events while you are spectating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="717"/>
         <source>Notify in the taskbar when users in your buddy list connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="718"/>
         <source>Animation settings</source>
         <translation>Cap&apos;n&apos;s orders for t&apos; things that be movin&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="719"/>
         <source>&amp;Tap/untap animation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="720"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="721"/>
         <source>Open deck in new tab by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="722"/>
+        <source>Prompt before converting .txt decks to .cod format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="723"/>
+        <source>Always convert if not prompted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="724"/>
         <source>Use visual deck storage in game lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
-        <source>Use selection animation for Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
-        <source>When adding a tag in the visual deck storage to a .txt deck:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
-        <source>do nothing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
-        <source>ask to convert to .cod</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
-        <source>always convert to .cod</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
-        <source>Default deck editor type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <source>Classic Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
-        <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="725"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="726"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -8730,380 +7707,61 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayColorFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
-        <source>Save Filter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
-        <source>Save all currently applied filters to a file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
-        <source>Enter filename...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
-        <source>Do not display card main-types with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
-        <source>Apply all card names in clipboard as exact match name filters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
-    <message>
-        <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>
-</context>
-<context>
-    <name>VisualDatabaseDisplaySetFilterWidget</name>
-    <message>
-        <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="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="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>
-</context>
-<context>
-    <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
-    <message>
-        <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="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="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="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="172"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
-        <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
-        <source>Clear all filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorSampleHandWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
-        <source>Draw a new sample hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
-        <source>Sample hand size</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
-        <source>Quick search and add card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
-        <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDeckStorageQuickSettingsWidget</name>
-    <message>
-        <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="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="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="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="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="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="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="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="130"/>
-        <source>Filepath</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
-        <source>Search by filename (or search expression)</source>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="20"/>
+        <source>Search by filename</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -9111,61 +7769,86 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="183"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
-        <source>Refresh loaded files</source>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="185"/>
+        <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
-        <source>Visual Deck Storage Settings</source>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="186"/>
+        <source>Show Tag Filter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="187"/>
+        <source>Show Tags On Deck Previews</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="188"/>
+        <source>Show Banner Card Selection Option</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="189"/>
+        <source>Include Folder Names in Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="190"/>
+        <source>Draw unused Color Identities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="191"/>
+        <source>Unused Color Identities Opacity</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"/>
     </message>
@@ -9173,133 +7856,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WndSets</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="40"/>
         <source>Move selected set to the top</source>
         <translation>Move selected fleet to the top</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="47"/>
         <source>Move selected set up</source>
         <translation>Move selected fleet up</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="54"/>
         <source>Move selected set down</source>
         <translation>Move selected fleet down</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="61"/>
         <source>Move selected set to the bottom</source>
         <translation>Move selected fleet to the bottom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="69"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="75"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Enable all sets</source>
         <translation>Enable all fleets</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="113"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="113"/>
         <source>Disable all sets</source>
         <translation>Disable all fleets</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="114"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="114"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="115"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="136"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="136"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom)</source>
         <comment>%1 is a link to the wiki</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
-        <source>Include cards rebalanced for Alchemy [requires restart]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="143"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="147"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="150"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="154"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="155"/>
         <source>To enable ordering again, click the column header until this message disappears.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="159"/>
         <source>Sorts the set priority using the same column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="167"/>
+        <source>Include online-only (Arena) cards [requires restart]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="197"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9307,72 +7990,67 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
-        <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="195"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="196"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="197"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="198"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="205"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="206"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="207"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="208"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="209"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="210"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="211"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="215"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="216"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -9380,7 +8058,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/settings/cache_settings.cpp" line="167"/>
         <source>English</source>
         <translation>English, arr! (Pirate English)</translation>
     </message>
@@ -9388,12 +8066,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="236"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -9401,1005 +8079,906 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="669"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/settings/shortcuts_settings.h" line="180"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/settings/shortcuts_settings.h" line="190"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/settings/shortcuts_settings.h" line="191"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/settings/shortcuts_settings.h" line="201"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/settings/shortcuts_settings.h" line="205"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/settings/shortcuts_settings.h" line="215"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/settings/shortcuts_settings.h" line="219"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/settings/shortcuts_settings.h" line="223"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/settings/shortcuts_settings.h" line="230"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/settings/shortcuts_settings.h" line="637"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/settings/shortcuts_settings.h" line="242"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/settings/shortcuts_settings.h" line="249"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/settings/shortcuts_settings.h" line="253"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/settings/shortcuts_settings.h" line="257"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
+        <location filename="src/settings/shortcuts_settings.h" line="349"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/settings/shortcuts_settings.h" line="352"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="355"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="286"/>
+        <source>Add Yellow Counter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="289"/>
+        <source>Remove Yellow Counter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="292"/>
+        <source>Set Yellow Counters...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="295"/>
+        <location filename="src/settings/shortcuts_settings.h" line="340"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="298"/>
+        <location filename="src/settings/shortcuts_settings.h" line="343"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="301"/>
+        <location filename="src/settings/shortcuts_settings.h" line="346"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="304"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
-        <source>Show Status Bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
-        <source>Unload Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
-        <source>Force Start</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
-        <source>Add Card Counter (F)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
-        <source>Remove Card Counter (F)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
-        <source>Set Card Counters (F)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
-        <source>Add Card Counter (E)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
-        <source>Remove Card Counter (E)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
-        <source>Set Card Counters (E)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
-        <source>Add Card Counter(D)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
-        <source>Remove Card Counter (D)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
-        <source>Set Card Counters (D)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
-        <source>Add Card Counter (C)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
-        <source>Remove Card Counter (C)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
-        <source>Set Card Counters (C)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
-        <source>Add Card Counter (B)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
-        <source>Remove Card Counter (B)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
-        <source>Set Card Counters (B)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
-        <source>Add Card Counter (A)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
-        <source>Remove Card Counter (A)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
-        <source>Set Card Counters (A)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="307"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="310"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="313"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="316"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="319"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="322"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="325"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="328"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="331"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="334"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="337"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="358"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="361"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="364"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="367"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="370"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="373"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/settings/shortcuts_settings.h" line="376"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="379"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="382"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="385"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="388"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="391"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="394"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="397"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="400"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="403"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="406"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/settings/shortcuts_settings.h" line="412"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/settings/shortcuts_settings.h" line="420"/>
         <source>Attack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/settings/shortcuts_settings.h" line="424"/>
         <source>Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/settings/shortcuts_settings.h" line="432"/>
         <source>End</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/settings/shortcuts_settings.h" line="433"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="436"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="439"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="442"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="445"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="448"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="451"/>
         <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/settings/shortcuts_settings.h" line="454"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="457"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="463"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/settings/shortcuts_settings.h" line="466"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/settings/shortcuts_settings.h" line="469"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="475"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="478"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="481"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="484"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="487"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="490"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/settings/shortcuts_settings.h" line="493"/>
+        <location filename="src/settings/shortcuts_settings.h" line="553"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/settings/shortcuts_settings.h" line="496"/>
+        <location filename="src/settings/shortcuts_settings.h" line="520"/>
+        <location filename="src/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/settings/shortcuts_settings.h" line="568"/>
         <source>Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/settings/shortcuts_settings.h" line="499"/>
+        <location filename="src/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
+        <location filename="src/settings/shortcuts_settings.h" line="514"/>
         <source>Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/settings/shortcuts_settings.h" line="572"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="510"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="527"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="530"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="557"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="542"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="569"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/settings/shortcuts_settings.h" line="575"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/settings/shortcuts_settings.h" line="578"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/settings/shortcuts_settings.h" line="581"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/settings/shortcuts_settings.h" line="584"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/settings/shortcuts_settings.h" line="587"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/settings/shortcuts_settings.h" line="591"/>
         <source>Concede</source>
         <translation>Parley</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/settings/shortcuts_settings.h" line="592"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/settings/shortcuts_settings.h" line="595"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/settings/shortcuts_settings.h" line="607"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="610"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/settings/shortcuts_settings.h" line="613"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/settings/shortcuts_settings.h" line="616"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/settings/shortcuts_settings.h" line="619"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/settings/shortcuts_settings.h" line="622"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/settings/shortcuts_settings.h" line="625"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/settings/shortcuts_settings.h" line="628"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/settings/shortcuts_settings.h" line="634"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/settings/shortcuts_settings.h" line="640"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/settings/shortcuts_settings.h" line="643"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/settings/shortcuts_settings.h" line="646"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/settings/shortcuts_settings.h" line="649"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/settings/shortcuts_settings.h" line="652"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/settings/shortcuts_settings.h" line="655"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/settings/shortcuts_settings.h" line="658"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/settings/shortcuts_settings.h" line="663"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="667"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="673"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/settings/shortcuts_settings.h" line="678"/>
         <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..529c8a5dc 100644
--- a/cockatrice/translations/cockatrice_en_US.ts
+++ b/cockatrice/translations/cockatrice_en_US.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Set counter...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Set counter</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>New value for counter &apos;%1&apos;:</translation>
     </message>
@@ -23,96 +23,92 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <source>&amp;Refresh</source>
-        <translation>&amp;Refresh</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
-        <translation>Parse Set Name and Number (if available)</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/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <source>Open in new tab</source>
-        <translation>Open in new tab</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <source>Are you sure?</source>
-        <translation>Are you sure?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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>
+        <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
-        <translation>Error</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <source>Could not open deck at %1</source>
-        <translation>Could not open deck at %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
-        <translation>Could not save remote deck</translation>
+        <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/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="374"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <source>Save deck</source>
-        <translation>Save deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="409"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <source>The deck could not be saved.</source>
-        <translation>The deck could not be saved.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="532"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
-        <translation>There are no cards in your deck to be exported</translation>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
-        <translation>Add Analytics Panel</translation>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation>Update Notes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation>Admin Notes for %1</translation>
     </message>
@@ -120,12 +116,12 @@ Please check that the directory is writable and try again.</translation>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -133,312 +129,251 @@ 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"/>
-        <source> seconds</source>
-        <translation> seconds</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>Theme settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Current theme:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation>Open themes folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <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"/>
-        <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"/>
-        <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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation>Menu settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation>Card rendering</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <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"/>
-        <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>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
+        <translation>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <source>Use rounded card corners</source>
-        <translation>Use rounded card corners</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation> rows</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <source>Maximum expanded height for card view window:</source>
-        <translation>Maximum expanded height for card view window:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
-        <translation>Card counters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
-        <translation>Counter %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
         <translation>Hand layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <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/dialogs/dlg_settings.cpp" line="691"/>
         <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/dialogs/dlg_settings.cpp" line="692"/>
         <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/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximum font size for information displayed on cards:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation>Open Deck in Deck Editor</translation>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation>Theme</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation>Art crop of random card</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation>Art crop of background.cod deck file</translation>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>ban &amp;user name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>ban &amp;IP address</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>ban client I&amp;D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Ban type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;permanent ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;temporary ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Days:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Hours:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutes:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Duration of the ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Please enter the reason for the ban that will be visible to the banned person.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Redact all messages from this user in all rooms</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Ban user from server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>You must have a value in the name ban when selecting the name ban checkbox.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>You must have a value in the ip ban when selecting the ip ban checkbox.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>You must have a value in the clientid ban when selecting the clientid ban checkbox.</translation>
     </message>
@@ -446,22 +381,22 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>No reply received from the release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Invalid reply received from the release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>No reply received from the file update server.</translation>
     </message>
@@ -469,32 +404,32 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Sets</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Mana cost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Card type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Color(s)</translation>
     </message>
@@ -502,1027 +437,807 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>AND</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OR</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>AND NOT</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OR NOT</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation>Name (Exact)</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Color</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Mana Cost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>Mana Value</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Rarity</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Power</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Toughness</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Loyalty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
-        <translation>Main Type</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
-        <translation>Sub Type</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation>Both</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
-        <translation>View transformation</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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <source>Add card to deck</source>
-        <translation>Add card to deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
-        <translation>Mainboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
-        <translation>Sideboard</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation>Set:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation>Collector Number:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation>Related cards:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation>Unknown card:</translation>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation>Re&amp;veal to...</translation>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Move to</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation>&amp;All players</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation>View related cards</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation>Token: </translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation>All tokens</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation>&amp;Select All</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Play</source>
-        <translation>&amp;Play</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation>&amp;Hide</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <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"/>
-        <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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
-        <source>T&amp;urn Over</source>
-        <extracomment>Turn face up/face down</extracomment>
-        <translation>T&amp;urn Over</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="460"/>
-        <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"/>
-        <source>&amp;Clone</source>
-        <translation>&amp;Clone</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <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"/>
-        <source>Unattac&amp;h</source>
-        <translation>Unattac&amp;h</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation>&amp;Draw arrow...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation>&amp;Set annotation...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation>&amp;Set counters (%1)...</translation>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Power / toughness</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation>Card Size</translation>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <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/card_zone.cpp" line="63"/>
         <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/card_zone.cpp" line="67"/>
         <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/card_zone.cpp" line="68"/>
         <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/card_zone.cpp" line="70"/>
         <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/card_zone.cpp" line="71"/>
         <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="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="81"/>
         <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/card_zone.cpp" line="81"/>
         <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/card_zone.cpp" line="83"/>
         <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/card_zone.cpp" line="83"/>
         <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/card_zone.cpp" line="87"/>
         <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="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <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/card_zone.cpp" line="96"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
-        <translation>their custom zone &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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
-        <translation>%1&apos;s custom zone &apos;%2&apos;</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation>Parse error at line %1 col %2:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation>Parse error at line %1 col %2:</translation>
-    </message>
-</context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation>C&amp;ustom Zones</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation>View custom zone &apos;%1&apos;</translation>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation>Add Panel</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation>Remove Panel</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation>Save Layout</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation>Load Layout</translation>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation>Card Database</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/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
-        <translation>Card Info</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
-        <translation>Search by card name (or search expressions)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
-        <translation>Add to Deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
-        <translation>Add to Sideboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
-        <translation>Select Printing</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation>Show on EDHRec (Commander)</translation>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation>Show on EDHRec (Card)</translation>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <source>Show Related cards</source>
-        <translation>Show Related cards</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <source>Add card to &amp;maindeck</source>
-        <translation>Add card to &amp;maindeck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="242"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
-        <translation>Add card to &amp;sideboard</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
-        <source>Loading Database...</source>
-        <translation>Loading Database...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <source>Banner Card</source>
-        <translation>Banner Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <source>Main Type</source>
-        <translation>Main Type</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <source>Mana Cost</source>
-        <translation>Mana Cost</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <source>Colors</source>
-        <translation>Colors</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
-        <translation>Select Printing</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
-        <translation>Deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
-        <translation>Deck &amp;name:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
-        <translation>Banner Card/Tags Visibility Settings</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
-        <translation>Show banner card selection menu</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
-        <translation>Show tags selection menu</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
-        <translation>&amp;Comments:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
-        <translation>Group by:</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>Format:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
-        <translation>Hash:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
-        <translation>&amp;Increment number</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
-        <translation>&amp;Decrement number</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
-        <translation>&amp;Remove row</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
-        <translation>Swap card to/from sideboard</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <source>Filters</source>
-        <translation>Filters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>&amp;Clear all filters</source>
-        <translation>&amp;Clear all filters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
-        <translation>Delete selected</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
-        <translation>&amp;Deck Editor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
-        <translation>&amp;New deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
-        <translation>&amp;Load deck...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
-        <translation>Load recent deck...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
-        <translation>Clear</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
-        <translation>&amp;Save deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
-        <translation>Save deck &amp;as...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
-        <translation>Load deck from cl&amp;ipboard...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
-        <translation>Edit deck in clipboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
-        <translation>Annotated</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
-        <translation>Not Annotated</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
-        <translation>Save deck to clipboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
-        <translation>Annotated (No set info)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
-        <translation>Not Annotated (No set info)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
-        <translation>&amp;Print deck...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation>Load deck from online service...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
-        <translation>&amp;Send deck to online service</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
-        <translation>Create decklist (decklist.org)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
-        <translation>Create decklist (decklist.xyz)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
-        <translation>Analyze deck (deckstats.net)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
-        <translation>Analyze deck (tappedout.net)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
-        <translation>&amp;Close</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
-        <translation>Printing Selector</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>Success</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation>Edit URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <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/dialogs/dlg_settings.cpp" line="1219"/>
         <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/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <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/dialogs/dlg_settings.cpp" line="1224"/>
         <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/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation>Remove URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation>Day(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>Updating...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation>Choose path</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <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/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <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/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Location:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>Last Change</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <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/dialogs/dlg_settings.cpp" line="1216"/>
         <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/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>In-memory cache for pictures not currently on screen</translation>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation>Undo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation>Redo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation>Undo/Redo history</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation>Click on an entry to revert to that point in the history.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation>[redo] </translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation>[undo] </translation>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation>Count</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>Number</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Card</translation>
     </message>
@@ -1530,268 +1245,210 @@ 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/deck/deck_loader.cpp" line="22"/>
         <source>Common deck formats (%1)</source>
-        <translation>Common deck formats (%1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
-        <translation>All files (*.*)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
-        <translation>Mode: Exact Match</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
-        <translation>Mode: Includes</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation>Color identity filter mode (AND/OR/NOT conjunctions of filters)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
-        <translation>Edit tags ...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
-        <translation>Deck Tags Manager</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
-        <translation>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
-        <translation>Add a new tag (e.g., Aggro️)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
-        <translation>Add Tag</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
-        <translation>Filter tags...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
-        <translation>Edit default tags</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
-        <translation>Cancel</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
-        <translation>Invalid Input</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
-        <translation>Tag name cannot be empty!</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
-        <translation>Duplicate Tag</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
-        <translation>This tag already exists.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
-        <translation>Banner Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <source>Open in deck editor</source>
-        <translation>Open in deck editor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <source>Edit Tags</source>
-        <translation>Edit Tags</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <source>Rename Deck</source>
-        <translation>Rename Deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <source>Save Deck to Clipboard</source>
-        <translation>Save Deck to Clipboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <source>Annotated</source>
-        <translation>Annotated</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <source>Annotated (No set info)</source>
-        <translation>Annotated (No set info)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <source>Not Annotated</source>
-        <translation>Not Annotated</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <source>Not Annotated (No set info)</source>
-        <translation>Not Annotated (No set info)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <source>Rename File</source>
-        <translation>Rename File</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <source>Delete File</source>
-        <translation>Delete File</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <source>Set Banner Card</source>
-        <translation>Set Banner Card</translation>
+        <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <source>New name:</source>
-        <translation>New name:</translation>
+        <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Error</source>
-        <translation>Error</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <source>Rename failed</source>
-        <translation>Rename failed</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Delete file</source>
-        <translation>Delete file</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Are you sure you want to delete the selected file?</source>
-        <translation>Are you sure you want to delete the selected file?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
-        <translation>Delete failed</translation>
-    </message>
-</context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation>Rename deck to &quot;%1&quot; from &quot;%2&quot;</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation>Updated comments (was %1 chars, now %2 chars)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation>Set banner card to %1 (%2)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation>Tags changed</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation>Set format to %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation>Added (%1): %2 (%3) %4</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Added</source>
-        <translation>Added</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation>Removed</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>The reply from the server could not be parsed.</translation>
     </message>
@@ -1811,234 +1468,227 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
-        <translation>Load from clipboard...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
-        <translation>Load from website...</translation>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation>Unload deck</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Ready to start</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation>Force start</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation>Sideboard unlocked</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <source>Deck is greater than maximum file size.</source>
-        <translation>Deck is greater than maximum file size.</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="329"/>
         <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>
+        <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="331"/>
         <source>Cockatrice</source>
-        <translation>Cockatrice</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
-        <translation>Deck Format Conversion</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
-        <translation>You tried to add a tag to a .txt format deck.
- Tags can only be added to .cod format decks.
- Do you want to convert the deck to the .cod format?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
-        <translation>Remember and automatically apply choice in the future</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Downloading...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Known Hosts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation>Delete the currently selected saved server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Refresh the server list with known public servers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>New Host</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>Player &amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Save password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>A&amp;uto connect</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Automatically connect to the most recent login when Cockatrice opens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>If you have any trouble connecting or registering then contact the server staff for help!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Webpage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Reset Password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation>Forgot password?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Connect</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>Server Contact</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Connect to Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>Server URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>Communication Port</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>Unique Server Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Connection Warning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>You need to name your new connection profile.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Connect Warning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>The player name can&apos;t be empty.</translation>
     </message>
@@ -2046,122 +1696,112 @@ This will kick all non-ready players from the game.</translation>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Re&amp;member settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Description:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>P&amp;layers:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Game type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Only &amp;buddies can join</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Only &amp;registered users can join</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Joining restrictions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>&amp;Spectators can watch</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Spectators &amp;need a password to watch</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Spectators can &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Spectators can see &amp;hands</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>Create game as spectator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Spectators</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation>Starting life total:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation>Open decklists in lobby</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation>Create game as judge</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation>Game setup options</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;Clear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Create game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Game information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Server error.</translation>
     </message>
@@ -2169,97 +1809,97 @@ This will kick all non-ready players from the game.</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Name:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;olor:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>white</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>blue</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>black</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>red</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>green</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>colorless</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotation:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Destroy token when it leaves the table</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
-        <translation>Create face-down (Only hides name)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Token data</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Show &amp;all tokens</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Show tokens from this &amp;deck</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Choose token from list</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Create token</translation>
     </message>
@@ -2267,94 +1907,94 @@ This will kick all non-ready players from the game.</translation>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
-        <translation>Edit Tags</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
-        <translation>Add</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
-        <translation>Confirm</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
-        <translation>Cancel</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
-        <translation>Enter a tag and press 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"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
-        <translation>✖</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
-        <translation>Invalid Input</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
-        <translation>Tag name cannot be empty!</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
-        <translation>Duplicate Tag</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
-        <translation>This tag already exists.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>No image chosen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Browse...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Change avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Open Image</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Image Files (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Invalid image chosen.</translation>
     </message>
@@ -2362,56 +2002,56 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <source>Edit deck in clipboard</source>
-        <translation>Edit deck in clipboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Error</source>
-        <translation>Error</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
-        <translation>Invalid deck list.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Old password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>New password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Confirm new password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Change password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Your password is too short.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>The new passwords don&apos;t match.</translation>
     </message>
@@ -2419,93 +2059,93 @@ To remove your current avatar, confirm without choosing a new image.</translatio
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;olor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>white</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>blue</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>black</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>red</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>green</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>colorless</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotation:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Token data</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Add token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Remove token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>Edit custom tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Please enter the name of the token:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>The chosen name conflicts with an existing card or token.
@@ -2515,27 +2155,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Country:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Undefined</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Real name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Edit user profile</translation>
     </message>
@@ -2543,143 +2183,137 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>no limit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5 minutes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10 minutes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30 minutes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1 hour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2 hours</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
-        <translation>Hide &apos;buddies only&apos; games</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
-        <translation>Hide full games</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
-        <translation>Hide games that have started</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
-        <translation>Hide password protected games</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
-        <translation>Hide &apos;ignored user&apos; games</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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>Hide games not created by buddies</translation>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation>Hide games with forced open decklists</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Newer than:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>Game &amp;description:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Creator name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>&amp;Game types</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>at &amp;least:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>at &amp;most:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Maximum player count</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Restrictions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Show games only if &amp;spectators can watch</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Show spectator password p&amp;rotected games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Show only if spectators can ch&amp;at</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Show only if spectators can see &amp;hands</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation>Spectators</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Filter games</translation>
     </message>
@@ -2687,52 +2321,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation>Reset Password Challenge Warning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>A problem has occurred. Please try to request a new password again.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation>Enter the information of the server and the account you&apos;d like to request a new password for.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>Player &amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation>Reset Password Challenge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation>Reset Password Challenge Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>The email address can&apos;t be empty.</translation>
     </message>
@@ -2740,37 +2374,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation>Enter the information of the server you&apos;d like to request a new password for.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>Player &amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation>Reset Password Request</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation>Reset Password Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>The player name can&apos;t be empty.</translation>
     </message>
@@ -2778,86 +2412,86 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation>Reset Password Warning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>A problem has occurred. Please try to request a new password again.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation>Enter the received token and the new password in order to set your new password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>Player &amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Token:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>New Password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Reset Password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>The player name can&apos;t be empty.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation>Reset Password Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>The token can&apos;t be empty.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>The new password can&apos;t be empty.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation>Your password is too short.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>The passwords do not match.</translation>
     </message>
@@ -2865,7 +2499,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation>Load Deck</translation>
     </message>
@@ -2873,154 +2507,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Invalid deck list.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation>Load Deck from Website</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation>Network error: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation>Received empty deck data.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation>Failed to parse deck data: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-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>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</translation>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Load deck</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation>Players:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation>Starting life total:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation>Game setup options</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation>Remember settings</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation>Local game options</translation>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation>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/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation>Invalid filter</translation>
     </message>
@@ -3028,92 +2571,92 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Enter your information and the information of the server you&apos;d like to register to.
 Your email will be used to verify your account.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>Player &amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Password (again):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Email (again):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Country:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Undefined</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Real name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Register to server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Registration Warning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>Your password is too short.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Your passwords do not match, please try again.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Your email addresses do not match, please try again.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>The player name can&apos;t be empty.</translation>
     </message>
@@ -3121,17 +2664,17 @@ Your email will be used to verify your account.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation>Number of sides:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation>Number of dice:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation>Roll Dice</translation>
     </message>
@@ -3139,55 +2682,40 @@ Your email will be used to verify your account.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
-        <translation>Unmodified Cards:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
-        <translation>Modified Cards:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
-        <translation>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
-        <translation>Clear all set information</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
-        <translation>Set all to preferred</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation>Bulk modified printings.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation>Cleared all printing information.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation>Set all printings to preferred.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3204,7 +2732,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3221,7 +2749,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2762,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3243,7 +2771,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3252,7 +2780,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3265,59 +2793,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Appearance</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>User Interface</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation>Card Sources</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Sound</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Shortcuts</translation>
     </message>
@@ -3325,59 +2853,57 @@ Would you like to change your database location setting?</translation>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
-        <translation>Card Update Check</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/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>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.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
-        <translation>Run in foreground</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
-        <translation>Run in background</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
-        <translation>Run in background and always from now on</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
-        <translation>Don&apos;t prompt again and don&apos;t run</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
-        <translation>Don&apos;t run this time</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>Next</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>Previous</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Tip of the Day</translation>
     </message>
@@ -3385,166 +2911,169 @@ You can always change this behavior in the &apos;General&apos; settings tab.</tr
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Current release channel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Reinstall</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Cancel Download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Open Download Page</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation>Check for Client Updates</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
-        <translation>Downloading update: %1</translation>
+        <oldsource>Downloading update...</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Checking for updates...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Finished checking for updates</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>No Update Available</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice is up to date!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>You are already running the latest version available in the chosen release channel.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Current version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Selected release channel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Update Available</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>A new version of Cockatrice is available!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>New version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>Released</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Changelog</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Do you want to update now?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
-        <translation>Unfortunately, the automatic updater failed to find a compatible download. 
-You may have to manually download the new version.</translation>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <source>Please check the &lt;a href=&quot;%1&quot;&gt;releases page&lt;/a&gt; on our Github and download the build for your system.</source>
-        <translation>Please check the &lt;a href=&quot;%1&quot;&gt;releases page&lt;/a&gt; on our Github and download the build for your system.</translation>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Update Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>An error occurred while checking for updates:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>An error occurred while downloading an update:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Installing...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice is unable to open the installer.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Try to update manually by closing Cockatrice and running the installer.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>Download location</translation>
     </message>
@@ -3552,263 +3081,125 @@ You may have to manually download the new version.</translation>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Clear log when closing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
-        <translation>Copy to clipboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Debug Log</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation>Draw Probability Settings</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation>Criteria:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation>Card Name</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation>Subtype</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation>Mana Value</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation>Exactness:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation>At least</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation>Exactly</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation>Quantity (N):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation>Cards drawn (M):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation> cards</translation>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Odds (%)</source>
-        <translation>Odds (%)</translation>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
-        <translation>%1% of %2 decks</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
-        <translation>Card Hoarder</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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
-        <translation>Card Kingdom</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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
-        <translation>Card Market</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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
-        <translation>Face 2-Face</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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
-        <translation>Mana Pool</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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
-        <translation>MTG Stocks</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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
-        <translation>Scg</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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
-        <translation>Tcgl</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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
-        <translation>Tcgplayer</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
-        <translation>%1% Synergy</translation>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation>Game Changers</translation>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation>Budget</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
-        <translation>Average Deck</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
-        <translation>Salt: </translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>Type your filter here</translation>
     </message>
@@ -3816,325 +3207,244 @@ You may have to manually download the new version.</translation>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
-        <translation>Confirm Delete</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
-        <translation>Are you sure you want to delete the filter &apos;%1&apos;?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
-        <translation>Delete Failed</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
-        <translation>Failed to delete filter &apos;%1&apos;.</translation>
-    </message>
-</context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation>kicked by game host or moderator</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation>player left the game</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation>player disconnected from server</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation>reason unknown</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Please join the appropriate room first.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Wrong password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Spectators are not allowed in this game.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>The game is already full.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>The game does not exist any more.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>This game is only open to registered users.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>This game is only open to its creator&apos;s buddies.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>You are being ignored by the creator of this game.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
-        <translation>Join Game</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
-        <translation>Spectate Game</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
-        <translation>Game Information</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation>Join Game as Judge</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation>Spectate Game as Judge</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Join game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>Please join the respective room first.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filter games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>C&amp;lear filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>C&amp;reate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>&amp;Join</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation>Join as judge</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>J&amp;oin as spectator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation>Join as judge spectator</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation>Games shown: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Games</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation>All types</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation>Filter by game name...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation>Filter by game type/format</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation>Hide games not created by buddies</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation>Hide full games</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation>Hide started games</translation>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 day</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
-        <translation><numerusform>%1%2 hr</numerusform><numerusform>%1%2 hrs</numerusform></translation>
+        <translation><numerusform>%1%2 hr</numerusform><numerusform>%1%2 hr</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation>new</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
-        <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 mins</numerusform></translation>
+        <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>buddies only</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>reg. users only</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation>open decklists</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>can chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>see hands</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>can see hands</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>not allowed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Age</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Creator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Restrictions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Players</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Spectators</translation>
     </message>
@@ -4142,609 +3452,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/dialogs/dlg_settings.cpp" line="370"/>
         <source>How to help with translations</source>
-        <translation>How to help with translations</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/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/dialogs/dlg_settings.cpp" line="372"/>
         <source>Filters directory:</source>
-        <translation>Filters directory:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="380"/>
         <source>Check for card database updates on startup</source>
-        <translation>Check for card database updates on startup</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="381"/>
         <source>Don&apos;t check</source>
-        <translation>Don&apos;t check</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="383"/>
         <source>Prompt for update</source>
-        <translation>Prompt for update</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="385"/>
         <source>Always update in the background</source>
-        <translation>Always update in the background</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="386"/>
         <source>Check for card database updates every</source>
-        <translation>Check for card database updates every</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
-        <translation> days</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/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/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/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/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>
-</context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Graveyard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation>&amp;View graveyard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;All players</source>
-        <translation>&amp;All players</translation>
-    </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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation>Reveal random card to...</translation>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Hand</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation>&amp;View hand</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation>Sort hand by...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation>Mana Value</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Graveyard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exile</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <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"/>
-        <source>All players</source>
-        <translation>All players</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation>Reveal r&amp;andom card to...</translation>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation>Create New Deck</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation>Browse Decks</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation>Browse Card Database</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation>Browse EDHRec</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation>Browse Archidekt</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation>View Replays</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation>Quit</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation>Connecting...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation>Connect</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation>Play</translation>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation>&amp;Library</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation>&amp;View library</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Lend library to...</source>
-        <translation>Lend library to...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Draw card</source>
-        <translation>&amp;Draw card</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle</source>
-        <translation>Shuffle</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation>Shuffle top cards...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;All players</source>
-        <translation>&amp;All players</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <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"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation>Number of cards: (max. %1)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>The server has reached its maximum user capacity, please check back later.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>There are too many concurrent connections from your address.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Banned by moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Expected end time: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>This ban lasts indefinitely.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Scheduled server shutdown.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Invalid username.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>You have been logged out due to logging in at another location.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Connection closed</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>The server has terminated your connection.
 Reason: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4755,574 +3661,584 @@ All running games will be lost.
 Reason for shutdown: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Scheduled server shutdown</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Success</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Registration accepted.
 Will now login.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Account activation accepted.
 Will now login.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Number of players</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Please enter the number of players.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Player %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Load replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>About Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice Webpage</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Project Manager:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>Past Project Managers:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>Developers:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>Our Developers</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>Help Develop!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Translators:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>Our Translators</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>Help Translate!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Support:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Report an Issue</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Troubleshooting</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Server timeout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Failed Login</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>Your client seems to be missing features this server requires for connection.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Incorrect username or password. Please check your authentication information and try again.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>There is already an active session using this user name.
 Please close that session first and re-login.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>You are banned until %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>You are banned indefinitely.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>This server requires user registration. Do you want to register now?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Account activation</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>Server Full</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Unknown login error: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>Your username must respect these rules:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>is %1 - %2 characters long</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>can %1 contain lowercase characters</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>NOT</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>can %1 contain uppercase characters</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>can %1 contain numeric characters</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>can contain the following punctuation: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>first character can %1 be a punctuation mark</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation>no unacceptable language as specified by these server rules:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>can not contain any of the following words: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>can not match any of the following expressions: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>Registration denied</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>Registration is currently disabled on this server</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>There is already an existing account with the same user name.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>It&apos;s mandatory to specify a valid email address when registering.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>Password too short.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>Registration failed for a technical problem on the server.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
-        <translation>The connection to the server has been lost.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>Unknown registration error: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>Account activation failed</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Socket error: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Connecting to %1...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>Registering to %1 as %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Disconnected</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Connected, logging in at %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation>Requesting forgotten password to %1 as %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Connect...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Disconnect</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>Start &amp;local game...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Watch replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Full screen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Register to server...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Restore password...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Settings...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Exit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>A&amp;ctions</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>C&amp;ard Database</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Manage sets...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Edit custom &amp;tokens...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>Open custom image folder</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>Open custom sets folder</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>Add custom sets/cards</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation>Reload card database</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
-        <translation>Tabs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;About Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Tip of the Day</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>Check for Client Updates</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation>Check for Card Updates...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
-        <translation>Check for Card Updates (Automatic)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
-        <translation>Show Status Bar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation>View &amp;Debug Log</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation>Open Settings Folder</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation>Show/Hide</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>New Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice installed</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>Card database</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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 +4247,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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Open settings</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <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/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5364,17 +4280,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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>View sets</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Welcome</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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 +4299,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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
-        <translation>Card database update running.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1309"/>
+        <location filename="src/client/ui/window_main.cpp" line="1289"/>
         <source>The process crashed some time after starting successfully.</source>
-        <translation>The process crashed some time after starting successfully.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
+        <location filename="src/client/ui/window_main.cpp" line="1293"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1316"/>
+        <location filename="src/client/ui/window_main.cpp" line="1296"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1320"/>
+        <location filename="src/client/ui/window_main.cpp" line="1300"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1325"/>
+        <location filename="src/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
-        <translation>Unknown error occurred.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>The card database updater exited with an error:
 %1</source>
-        <translation>The card database updater exited with an error:
-%1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
+        <location filename="src/client/ui/window_main.cpp" line="1365"/>
         <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,863 +4367,669 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation>Load sets/cards</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <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/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation>Reset Password</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <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>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation>Mana Base Configuration</translation>
-    </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>Display type:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation>pie</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation>combinedBar</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation>Filter Colors (optional):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation>Cancel</translation>
-    </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/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
-        <translation>Mana Base</translation>
-    </message>
-</context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation>Group By:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation>type</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation>color</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation>subtype</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation>power</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation>toughness</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation>Filters (optional):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation>Show main bar row</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation>Show per-category rows</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
-        <translation>Mana Curve</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation>Display type:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation>pie</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation>combinedBar</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation>Filter Colors (optional):</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
-        <translation>Mana Devotion</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation>Top display type:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation>pie</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation>Colors:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation>Show per-color rows</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation>%1 pips (%2 cards)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation>%1 mana (%2 cards)</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation>Mana Production + Devotion</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation>Mana Distribution Settings</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="91"/>
         <source> from custom zone &apos;%1&apos;</source>
-        <translation> from custom zone &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 has unconceded the game.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <source>%1 creates a face down token.</source>
-        <translation>%1 creates a face down token.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
+        <location filename="src/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>a card</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
-        <translation>%1 moves %2%3 to custom zone &apos;%4&apos;.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="370"/>
+        <location filename="src/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation>bottom</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation>top</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <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"/>
-        <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/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation>reversed</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>Heads</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>Tails</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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>
+        <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/server/message_log_widget.cpp" line="620"/>
         <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
+        <location filename="src/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 undoes their last draw (%2).</translation>
     </message>
@@ -6316,206 +5037,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <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/dialogs/dlg_settings.cpp" line="1467"/>
         <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/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation>Edit Message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation>Remove Message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Message:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation>Edit message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation>Chat settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <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/dialogs/dlg_settings.cpp" line="1451"/>
         <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/dialogs/dlg_settings.cpp" line="1452"/>
         <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/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <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/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <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/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separate words with a space, alphanumeric characters only</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation>Move to</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Hand</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Graveyard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exile</translation>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation>Card Type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation>Mana Value</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation>Color(s)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation>Loyalty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation>Main Card Type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation>Mana Cost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation>Side</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation>Layout</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation>Color Identity</translation>
     </message>
@@ -6523,17 +5201,17 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation>Cards to overlap:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation>Overlap percentage:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation>Overlap direction:</translation>
     </message>
@@ -6541,62 +5219,62 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation>Unknown Phase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation>Untap</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation>Draw</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation>First Main</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation>Beginning of Combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation>Declare Attackers</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation>Declare Blockers</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation>Combat Damage</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation>End of Combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation>Second Main</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation>End/Cleanup</translation>
     </message>
@@ -6604,57 +5282,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>End of turn step</translation>
     </message>
@@ -6662,217 +5340,703 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>en</translation>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation>View top cards of library</translation>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>Reveal 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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <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"/>
-        <source>View bottom cards of library</source>
-        <translation>View bottom cards of library</translation>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>&amp;View graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
-        <source>Shuffle top cards of library</source>
-        <translation>Shuffle top cards of library</translation>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>&amp;View exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
-        <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"/>
-        <source>Draw hand</source>
-        <translation>Draw hand</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <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"/>
-        <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>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Number:</source>
-        <translation>Number:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <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"/>
-        <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"/>
-        <source>(max. %1)</source>
-        <translation>(max. %1)</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change power/toughness</source>
-        <translation>Change power/toughness</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change stats to:</source>
-        <translation>Change stats to:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
-        <source>Set annotation</source>
-        <translation>Set annotation</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
-        <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"/>
-        <source>Set counters</source>
-        <translation>Set counters</translation>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/player.cpp" line="769"/>
         <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/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;Graveyard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;Exile</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>&amp;Move hand to...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>&amp;Top of library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>&amp;Bottom of library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>&amp;Move graveyard to...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;Hand</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>&amp;Move exile to...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>&amp;View library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation>&amp;View hand</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>View &amp;top cards of library...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>Reveal &amp;library to...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>&amp;Always reveal top card</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>&amp;View sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;Draw card</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>D&amp;raw cards...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>&amp;Undo last draw</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>Take &amp;mulligan</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>Play top card &amp;face down</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <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/player.cpp" line="816"/>
+        <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/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>Move top cards to &amp;graveyard...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>Move top cards to &amp;exile...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>Put top card on &amp;bottom</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation>View bottom cards of library...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation>Lend library to...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation>Put top cards on stack &amp;until...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>&amp;Reveal hand to...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Reveal r&amp;andom card to...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation>Reveal random card to...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>&amp;Sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
         <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>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</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>Enable printings again</translation>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>&amp;Untap all permanents</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>R&amp;oll die...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>&amp;Create token...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>C&amp;reate another token</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>Cr&amp;eate predefined token</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>&amp;All players</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>S&amp;ay</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation>&amp;Select All</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation>S&amp;elect Row</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation>S&amp;elect Column</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Play</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>&amp;Hide</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>Play &amp;Face Down</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation>&amp;Tap / Untap</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Toggle &amp;normal untapping</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <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/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>&amp;Peek at card face</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>&amp;Clone</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>Attac&amp;h to card...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>Unattac&amp;h</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>&amp;Draw arrow...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>&amp;Increase power</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>&amp;Decrease power</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>I&amp;ncrease toughness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>D&amp;ecrease toughness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>In&amp;crease power and toughness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>Dec&amp;rease power and toughness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation>Increase power and decrease toughness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation>Decrease power and increase toughness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>Set &amp;power and toughness...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation>Reset p&amp;ower and toughness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>&amp;Set annotation...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>&amp;Add counter (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;Remove counter (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>&amp;Set counters (%1)...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <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/player.cpp" line="914"/>
+        <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/player.cpp" line="915"/>
+        <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/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>View top cards of library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <source>View bottom cards of library</source>
+        <translation>View bottom cards of library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <source>Shuffle top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1276"/>
+        <source>Shuffle bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <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.cpp" line="3188"/>
+        <source>(max. %1)</source>
+        <translation>(max. %1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation>Draw hand</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <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.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>Draw cards</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>Number:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>Move top cards to grave</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation>Reveal &amp;top cards to...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation>&amp;Top of library...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation>&amp;Bottom of library...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation>&amp;Always look at top card</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation>&amp;Open deck in deck editor</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation>&amp;Play top card</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation>&amp;Draw bottom card</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation>D&amp;raw bottom cards...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation>&amp;Play bottom card</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation>Play bottom card &amp;face down</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <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/player.cpp" line="827"/>
+        <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/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation>Move bottom cards to &amp;graveyard...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation>Move bottom cards to &amp;exile...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation>Put bottom card on &amp;top</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation>Selec&amp;ted cards</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>Move top cards to exile</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation>Move bottom cards to grave</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation>Move bottom cards to exile</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation>Draw bottom cards</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation>C&amp;reate another %1 token</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation>Create tokens</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <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.cpp" line="3534"/>
+        <source>Change power/toughness</source>
+        <translation>Change power/toughness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change stats to:</source>
+        <translation>Change stats to:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3653"/>
+        <source>Set annotation</source>
+        <translation>Set annotation</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3654"/>
+        <source>Please enter the new annotation:</source>
+        <translation>Please enter the new annotation:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Set counters</source>
+        <translation>Set counters</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation>Re&amp;veal to...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation>View related cards</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>Token: </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>All tokens</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <source>Display Navigation Buttons</source>
-        <translation>Display Navigation Buttons</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="155"/>
-        <source>Printing Selector</source>
-        <translation>Printing Selector</translation>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation>Show Related cards</translation>
     </message>
@@ -6880,7 +6044,7 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation>Search by set name or set code</translation>
     </message>
@@ -6888,17 +6052,17 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation>Previous Card in Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
-        <translation>Bulk Selection</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation>Next Card in Deck</translation>
     </message>
@@ -6906,132 +6070,66 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation>Alphabetical</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation>Preference</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation>Ascending</translation>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation>Select a card to view its available printings</translation>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation>Power / toughness</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation>&amp;Increase power</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation>&amp;Decrease power</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation>I&amp;ncrease toughness</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <translation>D&amp;ecrease toughness</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
-        <source>In&amp;crease power and toughness</source>
-        <translation>In&amp;crease power and toughness</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation>Dec&amp;rease power and toughness</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation>Increase power and decrease toughness</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation>Decrease power and increase toughness</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <translation>Set &amp;power and toughness...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
-        <source>Reset p&amp;ower and toughness</source>
-        <translation>Reset p&amp;ower and toughness</translation>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>Services</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>Hide %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>Hide Others</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>Show All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>Preferences...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>Quit %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>About %1</translation>
     </message>
@@ -7039,174 +6137,135 @@ This setting means you&apos;ll only see the default printing for each card, inst
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatrice card database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>All files (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice replays (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation>Maindeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation>Tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
-        <translation>Overwrite Existing File?</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"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation>Save</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation>Save All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation>&amp;Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation>Yes to &amp;All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation>N&amp;o to All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation>Abort</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation>Retry</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation>Ignore</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation>Discard</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation>Apply</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation>Restore Defaults</translation>
     </message>
@@ -7214,17 +6273,17 @@ Are you sure you would like to disable this feature?</translation>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Upload time</translation>
     </message>
@@ -7232,149 +6291,103 @@ Are you sure you would like to disable this feature?</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>Players</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>Keep</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>Time started</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>Duration (sec)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exile</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation>&amp;View exile</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Rooms</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>Joi&amp;n</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>Permissions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Players</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>S&amp;ay</translation>
-    </message>
-</context>
 <context>
     <name>SequenceEdit</name>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation>Choose an action from the table</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation>Hit the key/combination of keys you want to set for this action</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation>Invalid key</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation>Shortcut already in use by:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation>Clear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation>Restore default</translation>
     </message>
@@ -7382,27 +6395,27 @@ Are you sure you would like to disable this feature?</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>Enabled</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>Set type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>Set code</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Long name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>Release date</translation>
     </message>
@@ -7410,53 +6423,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation>Section:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation>Action:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation>Shortcut:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <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/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation>Search by shortcut name</translation>
     </message>
@@ -7464,12 +6477,12 @@ Are you sure you would like to disable this feature?</translation>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Action</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Shortcut</translation>
     </message>
@@ -7477,14 +6490,14 @@ Are you sure you would like to disable this feature?</translation>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>The following shortcuts have been set to default:
@@ -7494,58 +6507,45 @@ Please check your shortcut settings!</translation>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>&amp;Reason for shutdown:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;Time until shutdown (minutes):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>Shut down server</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation>&amp;Sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation>&amp;View sideboard</translation>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <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/dialogs/dlg_settings.cpp" line="1544"/>
         <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/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation>Sound settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>Master volume</translation>
     </message>
@@ -7553,48 +6553,48 @@ Please check your shortcut settings!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation>Spoilers season has ended</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Deleting spoiler.xml. Please run Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation>Spoilers download failed</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation>No internet connection</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation>Spoilers already up to date</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation>No new spoilers added</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation>Spoilers have been updated!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation>Last change:</translation>
     </message>
@@ -7602,27 +6602,27 @@ Please check your shortcut settings!</translation>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation>Default</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>No reply received from the release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Invalid reply received from the release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>No reply received from the tag update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Invalid reply received from the tag update server.</translation>
     </message>
@@ -7630,307 +6630,184 @@ Please check your shortcut settings!</translation>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
-        <translation>Add to Buddy List</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
-        <translation>Add to Ignore List</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
-        <translation>Account</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>Update server &amp;message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;Shut down server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>&amp;Reload configuration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Server administration functions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
-        <translation>Server moderator functions</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation>Replay ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation>Grant Replay Access</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation>Username to Activate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation>Force Activate User</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>&amp;Unlock functions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>&amp;Lock functions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation>Success</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation>Replay access granted</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation>Unable to grant replay access. Replay ID invalid</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation>Unable to grant replay access. Internal error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation>User successfully activated</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation>Unable to activate user. Username invalid</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation>Unable to activate user. User already active</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation>Unable to activate user. Internal error</translation>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <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"/>
-        <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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation>Filter by:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation>Display Settings</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"/>
-        <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"/>
-        <source>Formats</source>
-        <translation>Formats</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation>Archidekt: </translation>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <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/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation>Card Database</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation>Printing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <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/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Deck: %1</translation>
     </message>
@@ -7938,636 +6815,665 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <source>Visual Deck: %1</source>
-        <translation>Visual 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <source>&amp;Visual Deck Editor</source>
-        <translation>&amp;Visual Deck Editor</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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <source>Card Info</source>
-        <translation>Card Info</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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <source>&amp;View</source>
-        <translation>&amp;View</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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <source>Printing</source>
-        <translation>Printing</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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <source>Visible</source>
-        <translation>Visible</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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <source>Floating</source>
-        <translation>Floating</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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
-        <translation>Reset layout</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
-        <translation>Visual Deck View</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
-        <translation>Visual Database Display</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
-        <translation>Deck Analytics</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
-        <translation>Sample Hand</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>Local file system</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Server deck storage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Open in deck editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
-        <translation>Rename deck or folder</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Upload deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Download deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>New folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Delete</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation>Open decks folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
-        <translation>Rename local folder</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
-        <translation>Rename local file</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
-        <translation>New name:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
-        <translation>Rename failed</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation>Invalid deck file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Enter deck name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>This decklist does not have a name.
 Please enter a name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Unnamed deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation>Failed to upload deck to server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>Delete local file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Are you sure you want to delete the selected files?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>Name of new folder:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
-        <translation>Deck Storage</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
-        <translation>Visual Deck Storage</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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Error</source>
-        <translation>Error</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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
-        <translation>Could not open deck at %1</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
-        <translation>EDHREC: </translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
-        <translation>&amp;Cards</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
-        <translation>Search for a card ...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
-        <translation>Search</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>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
+        <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation>Replay Timeline</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>&amp;Phases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>&amp;Game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <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/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <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/client/tabs/tab_game.cpp" line="236"/>
         <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/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <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/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation>&amp;Concede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <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/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <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/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>&amp;Say:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation>Selected cards</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation>Reset layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>Concede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation>Unconcede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation>Leave game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <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/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>kicked by game host or moderator</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>player left the game</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>player disconnected from server</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation>reason unknown</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>You have been kicked out of the game.</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation>Home</translation>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>Time;SenderName;SenderIP;Message;TargetID;TargetName</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>Room Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>Game Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>Chat Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>You must select at least one filter.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>You have to select a valid number of days to locate.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>Username: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>IP Address: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>Game Name: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>GameID: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>Message: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>Main Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>Game Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>Private Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>Past X Days: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>Today</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>Last Hour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>Maximum Results: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>At least one filter is required.
 The more information you put in, the more specific your results will be.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>Get User Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>Clear Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>Log Locations</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>Date Range</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>Maximum Results</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>Message History</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>Failed to collect message history information.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>There are no messages for the selected filters.</translation>
     </message>
@@ -8575,37 +7481,37 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>Private &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;Leave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Private chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>Private message from</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 has left the server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 has joined the server.</translation>
     </message>
@@ -8613,234 +7519,153 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>Local file system</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>Server replay storage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>Watch replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation>Rename</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation>New folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>Delete</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation>Open replays folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>Download replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>Toggle expiration lock</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation>Get replay share code</translation>
-    </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>Look up replay by share code</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation>Rename local folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation>Rename local file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation>New name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation>Rename failed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation>Name of new folder:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>Delete local file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Are you sure you want to delete the selected files?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Are you sure you want to delete the selected replays?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <translation>Failed to get code</translation>
-    </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>Either this server does not support replay sharing, or does not permit replay sharing for you.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="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>Failed</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation>Could not get replay code</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <translation>Replay Share Code</translation>
-    </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>Others can use this code to add the replay to their list of remote replays:
-%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation>Copy to clipboard</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation>Replay share code</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation>Replay code found</translation>
-    </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 was added, or you already had access to it.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation>Replay code not found</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation>Failed to submit code</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation>Unexpected error</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>Delete remote replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
-        <translation>Game Replays</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;Say:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Leave room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>&amp;Clear chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>Chat Settings...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation> mentioned you.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>Click to view</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>You are flooding the chat. Please wait a couple of seconds.</translation>
     </message>
@@ -8848,35 +7673,35 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation>Failed to join the server room: it doesn&apos;t exist on the server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation>You do not have the required permission to join this server room.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation>Failed to join the server room due to an unknown error: %1.</translation>
     </message>
@@ -8884,97 +7709,87 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
-        <translation>Deck Editor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
-        <translation>Visual Deck Editor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation>Home</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
-        <translation>&amp;Visual Deck Storage</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
-        <translation>Visual Database Display</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
-        <translation>Server</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
-        <translation>Account</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
-        <translation>Deck Storage</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
-        <translation>Game Replays</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
-        <translation>Administration</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
-        <translation>Logs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>Are you sure?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>There are still open games. Are you sure you want to quit?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation>Click to view</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Your buddy %1 has signed on!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>Unknown Event</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8985,39 +7800,39 @@ This message might mean there is a new version of Cockatrice available or this s
 To update your client, go to Help -&gt; Check for Updates.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation>Idle Timeout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>You are about to be logged out due to inactivity.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>Promotion</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation>You have been promoted. Please log out and back in for changes to take effect.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>Warned</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>You have received the following message from the server.
@@ -9027,26 +7842,21 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation>Database Display</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
-        <translation>Visual Database Display</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>Unable to analyze the deck.</translation>
     </message>
@@ -9054,14 +7864,14 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>File does not exist.
 </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>Failed to open file.
@@ -9071,42 +7881,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Life</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>White</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Blue</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Black</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Green</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Colorless</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Other</translation>
     </message>
@@ -9114,7 +7924,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>Could not open the file for reading.</translation>
     </message>
@@ -9122,206 +7932,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>User &amp;details</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>Private &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Show this user&apos;s &amp;games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>Add to &amp;buddy list</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Remove from &amp;buddy list</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>Add to &amp;ignore list</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Remove from &amp;ignore list</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>Kick from &amp;game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>Warn user</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>View user&apos;s war&amp;n history</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>Ban from &amp;server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>View user&apos;s &amp;ban history</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promote user to moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Dem&amp;ote user from moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation>Promote user to &amp;judge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation>Demote user from judge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation>View admin notes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <source>This user does not exist.</source>
-        <translation>This user does not exist.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation>You are being ignored by %1 and can&apos;t see their games.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation>Could not get %1&apos;s games.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>%1&apos;s games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>Ban History</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>User has never been banned.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation>Failed to collect ban information.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>Warning History</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>Warning Time;Moderator;User Name;Reason</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>User has never been warned.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation>Failed to collect warning information.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation>Failed to get admin notes.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>Success</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>Successfully promoted user.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>Successfully demoted user.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>Failed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>Failed to promote user.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>Failed to demote user.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation>Copy hash to clipboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Remove this user&apos;s messages</translation>
     </message>
@@ -9329,173 +8117,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Location:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>Account Age:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>Edit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>Change password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>Change avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Administrator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Registered user</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Unregistered user</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation>Judge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>Unknown</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation>The entered password does not match your account.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>User information updated.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation>User Information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation>Real Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation>User Level:</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation><numerusform>%n Year, </numerusform><numerusform>%n Years, </numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation><numerusform>%10%n Day %20</numerusform><numerusform>%10%n Days %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>Enter Password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation>Password verification is required in order to change your email address</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation>An error occurred while trying to update your user information.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>This server does not permit you to update your user informations.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>Password changed.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>This server does not permit you to change your password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>The new password is too short.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>The old password is incorrect.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>Avatar updated.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>This server does not permit you to update your avatar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>An error occured while trying to updater your avatar.</translation>
     </message>
@@ -9503,152 +8291,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <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/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <source>Close card view window when last card is removed</source>
-        <translation>Close card view window when last card is removed</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="878"/>
         <source>Auto focus search bar when card view window is opened</source>
-        <translation>Auto focus search bar when card view window is opened</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation>Notifications settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation>Animation settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <source>Deck editor/storage settings</source>
-        <translation>Deck editor/storage settings</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <source>Use visual deck storage in game lobby</source>
-        <translation>Use visual deck storage in game lobby</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="890"/>
         <source>Use selection animation for Visual Deck Storage</source>
-        <translation>Use selection animation for Visual Deck Storage</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="892"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="984"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
-        <translation>do nothing</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <source>ask to convert to .cod</source>
-        <translation>ask to convert to .cod</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="898"/>
         <source>always convert to .cod</source>
-        <translation>always convert to .cod</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="899"/>
         <source>Default deck editor type</source>
-        <translation>Default deck editor type</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
-        <translation>Classic Deck Editor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
-        <translation>Visual Deck Editor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation>Replay settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Buffer time for backwards skip via shortcut:</translation>
     </message>
@@ -9656,601 +8429,404 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
-        <translation>Users connected to server: %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
-        <translation>Users in this room: %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
-        <translation>Buddies online: %1 / %2</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
-        <translation>Ignored users online: %1 / %2</translation>
-    </message>
-</context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation>Increment all card counters</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation>&amp;Untap all permanents</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation>R&amp;oll die...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation>&amp;Create token...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation>C&amp;reate another token</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation>Cr&amp;eate predefined token</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
-        <translation>Exact match</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
-        <translation>Includes</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
-        <translation>Include / Exclude</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="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/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation>Search filter...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
-        <translation>Save Filter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
-        <translation>Save all currently applied filters to a file</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Mode: Includes</source>
-        <translation>Mode: Includes</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>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/client/ui/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>
+        <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/client/ui/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>
+        <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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Exact Match</source>
-        <translation>Mode: Exact Match</translation>
+        <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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
-        <translation>Mode: Includes</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
-        <translation>Filter by name... (Exact match)</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
-        <translation>Load from Deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
-        <translation>Apply all card names in currently loaded deck as exact match name filters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
-        <translation>Load from Clipboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
-        <translation>Apply all card names in clipboard as exact match name filters</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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/client/ui/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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
         <source>Search sets...</source>
-        <translation>Search sets...</translation>
+        <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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Exact Match</source>
-        <translation>Mode: Exact Match</translation>
+        <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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
-        <translation>Mode: Includes</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
         <source>Search subtypes...</source>
-        <translation>Search subtypes...</translation>
+        <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>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/client/ui/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>
+        <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/client/ui/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>
+        <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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Exact Match</source>
-        <translation>Mode: Exact Match</translation>
+        <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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
-        <translation>Mode: Includes</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
-        <translation>Search by card name (or search expressions)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation>Visual</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <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/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <source>Clear all filters</source>
-        <translation>Clear all filters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
-        <source>Table</source>
-        <translation>Table</translation>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
-        <translation>Group by:</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>Change how cards are divided into categories/groups.</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>Sort by:</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
     </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>Click and drag to change the sort order within the groups</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation>Configure how cards are sorted within their groups</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <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"/>
-        <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"/>
-        <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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <source>Draw a new sample hand</source>
-        <translation>Draw a new sample hand</translation>
+        <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
-        <translation>Sample hand size</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
-        <source>Type a card name here for suggestions from the database...</source>
-        <translation>Type a card name here for suggestions from the database...</translation>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <source>Quick search and add card</source>
-        <translation>Quick search and add card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="209"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <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>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
-        <translation>Deck Storage</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
         <source>Show Folders</source>
-        <translation>Show Folders</translation>
+        <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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
         <source>Show Tag Filter</source>
-        <translation>Show Tag Filter</translation>
+        <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>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/client/ui/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>
+        <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/client/ui/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>
+        <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/client/ui/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>
+        <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/client/ui/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>
+        <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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
         <source>Deck tooltip:</source>
-        <translation>Deck tooltip:</translation>
+        <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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
-        <translation>None</translation>
+        <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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
-        <translation>Filepath</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
-        <translation>Search by filename (or search expression)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
-        <translation>Sort Alphabetically (Deck Name)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
-        <translation>Sort Alphabetically (Filename)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
-        <translation>Sort by Last Modified</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
-        <translation>Sort by Last Loaded</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
-        <translation>Loading database ...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
-        <translation>Refresh loaded files</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
-        <translation>Visual Deck Storage Settings</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>Which warning would you like to send?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Redact all messages from this user in all rooms</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>Warn user for misconduct</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>User name to send a warning to can not be blank, please specify a user to warn.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>Warning to use can not be blank, please select a valid warning to send.</translation>
     </message>
@@ -10258,133 +8834,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <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/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
-        <translation>Include cards rebalanced for Alchemy [requires restart]</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="127"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation>Hints</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation>Manage sets</translation>
     </message>
@@ -10392,72 +8968,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="52"/>
         <source>Search by card name (or search expressions)</source>
-        <translation>Search by card name (or search expressions)</translation>
+        <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>pile view</translation>
     </message>
@@ -10465,7 +9041,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>English</translation>
     </message>
@@ -10473,12 +9049,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation>Connect on startup</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation>Debug to file</translation>
     </message>
@@ -10486,1060 +9062,993 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>Main Window</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>Game Lobby</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation>Card Counters</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation>Player Counters</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Power and Toughness</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Game Phases</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>Playing Area</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation>Move Selected Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>View</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation>Move Top Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation>Move Bottom Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Gameplay</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation>Drawing</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation>Chat Room</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation>Game Window</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation>Load Deck from Clipboard</translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation>Replays</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
-        <translation>Tabs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation>Check for Card Updates...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation>Connect...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>Disconnect</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>Exit</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>Full screen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation>Register...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation>Settings...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation>Start a Local Game...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation>Watch Replay...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
-        <translation>Analyze Deck (deckstats.net)</translation>
+        <oldsource>Analyze Deck</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
-        <translation>Analyze Deck (tappedout.net)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation>Clear All Filters</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation>Clear Selected Filter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation>Remove Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation>Manage Sets...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation>Edit Custom Tokens...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
-        <translation>Export Deck (decklist.org)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
-        <translation>Export Deck (decklist.xyz)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation>Add Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation>Load Deck...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Load Deck from Clipboard...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
-        <translation>Edit Deck in Clipboard, Annotated</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
-        <translation>Edit Deck in Clipboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation>New Deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Open Custom Pictures Folder</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation>Print Deck...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation>Delete Card</translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation>Reset Layout</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>Save Deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation>Save Deck as...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Save Deck to Clipboard, Annotated</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
-        <translation>Save Deck to Clipboard, Annotated (No Set Info)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation>Save Deck to Clipboard</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
-        <translation>Save Deck to Clipboard (No Set Info)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation>Load Local Deck...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation>Load Remote Deck...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation>Set Ready to Start</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Toggle Sideboard Lock</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation>Add Green Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation>Remove Green Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation>Set Green Counters...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation>Add Red Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation>Remove Red Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation>Set Red Counters...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation>Add Life Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
-        <translation>Show Status Bar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
-        <translation>Unload Deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
-        <translation>Force Start</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
-        <translation>Add Card Counter (F)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
-        <translation>Remove Card Counter (F)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
-        <translation>Set Card Counters (F)...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
-        <translation>Add Card Counter (E)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
-        <translation>Remove Card Counter (E)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
-        <translation>Set Card Counters (E)...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
-        <translation>Add Card Counter(D)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
-        <translation>Remove Card Counter (D)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
-        <translation>Set Card Counters (D)...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
-        <translation>Add Card Counter (C)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
-        <translation>Remove Card Counter (C)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
-        <translation>Set Card Counters (C)...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
-        <translation>Add Card Counter (B)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
-        <translation>Remove Card Counter (B)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
-        <translation>Set Card Counters (B)...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
-        <translation>Add Card Counter (A)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
-        <translation>Remove Card Counter (A)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
-        <translation>Set Card Counters (A)...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation>Remove Life Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation>Set Life Counters...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation>Add White Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation>Remove White Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation>Set White Counters...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation>Add Blue Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation>Remove Blue Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation>Set Blue Counters...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation>Add Black Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation>Remove Black Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation>Set Black Counters...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation>Add Colorless Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation>Remove Colorless Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation>Set Colorless Counters...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation>Add Other Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation>Remove Other Counter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation>Set Other Counters...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation>Increment all card counters</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation>Add Power (+1/+0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Remove Power (-1/-0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Move Toughness to Power (+1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Add Toughness (+0/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Remove Toughness (-0/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Move Power to Toughness (-1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Add Power and Toughness (+1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Remove Power and Toughness (-1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation>Set Power and Toughness...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation>Reset Power and Toughness</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>Untap</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>Draw</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation>First Main Phase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation>Start Combat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>Attack</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>Block</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>Damage</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation>End Combat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation>Second Main Phase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>End</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation>Next Phase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation>Next Phase Action</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation>Next Turn</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation>Hide Card in Reveal Window</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation>Tap / Untap Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation>Untap All</translation>
     </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>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
+        <translation>Toggle Untap</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation>Turn Card Over</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation>Peek Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation>Play Card</translation>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation>Attach Card...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation>Unattach Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation>Clone Card</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation>Create Token...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <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/settings/shortcuts_settings.h" line="518"/>
         <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/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation>Set Annotation...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <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"/>
-        <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/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation>Top of Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation>Battlefield, Face Down</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation>Battlefield</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation>Top Cards of Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation>Bottom Cards of Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation>Close Recent View</translation>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <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/settings/shortcuts_settings.h" line="615"/>
         <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/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation>Draw Arrow...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <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/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation>Leave Game</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>Concede</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation>Roll Dice...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation>Shuffle Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <source>Shuffle Top Cards of Library</source>
-        <translation>Shuffle Top Cards of Library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
+        <location filename="src/settings/shortcuts_settings.h" line="641"/>
         <source>Shuffle Bottom Cards of Library</source>
-        <translation>Shuffle Bottom Cards of Library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
+        <location filename="src/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation>Mulligan (Same hand size)</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <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/settings/shortcuts_settings.h" line="647"/>
         <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/settings/shortcuts_settings.h" line="650"/>
         <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/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation>Undo Draw</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <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/settings/shortcuts_settings.h" line="659"/>
         <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"/>
-        <source>Sort Hand by Name</source>
-        <translation>Sort Hand by Name</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation>Sort Hand by Type</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <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"/>
-        <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"/>
-        <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/settings/shortcuts_settings.h" line="662"/>
         <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/settings/shortcuts_settings.h" line="665"/>
         <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/settings/shortcuts_settings.h" line="668"/>
         <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/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation>Focus Chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation>Clear Chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation>Refresh</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation>Skip Forward</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation>Skip Backward</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation>Play/Pause</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation>Toggle Fast Forward</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation>Home</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
-        <translation>Visual Deck Storage</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
-        <translation>Deck Storage</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
-        <translation>Server</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
-        <translation>Account</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
-        <translation>Administration</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
-        <translation>Logs</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts
index 53fc9ac61..dca18c6fd 100644
--- a/cockatrice/translations/cockatrice_es.ts
+++ b/cockatrice/translations/cockatrice_es.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Establecer contador...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Establecer contador</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nuevo valor para el contador &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <source>&amp;Refresh</source>
-        <translation>&amp;Actualizar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,81 +36,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <source>Open in new tab</source>
-        <translation>Abrir en nueva pestaña</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <source>Are you sure?</source>
-        <translation>¿Estás seguro?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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>
+        <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
-        <translation>Error</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <source>Save deck</source>
-        <translation>Guardar mazo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="409"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <source>The deck could not be saved.</source>
-        <translation>El mazo no puede ser guardado.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="532"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
-        <translation>No hay cartas en tu mazo para exportar</translation>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
-        <translation>Notas de actualización</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -118,325 +116,264 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
-        <translation>Mazo principal</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
-        <translation>Banquillo</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="446"/>
-        <source> seconds</source>
-        <translation>segundos</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <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/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Tema actual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation>Abrir carpeta de temas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>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/dialogs/dlg_settings.cpp" line="663"/>
         <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/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
-        <translation>filas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
-        <translation>Contadores de carta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <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/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <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/dialogs/dlg_settings.cpp" line="691"/>
         <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/dialogs/dlg_settings.cpp" line="692"/>
         <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/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Tamaño de fuente máxima para la información presentada en las cartas:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>banear &amp;usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>banear dirección IP &amp;IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>banear por I&amp;D de cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Tipo de ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>acceso prohibido &amp;permanentemente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>acceso prohibido &amp;temporalmente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Días:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Horas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Duración del ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Por favor, introduce el motivo de la restricción de acceso
 Se almacenará unicamente para moderadores y no podrá ser visto por la persona restringida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Por favor, introduce el motivo de la restricción que será visible para la persona restringida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Redactar todos los mensajes de este usuario en todas las salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>Aceptar (&amp;O)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Banear usuario del servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Debes seleccionar baneo por nombre, por IP, por id de cliente, o cualquier combinación de los tres.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Debes introducir un nombre cuando la casilla de baneo por nombre está activada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Debes introducir una IP cuando la casilla de baneo por IP está activada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Debes introducir un id de cliente cuando la casilla de baneo por id de cliente está activada.</translation>
     </message>
@@ -444,22 +381,22 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
-        <translation>Beta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>No se recibió respuesta del servidor de actualización.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Respuesta inválida del servidor de actualización.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>Sin respuesta por parte del servidor de actualización de archivos</translation>
     </message>
@@ -467,32 +404,32 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Ediciones</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Coste de maná</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Tipo de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>F/R</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Color(es)</translation>
     </message>
@@ -500,124 +437,119 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>Y</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>Y NO</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>O NO</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Color</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>Expansión</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Coste de maná</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>Valor de maná</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Rareza</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Poder</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Resistencia </translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Lealtad</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
-        <translation>Tipo principal de carta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
-        <translation>Subtipo de carta</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
-        <translation>Imagen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
-        <translation>Descripción</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
-        <translation>Ambos</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -625,317 +557,195 @@ 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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <source>View related cards</source>
-        <translation>Ver cartas relacionadas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <source>Add card to deck</source>
-        <translation>Añadir carta al mazo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
-        <translation>Mazo principal</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
-        <translation>Banquillo</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
-        <translation>Cartas relacionadas:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
-        <translation>Carta desconocida:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Mover a</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation>&amp;Todos los jugadores</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation>Ver cartas relacionadas</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation>Ficha:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation>Todas las fichas</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation>&amp;Seleccionar todo</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation>&amp;Seleccionar fila</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation>&amp;Seleccionar columna</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation>&amp;Jugar</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation>&amp;Ocultar</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation>Jugar boca abajo</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;Girar / Enderezar</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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation>&amp;Clonar</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation>&amp;Establecer contadores (%1)</translation>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>Fuerza / resistencia (&amp;P)</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
-        <translation>Tamaño de carta</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <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/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>mano de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <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/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <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/card_zone.cpp" line="71"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>de la biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <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/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>cementerio de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <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/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>la zona de exilio de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <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="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>el banquillo de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>el banquillo de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -944,7 +754,7 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -952,206 +762,151 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
-        <translation>Información de la carta</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
-        <translation>Buscar por nombre de carta (o buscar expresiones)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
-        <translation>Añadir al Mazo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
-        <translation>Añadir al Banquillo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <source>Show Related cards</source>
-        <translation>Mostrar cartas Relacionadas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <source>Add card to &amp;maindeck</source>
-        <translation>Añadir carta al &amp;mazo principal</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="242"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
-        <translation>Añadir carta al &amp;banquillo</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
-        <source>Loading Database...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <source>Main Type</source>
-        <translation>Tipo principal de carta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <source>Mana Cost</source>
-        <translation>Coste de maná</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <source>Colors</source>
-        <translation>Colores</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
-        <translation>Mazo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
-        <translation>&amp;Nombre del mazo:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
-        <translation>&amp;Comentarios:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
-        <source>Group by:</source>
-        <translation>Agrupar por:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
+        <source>Group by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
-        <translation>&amp;Incrementar número</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
-        <translation>&amp;Reducir número</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
-        <translation>&amp;Quitar fila</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,140 +914,135 @@ 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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <source>Filters</source>
-        <translation>Filtros</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>&amp;Clear all filters</source>
-        <translation>&amp;Limpiar todos los filtros</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
-        <translation>Borrar seleccionado</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
-        <translation>&amp;Editor de mazos</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
-        <translation>&amp;Nuevo mazo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
-        <translation>&amp;Cargar mazo...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
-        <translation>Cargar mazo reciente...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
-        <translation>Borrar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
-        <translation>&amp;Guardar mazo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
-        <translation>Guardar mazo &amp;como...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
-        <translation>Cargar mazo desde el &amp;portapapeles...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
-        <translation>Editar mazo en el portapapeles</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
-        <translation>Anotado</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
-        <translation>No Anotado</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
-        <translation>Guardar mazo al portapapeles</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
-        <translation>&amp;Cerrar</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,227 +1050,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation>Editar URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <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/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation>Borrar URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
-        <translation>Día(s)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>Actualizando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation>Elegir camino</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <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/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <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/dialogs/dlg_settings.cpp" line="1208"/>
         <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/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>Último cambio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <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/dialogs/dlg_settings.cpp" line="1216"/>
         <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/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <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="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Carta</translation>
     </message>
@@ -1528,12 +1245,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,17 +1258,17 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,237 +1276,179 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
-        <translation>Editar etiquetas</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
-        <translation>Gestor de etiquetas de mazos</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
-        <translation>Añadir una nueva etiqueta (p.e., Aggro)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
-        <translation>Añadir etiqueta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
-        <translation>Filtrar etiquetas...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
-        <translation>Esta etiqueta ya existe.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <source>Edit Tags</source>
-        <translation>Editar etiquetas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <source>Rename Deck</source>
-        <translation>Renombrar mazo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <source>Annotated</source>
-        <translation>Anotado</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <source>Not Annotated</source>
-        <translation>No Anotado</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <source>Rename File</source>
-        <translation>Renombrar archivo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <source>Delete File</source>
-        <translation>Eliminar archivo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <source>New name:</source>
-        <translation>Nuevo nombre:</translation>
+        <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Error</source>
-        <translation>Error</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Delete file</source>
-        <translation>Eliminar archivo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Are you sure you want to delete the selected file?</source>
-        <translation>¿Estás seguro de que quieres eliminar el archivo seleccionado?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
-        <translation>Borrado fallido</translation>
-    </message>
-</context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>La respuesta del servidor no pudo ser interpretada.</translation>
     </message>
@@ -1809,82 +1468,78 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
-        <translation>Cargar desde el portapapeles...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Listo para empezar</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
-        <translation>Forzar inicio</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation>Banquillo desbloqueado</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
-        <translation>Cockatrice</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1892,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Descargando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Hospedajes Conocidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Actualizar la lista con servidores públicos conocidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Nueva dirección</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Dirección:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Puerto:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nombre del jugador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>&amp;Contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Guardar contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>Conectarse a&amp;utomáticamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Conectar automáticamente al servidor más reciente cuando se inicie Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>¡Si tiene algún problema en conectarse o registrarse puede contactar a nuestro equipo!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Página web</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Reiniciar Contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
-        <translation>¿Olvidó la contraseña?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Conectar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Iniciar sesión</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>Contacto del Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Conectar al Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>dirección URL del servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>Puerto de comunicación </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>Nombre único para el servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Advertencia de Conexión </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>Necesita dar nombre a su nuevo perfil de conexión.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Advertencia de conexión</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>El nombre del jugador no puede estar vacío.</translation>
     </message>
@@ -2041,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Recordar preferencias (&amp;M)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Descripción:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>&amp;Jugadores:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Tipo de partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Sólo los &amp;amigos pueden participar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Sólo los usuarios &amp;registrados pueden participar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Restricciones de participación</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>Los e&amp;spectadores pueden observar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Los espectadores &amp;necesitan contraseña para unirse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Los espectadores pueden &amp;chatear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Los espectadores pueden ver las &amp;manos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>Crear una partida como espectador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Espectadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
-        <translation>Vida inicial total:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>Limpiar (&amp;C)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Crear partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Información de la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Error del servidor.</translation>
     </message>
@@ -2164,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nombre:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Color:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>blanco</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>azul</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>negro</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>rojo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>incoloro</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/R:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Anotación:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Destruir la ficha cuando deje la mesa</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Datos de la ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Mostrar &amp;todas las fichas</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Mostrar todas las fichas de este &amp;mazo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Elegir ficha de la lista</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Crear ficha</translation>
     </message>
@@ -2262,94 +1907,94 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
-        <translation>Editar etiquetas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
-        <translation>Añadir</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
-        <translation>Confirmar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
-        <translation>Introduce una etiqueta y pulsa 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"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
-        <translation>El nombre de la etiqueta no puede estar vacío!</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
-        <translation>Duplicar etiqueta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
-        <translation>Esta etiqueta ya existe.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Ninguna imagen seleccionada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Para cambiar tu avatar, elige una nueva imagen.
 Para eliminar tu avatar actual, confirma sin elegir una nueva imagen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Cambiar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Abrir imagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Archivos de imagen (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>La imagen seleccionada no es válida.</translation>
     </message>
@@ -2357,56 +2002,56 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Error</source>
-        <translation>Error</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
-        <translation>Lista de mazo inválida.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Contraseña anterior:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nueva contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Confirmar la nueva contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Cambiar contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Su contraseña es muy corta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Las nuevas contraseñas no coinciden.</translation>
     </message>
@@ -2414,93 +2059,93 @@ Para eliminar tu avatar actual, confirma sin elegir una nueva imagen.</translati
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nombre:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Color:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>blanco</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>azul</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>negro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>rojo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>incoloro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/R:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Anotación:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Información de la ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Añadir ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Eliminar ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>Editar fichas personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Por favor, introduzca el nombre de la ficha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>El nombre elegido ya existe y está siendo usado por una carta o ficha.
@@ -2510,27 +2155,27 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Correo electrónico:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>País:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Indefinido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Nombre real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Editar perfil de usuario</translation>
     </message>
@@ -2538,143 +2183,137 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>sin límite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5 minutos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10 minutos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30 minutos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1 hora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2 horas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Más nuevo que:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Descipción de la partida:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Nombre del creador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>Tipos de &amp;partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>al &amp;menos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>&amp;como máximo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Número máximo de jugadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Restricciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Mostrar partidas solo si &amp;espectadores pueden ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Mostrar contraseña de espectador para juegos p&amp;rotegidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Mostrar solo si los espectadores pueden ha&amp;blar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Mostrar solo si los espectadores pueden ver &amp;manos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation>Espectadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Filtrar partidas</translation>
     </message>
@@ -2682,52 +2321,52 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation>Reiniciar contraseña de desafíos con advertencia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Ha ocurrido un problema. Por favor intenta solicitar una nueva contraseña.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation>Introduce la información del servidor y de la cuenta para la que deseas solicitar una nueva contraseña.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Dirección:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Puerto:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nombre del jugador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>Correo electrónico:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation>Reiniciar contraseña de desafío</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation>Error al reiniciar contraseña de desafío</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>La dirección de correo electrónico no puede estar vacía.</translation>
     </message>
@@ -2735,37 +2374,37 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation>Introduce la información del servidor para la que deseas solicitar una nueva contraseña.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Dirección:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Puerto:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nombre del jugador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation>Error al reiniciar la petición para una contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation>Error al reiniciar la contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>El nombre del jugador no puede estar vacío.</translation>
     </message>
@@ -2773,86 +2412,86 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation>Reinicia la contraseña de advertencia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Ha ocurrido un problema. Por favor intenta solicitar de nuevo una nueva contraseña.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation>Introduce el token recibido y la nueva contraseña para establecer tu nueva contraseña.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Dirección:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Puerto:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nombre del jugador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Ficha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Nueva contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Reiniciar contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>El nombre del jugador no puede estar vacío.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation>Error al reiniciar contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>La ficha no puede estar vacía.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>La nueva contraseña no puede estar vacía.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation>Tu contraseña es demasiado corta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>Las contraseñas no coinciden.</translation>
     </message>
@@ -2860,247 +2499,164 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
-        <translation>Cargar mazo</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Lista de mazo inválida.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</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/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
-        <translation>Cockatrice</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
-        <translation>Filtro no válido</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Introduce tu información y la información del servidor en el que deseas registrarte.
 Tu correo electrónico se utilizará para verificar tu cuenta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Dirección:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Puerto:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nombre del jugador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>&amp;Contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Contraseña (de nuevo):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Correo electrónico:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Correo electrónico (de nuevo):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>País:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Indefinido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Nombre real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Registrarse en el servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Advertencia durante el registro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>Tu contraseña es demasiado corta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Tus contraseñas no coinciden, por favor inténtalo de nuevo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Tus direcciones de correo electrónico no coinciden, por favor inténtalo de nuevo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>El nombre del jugador no puede estar vacío.</translation>
     </message>
@@ -3108,73 +2664,58 @@ Tu correo electrónico se utilizará para verificar tu cuenta.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
-        <translation>Número de dado:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
-        <translation>Lanzar dados</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
-        <translation>Cartas no modificadas:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <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"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3191,7 +2732,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3208,7 +2749,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2762,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3230,7 +2771,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3239,7 +2780,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3252,59 +2793,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Apariencia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <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/dialogs/dlg_settings.cpp" line="1873"/>
         <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/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Sonido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Atajos de teclado</translation>
     </message>
@@ -3312,57 +2853,57 @@ Por favor, envía un ticket en https://github.com/Cockatrice/Cockatrice/issues
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
-        <translation>Ejecutar en primer plano</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
-        <translation>Ejecutar en segundo plano</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
-        <translation>No ejecutar esta vez</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Tip del día</translation>
     </message>
@@ -3370,165 +2911,169 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Canal de lanzamiento actual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Reinstalar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Cancelar Descarga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Abrir página de descarga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation>Comprobar actualizaciones del cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>Cockatrice no fue creado con soporte para SSL, ¡por lo que no se pueden descargar actualizaciones automáticamente!
 Por favor, visita la página de descargas para actualizarlo manualmente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
-        <translation>Descargando actualización: %1</translation>
+        <oldsource>Downloading update...</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Buscando actualizaciones...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Comprobación de actualizaciones finalizada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Actualización no disponible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>¡Cockatrice se ha actualizado!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>Actualmente está ejecutando la última versión disponible en el canal de distribución.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Versión actual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Seleccionado canal de lanzamiento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Actualización disponible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>¡Una nueva version de Cockatrice está disponible!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Nueva versión</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>Lanzado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Registro de cambios</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>¿Quieres actualizar ahora?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Error en la actualización</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Ha ocurrido un error mientras se buscaban actualizaciones:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Ha ocurrido un error mientras se descargaba una actualización:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Instalando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice es incapaz de abrir el instalador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Intente actualizar manualmente cerrando Cockatrice y ejecutando el instalador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>Ubicación de descarga</translation>
     </message>
@@ -3536,162 +3081,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Limpiar el historial al cerrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Registro de depuración</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3699,47 +3112,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
-        <translation>Reino 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="59"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
-        <translation>Reserva de maná</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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3747,44 +3160,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3792,7 +3199,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>Escriba su filtro aquí</translation>
     </message>
@@ -3800,325 +3207,244 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
-        <translation>Borrado fallido</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation>expulsado por el anfitrión del juego o moderador</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation>jugador ha dejado la partida</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation>jugador se ha desconectado del servidor</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation>razón desconocida</translation>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Por favor, entre a la sala adecuada primero.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Contraseña incorrecta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>No se permiten espectadores en esta partida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>La partida no tiene plazas libres.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>La partida ya no existe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Esta partida está abierta sólo a usuarios registrados.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Esta partida está abierta sólo a los amigos del creador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Estás siendo ignorado por el creador de la partida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
-        <translation>Unirse a partida</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
-        <translation>Espectar partida</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
-        <translation>Información de la partida</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Entrar en la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>Por favor, entre primero en la sala respectiva.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtrar partidas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>&amp;Limpiar filtro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>C&amp;rear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>Unirse (&amp;J)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>Entrar como e&amp;spectador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation>Juegos mostrados: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Partidas</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 day</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 hora</numerusform><numerusform>%1%2 horas</numerusform><numerusform>%1%2 horas</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation>nuevo</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>solo amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>solo usuarios registrados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>pueden usar el chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>ver manos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>puede ver manos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>no permitidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Edad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Creador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Restricciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Jugadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Espectadores</translation>
     </message>
@@ -4126,609 +3452,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/dialogs/dlg_settings.cpp" line="370"/>
         <source>How to help with translations</source>
-        <translation>Cómo ayudar con las traducciones</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/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/dialogs/dlg_settings.cpp" line="372"/>
         <source>Filters directory:</source>
-        <translation>Directorio de filtros:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="379"/>
         <source>Check for client updates on startup</source>
-        <translation>Comprobar actualizaciones del cliente al arrancar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <location filename="src/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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="381"/>
         <source>Don&apos;t check</source>
-        <translation>No comprobar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/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/dialogs/dlg_settings.cpp" line="385"/>
         <source>Always update in the background</source>
-        <translation>Siempre actualizar en segundo plano</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
-        <translation>días</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cementerio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation>Ver &amp;cementerio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Mano</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exilio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation>Mostrar una carta al azar a...</translation>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Mano</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation>&amp;Ver mano</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation>&amp;Mover mano a...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cementerio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exilio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <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"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation>Mostrar una carta al azar a...</translation>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation>Crear nuevo mazo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation>Buscar mazos</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <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"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation>Ver repeticiones</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation>Quitar</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation>Conectando...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation>Conectar</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation>Jugar</translation>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation>&amp;Biblioteca</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation>&amp;Ver biblioteca</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Lend library to...</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>Mostrar &amp;cartas de la parte superior a...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Always reveal top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation>&amp;Robar carta</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
-        <source>&amp;Undo last draw</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation>Barajar</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <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"/>
-        <source>Play top card &amp;face down</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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <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"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>Este servidor ha alcanzado su capacidad máxima de usuarios, por favor inténtalo más tarde.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Hay demasiadas conexiones simultaneas desde tu dirección.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Baneado por el moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Tiempo de finalización estimado: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>Este ban permanecerá indefinidamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Apagado programado del servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>El nombre de usuario no es válido.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>Se ha cerrado tu sesión debido a que se ha iniciado en otra ubicación.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Conexión cerrada</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>El servidor ha finalizado tu conexión.
 Motivo: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4741,573 +3663,583 @@ Todas las partidas en curso se cerraran.
 Motivo para el apagado: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Apagado programado del servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Registro aceptado.
 Iniciando sesión.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Activación de la cuenta aceptada.
 Iniciando sesión.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Número de jugadores</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Por favor, introduzca el número de jugadores.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Jugador %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Cargar repetición</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>Acerca de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Página de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Jefe de Proyecto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>Antiguos Jefes de Proyecto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>Desarrolladores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>Nuestros desarrolladores</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>¡Ayuda a desarrollar!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Traductores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>Nuestros Traductores</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>¡Ayuda a traducir!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Soporte:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Informa de un problema</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Problemas frecuentes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>Preguntas frecuentes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Tiempo de espera del servidor agotado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Inicio de sesión fallido</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>Tu cliente parece no tener las características requeridas para la conexión de este servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>Para actualizar tu cliente, ir a &apos;Ayuda-&gt;Marcar para Actualizaciones del Cliente&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Nombre de usuario o contraseña incorrecto. Por favor, verifica tu información de autentificación y vuelve a intentarlo.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Ya existe una sesión activa usando ese nombre de usuario.
 Por favor, cierra esa sesión primero y reintentalo.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Estás baneado hasta %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Estás baneado indefinidamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>Este servidor requiere el registro de usuarios. ¿Quieres registrarte ahora?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation>Este servidor exige IDs de cliente. Tu cliente no está generando un ID o estás ejecutando un cliente modificado. Cierra y vuelve a abrir el cliente para intentarlo de nuevo. </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>Ha ocurrido un error interno. Cierra y vuelve a abrir Cockatrice antes de intentar de nuevo.
 Si el error persiste, asegúrate de que estás ejecutando la versión más reciente del software y contacta a los desarrolladores del software si es necesario.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Activación de cuenta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>Tu cuenta aún no ha sido activada.
 Tienes que proporcionar el código recibido en el email de activación</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>Servidor Lleno</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Error de inicio de sesión desconocido: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 Esto suele ser debido a que tu versión del cliente está desfasada y el servidor ha enviado una respuesta que tu cliente no comprende.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>Tu nombre de usuario debe:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>Tener de %1 a %2 caracteres de longitud.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>%1 Puede tener minúsculas.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>NO</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>%1 Puede tener mayúsculas.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation> %1 Puede tener caracteres númericos.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>Puede tener los siguientes signos de puntuación: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>El primer caracter %1 puede ser un signo de puntuación.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>No puede contener ninguna de las siguientes palabras: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>No puede coincidir ninguna de las siguientes expresiones: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>Sólo puedes usar A-Z, a-z, 0-9, _, ., y - en tu nombre de usuario.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>Registro denegado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>El registro está actualmente deshabilitado en este servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>Ya existe una cuenta con ese nombre.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>Es obligatorio especificar una dirección de correo válida al registrarse.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>Parece ser que usted está intentando registrar una cuenta nueva en este servidor; sin embargo usted ya tiene una cuetna registrada con el correo provisto. Este servidor restringe el número de cuentas que un usuario puede registrar por correo electrónico. Por favor contacte al operador del servidor para asistencia o para obtener la información de sus credenciales.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>La contraseña es demasiado corta.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>El registro falló debido a un problema técnico en el servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
-        <translation>Se ha perdido la conexión con el servidor.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>Error de registro desconocido: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>La activación de cuenta falló.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Error del Socket: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>Estás intentando conectar a un servidor obsoleto. Por favor, usa una versión anterior de Cockatrice o conecta a un servidor apropiado.
 La versión local es %1, la versión remota es %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>Tu cliente de Cockatrice está obsoleto. Por favor, actualiza tu versión de Cockatrice.
 La versión local es %1, la versión remota es %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Conectando a %1...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>Registrando en %1 como %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Desconectado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Conectado, hora de inicio de sesión: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation>Solicitando contraseña olvidada de %1 como %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Conectar...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Desconectar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>Empezar partida &amp;local...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Ver repetición...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Pantalla completa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Registrarse en el servidor...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Restaurar contraseña...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Preferencias...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>A&amp;cciones</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>Base de datos de c&amp;artas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Mantenedor de ediciones...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Editar &amp;fichas personalizadas...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>Abrir carpeta de imágenes personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>Abrir carpeta de ediciones personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>Agregar cartas/ediciones personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
-        <translation>Recargar la base de datos de cartas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
-        <translation>Pestañas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>A&amp;yuda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Acerca de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Tip del Día</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>Buscar Actualizaciones de Cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation>Comprobar actualizaciones de cartas...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
-        <translation>Comprobar actualizaciones de cartas (Automático)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
-        <translation>Mostrar barra de estatus</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation>Ver &amp;registro de debugs</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
-        <translation>Abrir carpeta de preferencias</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
-        <translation>Mostrar/Ocultar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>Nueva Versión</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice está instalado.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <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/client/ui/window_main.cpp" line="1133"/>
         <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 +4248,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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Abrir preferencias</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <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/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5351,17 +4283,17 @@ Códigos de sets: %1
 ¿Quieres habilitarlos?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>Ver ediciones</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Bienvenido/a</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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 +4302,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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
-        <translation>Ocurrió un error desconocido.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,864 +4369,670 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation>Cargar ediciones/cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <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/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation>Reiniciar contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <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>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
-        <translation>Base de maná</translation>
-    </message>
-</context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
-        <translation>Curva de maná</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
-        <translation>Devoción de maná</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 ha concedido la partida</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>una carta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
-        <translation>parte inferior</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
-        <translation>parte superior</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <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"/>
-        <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/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation>Invertido.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation>Normal.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>Cara</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>Cruz</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 deshace su último robo (%2).</translation>
     </message>
@@ -6302,206 +5040,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <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/dialogs/dlg_settings.cpp" line="1467"/>
         <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/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation>Editar mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation>Borrar mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Mensaje:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation>Editar mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <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/dialogs/dlg_settings.cpp" line="1450"/>
         <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/dialogs/dlg_settings.cpp" line="1451"/>
         <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/dialogs/dlg_settings.cpp" line="1452"/>
         <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/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <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/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <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/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separa las palabras con un espacio, solo caracteres alfanuméricos</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation>Mover a</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Mano</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cementerio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exilio</translation>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation>Tipo de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation>Valor de maná</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation>Color(es)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation>Lealtad</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation>Tipo principal de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation>Coste de maná</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation>F/R</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation>Lado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation>Diseño</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation>Identidad de color</translation>
     </message>
@@ -6509,17 +5204,17 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -6527,62 +5222,62 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation>Fase Desconocida</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation>Endereza</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation>Mantenimiento</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation>Dibuja</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation>Primero Principal</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation>Comienzo del Combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation>Declarar atacantes</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation>Declarar bloqueadores</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation>Daño de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation>Fin del Combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation>Segundo Principal</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation>Paso Final/Limpieza</translation>
     </message>
@@ -6590,57 +5285,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Paso final</translation>
     </message>
@@ -6648,213 +5343,703 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>es</translation>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation>Ver cartas de la parte superior de la biblioteca</translation>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>Muestra las primeras cartas 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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <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"/>
-        <source>View bottom cards of library</source>
-        <translation>Ver cartas de la parte inferior de la biblioteca</translation>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>Ver &amp;cementerio</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>Ver &amp;exilio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>Jugador &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;Cementerio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;Exiliar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>&amp;Mover mano a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>&amp;Parte superior de la biblioteca</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>&amp;Fondo de la biblioteca</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>&amp;Mover el cementerio a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;Mano</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>Mover las cartas exiliadas a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>&amp;Ver biblioteca</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation>&amp;Ver mano</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>Ver cartas de la parte &amp;superior de la biblioteca...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>Enseñar &amp;biblioteca a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>&amp;Siempre revelar la carta superior</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>Ver banquillo (&amp;S)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;Robar carta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>&amp;Robar cartas...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>&amp;Deshacer último robo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>Hacer &amp;mulligan</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>Jugar la primera carta &amp;boca abajo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation>Mover la primera carta del &amp;cementerio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation>Mover la carta superior al e&amp;xilio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>Mover cartas de la parte s&amp;uperior de la biblioteca al cementerio...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>Mover cartas superiores al &amp;exilio...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>Poner carta superior en la parte &amp;inferior</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>&amp;Enseñar mano a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Revelar una carta al &amp;azar a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation>Revelar una carta al azar a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>Banquillo (&amp;S)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Biblioteca</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>&amp;Contadores</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>&amp;Enderezar todos los permanentes</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>&amp;Lanzar dado...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>Crear &amp;Ficha...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>C&amp;rear otra ficha</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>Cr&amp;ear ficha predefinida</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>&amp;Todos los jugadores</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>D&amp;ecir</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Jugar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>&amp;Ocultar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>Jugar boca abajo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation>&amp;Girar / Enderezar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Alternar enderezamiento &amp;normal</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation>D%ar vuelta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>&amp;Mirar el dorso de la carta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>&amp;Clonar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>Ane&amp;xar a una carta...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>Desane&amp;xar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>&amp;Dibujar flecha...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>&amp;Incrementar fuerza</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>&amp;Decrementar fuerza</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>I&amp;ncrementar resistencia</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>D&amp;ecrementar resistencia</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>In&amp;crementar fuerza y resistencia</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>Dec&amp;rementar fuerza y resistencia</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation>Incrementa fuerza y decrementar resistencia</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation>Decrementar fuerza e incrementar resistencia</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>Establecer &amp;fuerza y resistencia...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation>Reiniciar f&amp;uerza y resistencia</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>E&amp;scribir anotación...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>&amp;Añadir contador (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;Eliminar contador (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>&amp;Establecer contadores (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation>X cartas desde la parte superior de su biblioteca</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation>&amp;Al fondo de la librería en orden aleatorio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <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.cpp" line="1175"/>
+        <source>View bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <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.cpp" line="3188"/>
+        <source>Which position should this card be placed:</source>
+        <translation>En qué posición debería esta carta estar colocada:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <source>(max. %1)</source>
+        <translation>(max. %1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1310"/>
         <source>Draw hand</source>
-        <translation>Robar mano</translation>
+        <translation>Robar carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
+        <location filename="src/game/player/player.cpp" line="1312"/>
         <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
+        <translation>0 o menos son en comparación con el tamaños de mano actual</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
         <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <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.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>Mover cartas superiores al cementerio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation>Mostrar &amp;cartas de la parte superior...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation>&amp;Parte superior de la biblioteca...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation>&amp;Fondo de la biblioteca...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation>Siempre mirar la carta superior</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation>Abrir baraja en el editor de barajas</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation>Jugar carta de la parte superior</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation>Robar carta del fondo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation>Robar cartas del fondo...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation>Jugar carta del fondo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation>Jugar carta del fondo boca abajo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation>Mover carta del fondo al cementerio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation>Mover carta del fondo al exilio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation>Mover cartas del fondo al cementerio...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation>Mover cartas del fondo al exilio...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation>Poner carta del fondo en la parte superior</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation>Cartas seleccionadas</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>Mover cartas superiores al exilio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation>Mover cartas del fondo al cementerio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation>Mover cartas del fondo al exilio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation>Robar cartas del fondo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation>Crear otro token %1</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation>Crear fichas</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
         <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
+        <translation>Pone carta X cartas desde la parte superior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <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.cpp" line="3534"/>
         <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.cpp" line="3534"/>
         <source>Change stats to:</source>
-        <translation type="unfinished"/>
+        <translation>Cambiar estadísticas a:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player.cpp" line="3653"/>
         <source>Set annotation</source>
-        <translation type="unfinished"/>
+        <translation>Escribir anotación</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player.cpp" line="3654"/>
         <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
+        <translation>Por favor, introduza la nueva anotación:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <source>Set counters</source>
         <translation>Establecer contadores</translation>
     </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <source>&amp;Counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingDisabledInfoWidget</name>
-    <message>
-        <location filename="src/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"/>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation>Vea cartas relacionadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>Ficha:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>Todas las fichas</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6862,7 +6047,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"/>
     </message>
@@ -6870,150 +6055,84 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
-        <translation>Siguiente carta en el mazo</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
-        <translation>Fecha de lanzamiento</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="36"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="52"/>
-        <source>Descending</source>
-        <translation>Descendente</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
-        <source>Ascending</source>
-        <translation>Ascendente</translation>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation>Fuerza / resistencia</translation>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <source>Descending</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation>&amp;Incrementar fuerza</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation>&amp;Reducir fuerza</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation>I&amp;ncrementar resistencia</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <translation>R&amp;educir resistencia</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
-        <source>In&amp;crease power and toughness</source>
-        <translation>In&amp;crementar fuerza y resistencia</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation>Red&amp;ucir fuerza y resistencia</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation>Incrementa fuerza y reducir resistencia</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation>Reducir fuerza e incrementar resistencia</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <translation>Establecer &amp;fuerza y resistencia...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
-        <source>Reset p&amp;ower and toughness</source>
-        <translation>Reiniciar f&amp;uerza y resistencia</translation>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <source>Ascending</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>Servicios</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>Ocultar %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>Ocultar otros</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>Mostrar todo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>Preferencias...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>Salir %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>Sobre %1</translation>
     </message>
@@ -7021,162 +6140,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Base de datos de cartas de Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>Todos los archivos (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Repeticiones de Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
-        <translation>Mazo principal</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
-        <translation>Banquillo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
-        <translation>Fichas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
-        <translation>Sobrescribir archivo existente?</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"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <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>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation>Guardar todo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation>&amp;Sí</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation>Sí a &amp;Todo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation>N&amp;o a todo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation>Volver a intentar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation>Descartar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation>Restaurar predeterminados</translation>
     </message>
@@ -7184,17 +6276,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Tiempo de subida</translation>
     </message>
@@ -7202,177 +6294,131 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>Jugadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>Mantener</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>Tiempo de inicio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>Duración (seg.)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exilio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation>Ver &amp;exilio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Mano</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cementerio</translation>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>E&amp;ntrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>Permisos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Jugadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
-        <translation>Selecciona una acción de la tabla</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
-        <translation>Presiona la tecla/combinación de teclas que desees configurar para esta acción</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
-        <translation>Clave inválida</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
-        <translation>Limpiar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
-        <translation>Restaurar configuración predeterminada</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>Tipo de set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>Código de set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Nombre largo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>Fecha de lanzamiento</translation>
     </message>
@@ -7380,53 +6426,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation>Sección:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation>Acción:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation>Atajo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7434,27 +6480,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
-        <translation>Acción</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
-        <translation>Atajo</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Su archivo de configuración contiene atajos inválidos.
 Por favor, revise su configuración de atajos.</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Los siguientes atajos han sido ajustados a como eran por defecto:</translation>
@@ -7463,58 +6509,45 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>&amp;Motivo para el apagado:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;Tiempo hasta el apagado (minutos):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>Apagar servidor</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation>&amp;Banquillo</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <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/dialogs/dlg_settings.cpp" line="1544"/>
         <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/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <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/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>Volumen maestro</translation>
     </message>
@@ -7522,48 +6555,48 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation>La temporada de Spoilers ha terminado</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Eliminando spoiler.xml Por favor, ejecute Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation>Error al descargar Spoilers</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation>No hay conexión a internet</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation>Los spoilers ya están actualizados</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation>No se han añadido nuevos spoilers</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation>Los Spoilers han sido actualizados!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation>Último cambio:</translation>
     </message>
@@ -7571,27 +6604,27 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
-        <translation>Por defecto</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>No se recibe respuesta del servidor de lanzamiento de actualizaciones.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Respuesta invalida del servidor de lanzamiento de actualizaciones.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>No se recibe respuesta del servidor de etiquetas de actualizaciones.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Respuesta invalida del servidor de etiquetas de actualizaciones.</translation>
     </message>
@@ -7599,307 +6632,184 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
-        <translation>Cuenta</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>Administración</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>Actualizar &amp;mensaje del servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;Apagar servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>Volver a carga&amp;r la configuración</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Funciones de administración del servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>&amp;Desbloquear funciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>&amp;Bloquear funciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
-        <translation>Éxito</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
-        <translation>Error</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <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/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>Mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>Flotante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <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/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Mazo: %1</translation>
     </message>
@@ -7907,55 +6817,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <source>Card Info</source>
-        <translation>Información de la carta</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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <source>Deck</source>
-        <translation>Mazo</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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <source>Visible</source>
-        <translation>Visible</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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7963,22 +6886,22 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7986,139 +6909,139 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>Sistema de archivos local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Almacen de mazos del servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Abrir en el editor de mazos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Subir mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Descargar mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>Nueva carpeta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation>Archivo de baraja inválido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Introduzca el nombre del mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>Esta lista de mazo no tiene un nombre.
 Por favor, introduce un nombre:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Mazo sin nombre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation>Fallo al subir baraja al servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>Borrar fichero local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>Nombre de la nueva carpeta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8126,17 +7049,17 @@ Por favor, introduce un nombre:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Error</source>
-        <translation>Error</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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8144,7 +7067,7 @@ Por favor, introduce un nombre:</translation>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8152,391 +7075,407 @@ Por favor, introduce un nombre:</translation>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
-        <translation>&amp;Cartas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
-        <translation>Etiquetas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
-        <translation>Buscar una carta ...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
-        <translation>Buscar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <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/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>&amp;Fases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>&amp;Partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <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/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <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/client/tabs/tab_game.cpp" line="236"/>
         <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/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <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/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation>&amp;Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <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/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <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/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>&amp;Decir:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation>Cartas seleccionadas</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>Flotante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <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/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation>Revertir rendición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation>Estás saturando la partida. Por favor, espera unos minutos.</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>expulsado por el anfitrión del juego o moderador</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>jugador ha dejado la partida</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>jugador se ha desconectado del servidor</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation>razón desconocida</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>Has sido expulsado de la partida.</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation>Inicio</translation>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>Historial</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>Time;SenderName;SenderIP;Message;TargetID;TargetName</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>Registros de sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>Registros de partidas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>Registros de chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>Debes seleccionar como mínimo un filtro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>Debes seleccionar un número de días válido para buscar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>Nombre de usuario:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>Dirección IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>Nombre de partida:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>ID de partida:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>Mensaje:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>Sala Principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>Sala de Partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>Chat privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>Pasados X días:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>Última hora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>Resultados máximos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>Se requiere un filtro como mínimo.
 Cuando más información introduzcas, más específicos serán los resultados.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>Ver registros de usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>Borrar filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>Localización de registro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>Alcance de fecha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>Resultados máximos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>Historial de mensajes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>Error al recopilar información del historial de mensajes.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>No hay mensajes con los filtros seleccionados</translation>
     </message>
@@ -8544,37 +7483,37 @@ Cuando más información introduzcas, más específicos serán los resultados.</
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>&amp;Chat privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;Cerrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Chat privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>El usuario te esta ignorando, los usuarios no podrán ver tus mensajes en el chat principal y no podrás unirte a sus partidas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>Mensaje privado de</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 ha abandonado el servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 se ha unido al servidor.</translation>
     </message>
@@ -8582,233 +7521,153 @@ Cuando más información introduzcas, más específicos serán los resultados.</
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>Sistema de archivos local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>Almacén de repeticiones del servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>Ver repetición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
-        <translation>Renombrar</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"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
-        <translation>Nueva carpeta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>Descargar repetición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>Alternar expiración del bloqueo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
-        <translation>Error</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>Borrar fichero local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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>Fallido</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>Borrar repetición remota</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
-        <translation>Repetición de partidas</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;Decir:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Dejar sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>&amp;Limpiar chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>Preferencias del Chat...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation> te ha mencionado.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>Click para ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>Estás saturando el chat. Por favor, espera unos segundos.</translation>
     </message>
@@ -8816,35 +7675,35 @@ Cuando más información introduzcas, más específicos serán los resultados.</
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation>Fallo al unirse a la sala del servidor: no existe en el servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation>El servidor cree que estás en la sala del servidor pero tu cliente es incapaz de mostrarlo. Intenta reiniciar tu cliente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation>No tienes los permisos requeridos para unirte a esta sala del servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation>Fallo al unirse a la sala del servidor debido a un error desconocido: %1.</translation>
     </message>
@@ -8852,97 +7711,87 @@ Cuando más información introduzcas, más específicos serán los resultados.</
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
-        <translation>Editor de mazos</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation>Inicio</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
-        <translation>Servidor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
-        <translation>Cuenta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
-        <translation>Administración</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>¿Estás seguro?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>Todavía hay partidas abiertas. ¿Estás seguro/a de que quieres salir?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation>Click para ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Tu amigo %1 se ha conectado!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>Evento desconocido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8952,39 +7801,39 @@ Este mensaje podría significar que hay una nueva versión de Cockatrice disponi
 Para actualizar tu cliente, ve a Ayuda -&gt; Buscar Actualizaciones.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation>Tiempo de ausencia agotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Va a ser desconectado por inactividad.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>Promoción</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation>Has sido promocionado. Por favor cierra la sesión y vuelve a iniciarla para que los cambios surtan efecto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>Advertido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>Has recibido una advertencia debido a %1
 Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas contra usted. Si tiene alguna pregunta, por favor envíe un mensaje privado a un moderador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>Ha recibido los siguientes mensajes del servidor.
@@ -8994,12 +7843,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -9007,13 +7851,13 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>Análisis de mazo no disponible.</translation>
     </message>
@@ -9021,13 +7865,13 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>El archivo no existe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>Error al abrir el archivo</translation>
@@ -9036,42 +7880,42 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Vida</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Blanco</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Azul</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Negro</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Rojo</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Verde</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Sin Color</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Otro</translation>
     </message>
@@ -9079,7 +7923,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>No se pudo abrir el archivo para su lectura.</translation>
     </message>
@@ -9087,206 +7931,184 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>&amp;Detalles del usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>&amp;Chat privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Mostrar &amp;partidas de este usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>Añadir a la lista de &amp;amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Quitar de la lista de &amp;amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>Añadir a la lista de &amp;ignorados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Quitar de la lista de &amp;ignorados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>Expulsar de la &amp;partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>Usuario advertido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Ver historial de advertencias del usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>Banear del &amp;servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Ver historial historial de baneo del usuario.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promocionar usuario a moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Degradar usuario de m&amp;oderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation>Usuario promovido a &amp;juez</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation>Degradar usuario de juez</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <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>Error</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <source>This user does not exist.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>Partidas de %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>Historial de baneo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>El usuario nunca ha sido baneado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation>Error al recopilar informacion de baneos.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>Historial de advertencias</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>Warning Time;Moderator;User Name;Reason</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>El usuario nunca ha sido advertido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation>Error al recopilar información de advertencias.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>Usuario promocionado con éxito.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>Usuario degradado con éxito.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>Fallo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>Fallo al promocionar usuario.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>Fallo al degradar usuario.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation>Copiar al portapapeles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Borrar mensajes de este usuario</translation>
     </message>
@@ -9294,173 +8116,173 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Localización:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>Tiempo de la cuenta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>Cambiar contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>Cambiar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Administrador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>Moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Usuario registrado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Usuario no registrado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation>Juez</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation>La contraseña introducida no coincide con tu cuenta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>Información del usuario actualizada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation>Información de usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation>Nombre real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation>Nivel de usuario:</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation><numerusform>%n año,</numerusform><numerusform>%n años,</numerusform><numerusform>%n año(s),</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation><numerusform>%10%n día %20</numerusform><numerusform>%10%n días %20</numerusform><numerusform>%10%n días %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>Introducir contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation>Se requiere verificación de la contraseña para cambiar tu dirección de correo electrónico</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation>Un error ha ocurrido mientras intentaba actualizarse tu información de usuario.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>Este servidor no permite actualizar su información de usuario.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>Tu contraseña ha sido cambiada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>Este servidor no permite cambiar tu contraseña.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>La nueva contraseña es muy corta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>La contraseña anterior no es correcta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>Avatar actualizado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Este servidor no permite actualizar avatar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>Ocurrió un error mientras se actualizaba tu avatar.</translation>
     </message>
@@ -9468,152 +8290,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <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/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <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/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <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/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
-        <translation>no hacer nada</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9621,241 +8428,86 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation>&amp;Lanzar dado...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
-        <source>Save Filter</source>
-        <translation>Guardar filtro</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9863,27 +8515,27 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
-        <translation>Cargar desde mazo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9891,7 +8543,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/client/ui/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 +8551,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9919,37 +8571,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9957,93 +8599,45 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
-        <source>Change how cards are divided into categories/groups.</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</source>
         <translation type="unfinished"/>
     </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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <source>Draw a new sample hand</source>
-        <translation>Robar una nueva mano de muestra</translation>
+        <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10051,25 +8645,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10077,52 +8692,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>None</source>
-        <translation>Ninguno</translation>
+        <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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10130,7 +8740,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10138,22 +8748,22 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10161,17 +8771,17 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10179,43 +8789,43 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>¿Qué advertencia quieres enviar?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Redactar todos los mensajes de este usuario en todas las salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>Usuario advertido por conducta inadecuada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>El nombre de usuario no puede quedarse en blanco, por favor especifique un usuario al que advertir.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>La advertencia no puede quedarse en blanco, por favor seleccione una advertencia válida.</translation>
     </message>
@@ -10223,133 +8833,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <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/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation>Consejos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation>Mantenedor de ediciones</translation>
     </message>
@@ -10357,72 +8967,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="52"/>
         <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="219"/>
         <source>Ungrouped</source>
-        <translation>Desagrupado</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <source>Group by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <source>Group by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <source>Group by Color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
+        <source>Unsorted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
-        <source>Group by Type</source>
-        <translation>Agrupar por tipo</translation>
+        <source>Sort by Name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
-        <source>Group by Mana Value</source>
-        <translation>Agrupar por valor de maná</translation>
+        <source>Sort by Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
-        <source>Group by Color</source>
-        <translation>Agrupar por color</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
-        <source>Unsorted</source>
-        <translation>Desordenado</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
-        <source>Sort by Name</source>
-        <translation>Ordenar por nombre</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
-        <source>Sort by Type</source>
-        <translation>Ordenar por tipo</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Mana Cost</source>
-        <translation>Ordenar por coste de maná</translation>
+        <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="233"/>
         <source>Sort by Colors</source>
-        <translation>Ordenar por colores</translation>
+        <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>vista de la pila</translation>
     </message>
@@ -10430,7 +9040,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Español (Spanish)</translation>
     </message>
@@ -10438,12 +9048,12 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation>Conectar al inicio</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation>Depurar a archivo</translation>
     </message>
@@ -10451,1060 +9061,993 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>Ventana principal</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>Editor de mazos</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>Vestíbulo de juego</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation>Contadores de carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation>Contadores de jugador</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Fuerza y resistencia</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Fases del juego</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>Area de juego</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation>Mover la carta seleccionada</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation>Mover la carta superior</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation>Mover la carta inferior</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Gameplay</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation>Robar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation>Sala de chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation>Ventana de juego</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation>Cargar deck desde el portapapeles</translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
-        <translation>Repeticiones</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
-        <translation>Pestañas</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation>Buscar actualizaciones de cartas ...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation>Conectar...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation>Registrar...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation>Ajustes...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation>Empezar una partida local...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation>Ver repetición...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation>Eliminar filtros</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation>Eleminar filtro seleccionado</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation>Quitar carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation>Administrar ediciones</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation>Editar fichas personalizadas</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation>Añadir carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation>Cargar mazo...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Cargar mazo desde el portapapeles</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation>Nuevo mazo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Abrir carpeta de imágenes personalizadas</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation>Imprimir mazo...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation>Borrar carta</translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation>Restablecer disposición</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>Guardar mazo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation>Guarda mazo como...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Guarda mazo al portapapeles, Comentado</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation>Guardar mazo al portapapeles</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation>Cargar mazo local...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation>Carga mazo remoto...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation>Marcar listo para empezar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Permitir bloqueo de banquillo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation>Añadir contador verde</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation>Retirar un contador verde</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation>Establecer contadores verdes...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation>Agregar contador rojo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation>Retirar un contador rojo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation>Establecer contadores rojos...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation>Añadir contador de vida</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
-        <translation>Forzar inicio</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation>Retirar un contador de vida</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation>Establecer contadores de vida...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation>Agregar contador blanco</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation>Retirar un contador blanco...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation>Establecer contadores blancos...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation>Agregar contador azul</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation>Retirar un contador azul...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation>Establecer contadores azules...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation>Agregar contador negro</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation>Quitar contador negro</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation>Establecer contadores negros...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation>Agregar contador incoloro</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation>Retirar contador incoloro</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation>Establecer contadores incoloros...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation>Añadir otro contador</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation>Borrar otro contador</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation>Colocar otros contadores...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation>Agregar fuerza (+1/+0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Reducir fuerza (-1/-0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Pasar de resistencia a fuerza (+1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Agregar resistencia (+0/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Reducir resistencia (-0/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Pasar de fuerza a resistencia (-1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Agregar fuerza y resistencia (+1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Reducir fuerza y resistencia (-1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation>Establecer fuerza y resistencia...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation>Restablecer fuerza y resistencia</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>Enderezar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>Mantenimiento</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>Robo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation>Primera fase principal</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation>Comenzar combate</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>Ataque</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>Bloqueo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>Daño</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation>Terminar combate</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation>Segunda fase principal</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>Final</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation>Próxima fase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation>Próxima fase de acción</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation>Próximo turno</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation>Girar / Enderezar Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation>Enderezar todas</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
+        <translation>Alternar enderezamiento</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation>Girar carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation>Mirar carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation>Jugar carta</translation>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation>Anexar carta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation>Desanexar carta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation>Clonar carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation>Crear ficha...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <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/settings/shortcuts_settings.h" line="518"/>
         <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/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation>Escribir anotación...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation>Parte superior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation>Campo de batalla, boca abajo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation>Campo de batalla</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Biblioteca</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>Banquillo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation>Carta de la parte superior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation>Cerrar vista reciente</translation>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <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/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation>Dibujar flecha</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation>Eliminar flechas</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation>Abandonar partida</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation>Lanzar dado...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation>Barajar biblioteca</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <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/settings/shortcuts_settings.h" line="650"/>
         <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/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation>Deshacer último robo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <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/settings/shortcuts_settings.h" line="659"/>
         <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"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <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/settings/shortcuts_settings.h" line="665"/>
         <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/settings/shortcuts_settings.h" line="668"/>
         <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/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation>Resaltar el chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation>Borrar chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation>Actualizar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation>Inicio</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
-        <translation>Almacenamiento de mazos</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
-        <translation>Servidor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
-        <translation>Cuenta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
-        <translation>Administración</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
-        <translation>Historial</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/cockatrice/translations/cockatrice_et.ts b/cockatrice/translations/cockatrice_et.ts
index 2df3cbdac..a2ceb76de 100644
--- a/cockatrice/translations/cockatrice_et.ts
+++ b/cockatrice/translations/cockatrice_et.ts
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,66 +36,66 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="247"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <source>The decklist has been modified.
 Do you want to save the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <source>The deck could not be saved.
 Please check that the directory is writable and try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
@@ -103,12 +103,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -116,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -129,316 +129,251 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Could not create themes directory at &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>Teema valikud</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Praegune teema:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation>Kaartide visualiseerimine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <source>Display card names on cards having a picture</source>
         <translation>Kuva piltidega kaartidel kaardi nimi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <source>Bump sets that the deck contains cards from to the top in the printing selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="671"/>
         <source>Scale cards on mouse over</source>
         <translation>Muuda kaartide mõõtkava hiire ülejooksul</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="672"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="674"/>
         <source>Minimum overlap percentage of cards on the stack and in vertical hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="675"/>
         <source>Maximum initial height for card view window:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <source>Maximum expanded height for card view window:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
         <translation>Käe välimus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Kuva käsi horisontaalselt (raiskab ruumi)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="689"/>
         <source>Enable left justification</source>
         <translation>Luba vasakvormistus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <source>Table grid layout</source>
         <translation>Laua ruudustiku vormistus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="692"/>
         <source>Invert vertical coordinate</source>
         <translation>Põõra vertikaalne koordinaat pahupidi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="693"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Väikseim mängijate kogus mitmetulbaliseks vormistuseks:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Kaartidel kujutatava teabe fondi suurim suurus:</translation>
     </message>
 </context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>blokeeri &amp;kasutajanimi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>blokeeri &amp;IP-aadress</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>blokeeri kliendi I&amp;D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Blokeerimise tüüp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;igavene blokeering</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;ajutine blokeering</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Päeva:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Tundi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Blokeerimise kestvus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Palun sisestage blokeerimise põhjus.
 See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Palun sisestage blokeerimise põhjus, mis on nähtav blokeeritavale.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Tühista</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Blokeeri kasutaja serverist</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Peate valima, kas nimepõhise, IP-põhise või klientidpõhise blokeeringu või mingi kombinatsiooni kolmest et blokeerida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Sul peab olema väärtus nime blokeeringus kui valid nime blokeerimise.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Sul peab olema väärtus IP blokeeringus kui valid IP blokeerimise.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Sul peab olema väärtus klientid blokeeringus kui valid klientid blokeerimise.</translation>
     </message>
@@ -446,22 +381,22 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -469,32 +404,32 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Komplektid</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Manahind</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Kaardi tüüp</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>T/V</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Värv(id)</translation>
     </message>
@@ -502,96 +437,96 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -599,22 +534,22 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="71"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="74"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -622,22 +557,22 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -645,284 +580,172 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="76"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Liiguta asukohta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
-        <source>&amp;Tap / Untap</source>
-        <extracomment>Turn sideways or back again</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
-        <source>T&amp;urn Over</source>
-        <extracomment>Turn face up/face down</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Tugevus / vastupidavus</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>Nende käsi</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1 käsi</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>nende kogu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1 kogu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>nende kogu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1 kogu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>nende kogu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1 kogu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>nende kogu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>%1 kogu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>nende kogu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1 kogu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>nende surnuaed</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1 surnuaed</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>nende pagendus</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1 pagendus</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>nende külgpakk</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1 külgpakk</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>nende külgpakk</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1 külgpakk</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -931,7 +754,7 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +762,15 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +778,47 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <source>Show on EDHREC (Commander)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <source>Show on EDHREC (Card)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <source>Add card to &amp;maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1017,87 +826,87 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1105,17 +914,17 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>&amp;Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1123,114 +932,109 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="161"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="171"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="173"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1042,7 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,166 +1050,166 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <source>One or more downloaded card pictures could not be cleared.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1100"/>
         <source>Add URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <source>URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <source>How long cached redirects for urls are valid for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1211"/>
         <source>Press the button to manually update without relaunching</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1212"/>
         <source>Do not close settings until manual update is complete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1213"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1214"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1215"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1218"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1413,27 +1217,27 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>Number</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Kaart</translation>
     </message>
@@ -1441,12 +1245,12 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/deck/deck_loader.cpp" line="22"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +1258,17 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1472,7 +1276,7 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1480,62 +1284,62 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1543,94 +1347,94 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/client/ui/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="320"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Are you sure you want to delete the selected file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
@@ -1638,13 +1442,13 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>Serveri vastust ei saadud kokku panda.</translation>
     </message>
@@ -1652,74 +1456,70 @@ See on mõeldud ainult moderaatoritele ja blokeeritav isik seda ei näe.</transl
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Lae pakk...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Lae kaugpakk...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
-        <source>Load from website...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
         <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="265"/>
         <source>The selected file could not be loaded.</source>
         <translation>Valitud faili ei suudetud laadida.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="329"/>
         <source>Are you sure you want to force start?
 This will kick all non-ready players from the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1727,19 +1527,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1747,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Teadaolevad hostid</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Uus võõrustaja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Võõrustaja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>Mängija &amp;nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>S&amp;alasõna:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Salvesta salasõna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>Automaatne ühendamine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Automaatselt ühenda viimasele sisselogimisele kui Cockatrice avaneb</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Sisselogimine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Ühenduse hoiatus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>Peate oma uuele ühendusprofiilile valima nime.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Ühendumisehoiatus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Mängija nimi ei saa olla tühi</translation>
     </message>
@@ -1896,117 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Jäta valikud meelde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Kirjeldus:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>M&amp;ängijad:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Mängu tüüp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Salasõna:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Ainult &amp;sõbrad saavad liituda</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Ainult &amp;registreeritud kasutajad saavad liituda</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="79"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Ühendamispiirangud</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="82"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>&amp;Vaatlejad saavad vaadata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Vaatlejatel on vaja salasõna et vaadata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Vaatlejad saavad &amp;jutustada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Vaatlejad saavad &amp;käsi vaadata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Vaatlejad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="105"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;Tühjenda</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Loo mäng</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Mängu info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Serveri viga.</translation>
     </message>
@@ -2014,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nimi:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Märgistused</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>V&amp;ärv:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>valge</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>sinine</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>must</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>punane</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>roheline</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>mitmevärviline</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>värvitu</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;T/V:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Märkus:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Hävita märgistus kui see lahkub laualt</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Märgistusinfo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Näita &amp;kõik märgistused</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Näita märgistusi siit &amp;pakist</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Vali märgistus nimekirjast</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Loo märgistus</translation>
     </message>
@@ -2112,53 +1907,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +1961,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Pilti pole valitud</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Et muuta avatari, vali uus pilt.
 Et eemaldada praegust avatari, kinnita ilma uue pildi valimata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Otsi...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Muuda avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Ava pilt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Pildi Failid (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Vigane pilt valitud.</translation>
     </message>
@@ -2207,17 +2002,17 @@ Et eemaldada praegust avatari, kinnita ilma uue pildi valimata.</translation>
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2020,38 @@ Et eemaldada praegust avatari, kinnita ilma uue pildi valimata.</translation>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Vana salasõna:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Uus salasõna:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Kinnita uus salasõna:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Vaheta salasõna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Uued salasõnad ei kattu.</translation>
     </message>
@@ -2264,93 +2059,93 @@ Et eemaldada praegust avatari, kinnita ilma uue pildi valimata.</translation>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>V&amp;ärv:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>valge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>sinine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>must</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>punane</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>roheline</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>mitmevärviline</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>värvitu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;T/V:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Märkus:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Märgistusandmed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Lisa märgistus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Eemalda märgistus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Sisenda märgistuse nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="157"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="158"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation type="unfinished"/>
@@ -2359,27 +2154,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Riik:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Ebamääratletud</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Päris nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Muuda kasutaja profiili</translation>
     </message>
@@ -2387,142 +2182,137 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
         <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>Mängu &amp;kirjeldus:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>%Looja nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>&amp;Mängu tüübid</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>&amp;vähemalt:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>&amp;enamjaolt:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Mängijate ülempiir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Piirangud</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Filtreeri mänge</translation>
     </message>
@@ -2530,52 +2320,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>Esitaja &amp;nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>E-post:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>E-posti aadressi väli ei saa jääda tühjaks.</translation>
     </message>
@@ -2583,37 +2373,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>Esitaja &amp;nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Esitaja nime väli ei saa jääda tühjaks.</translation>
     </message>
@@ -2621,86 +2411,86 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="58"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="103"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="111"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="121"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="116"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="121"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="127"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="127"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation type="unfinished"/>
     </message>
@@ -2708,7 +2498,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -2716,75 +2506,25 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <source>Load deck from clipboard</source>
         <translation>Lae pakk lõikelaualt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Vigane pakilist:</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Lae pakk</translation>
     </message>
@@ -2792,37 +2532,37 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <source>Put top cards on stack until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -2830,91 +2570,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Võõrustaja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>Mängija &amp;nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>S&amp;alasõna:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Salasõna (uuesti):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Email (uuesti):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Riik:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Ebamääratletud</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="318"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Päris nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="353"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Registreeri serveriga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="373"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Registreerimishoiatus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Su salasõnad ei kattu, palun proovi uuesti.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Su emailid ei kattu, palun proovi uuesti.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="373"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Mängija nimi ei saa olla tühi.</translation>
     </message>
@@ -2922,17 +2662,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -2940,27 +2680,27 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
@@ -2968,12 +2708,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="1861"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <source>Unknown Error loading card database</source>
         <translation>Ebateatud kaardi laadimis andmebaas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -2990,7 +2730,7 @@ Sul võib vaja olla oraaklit uuesti jooksutada et uuendada kaardi andmebaasi.
 Kas sa tahaksid muuta andmebaasi asukoha seadmeid?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3007,7 +2747,7 @@ Tavaliselt seda saab parantada oraakli uuesti jooksutamisega et uuentada kaartid
 Kas sa tahad muuta andmebaasi asukoha valikuid?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1813"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3016,7 +2756,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3025,7 +2765,7 @@ Would you like to change your database location setting?</source>
 Kaas sa tahaks muuta andmebaasi asukoha valikuid?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3034,7 +2774,7 @@ Would you like to change your database location setting?</source>
 Kas sa tahaks muuta enda andmebaasi asukoha valikuid?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3043,59 +2783,59 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <source>The path to your deck directory is invalid. Would you like to go back and set the correct path?</source>
         <translation>Tee paki kataloogi on vigane. Kas sa tahaks tagasi minna ja seada õige tee?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1856"/>
         <source>The path to your card pictures directory is invalid. Would you like to go back and set the correct path?</source>
         <translation>Tee kaartide piltidele on vigane. Kas sa tahaks tagasi minna ja seada õige tee?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Valikud</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Üldine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Välimus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>Kasutajaliides</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Jutustamine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Hääl</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Lühiteed</translation>
     </message>
@@ -3103,39 +2843,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3143,17 +2883,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
@@ -3161,164 +2901,168 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Ava allalaadimisleht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Uuenduste otsimine...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Uuendusviga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Paigaldamine...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3326,17 +3070,17 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Putukaeemalduslogi</translation>
     </message>
@@ -3344,12 +3088,12 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3357,47 +3101,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3405,7 +3149,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
@@ -3413,22 +3157,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
         <source>Game Changers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
         <source>Budget</source>
         <translation type="unfinished"/>
     </message>
@@ -3436,7 +3180,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3444,7 +3188,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation type="unfinished"/>
     </message>
@@ -3452,166 +3196,143 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Palun ühine sobiva toaga enne.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Vale salasõna.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Vaatlejad ei ole selles mängus lubatud.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>Mäng on juba täis.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
@@ -3619,105 +3340,100 @@ You may have to manually download the new version.</source>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="155"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
@@ -3725,1241 +3441,887 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="333"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/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/dialogs/dlg_settings.cpp" line="362"/>
         <source>Language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="375"/>
         <source>Card database:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/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/dialogs/dlg_settings.cpp" line="377"/>
         <source>Token database:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <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="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>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="214"/>
-        <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>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="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="218"/>
-        <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>Move top cards to &amp;exile...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="221"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="224"/>
-        <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;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>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>Move bottom cards to &amp;graveyard...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="231"/>
-        <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>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="310"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
         <source>Number of players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
         <source>Please enter the number of players.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <source>Congratulations on updating to Cockatrice %1!
 Oracle will now launch to update your card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <source>Congratulations on installing Cockatrice %1!
 Oracle will now launch to install the initial card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <source>Cockatrice is unable to load the card database.
 Do you want to update your card database now?
 If unsure or first time user, choose &quot;Yes&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <source>Hi! It seems like you're running this version of Cockatrice for the first time.
 All the sets in the card database have been enabled.
 Read more about changing the set order or disabling specific sets and consequent effects in the &quot;Manage Sets&quot; dialog.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/client/ui/window_main.cpp" line="1259"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <source>Failed to start. The file might be missing, or permissions might be incorrect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/client/ui/window_main.cpp" line="1289"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <location filename="src/client/ui/window_main.cpp" line="1293"/>
         <source>Timed out. The process took too long to respond. The last waitFor...() function timed out.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <location filename="src/client/ui/window_main.cpp" line="1296"/>
         <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <location filename="src/client/ui/window_main.cpp" line="1300"/>
         <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
+        <location filename="src/client/ui/window_main.cpp" line="1365"/>
         <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.
 
@@ -4967,54 +4329,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="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <location filename="src/client/ui/window_main.cpp" line="1428"/>
         <source>The new sets/cards have been added successfully.
 Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
+        <location filename="src/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/client/ui/window_main.cpp" line="1493"/>
         <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
+        <location filename="src/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
@@ -5022,8 +4384,8 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
@@ -5031,8 +4393,8 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
@@ -5040,8 +4402,8 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
@@ -5049,590 +4411,586 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/server/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="45"/>
+        <location filename="src/server/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="47"/>
+        <location filename="src/server/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="49"/>
+        <location filename="src/server/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="54"/>
+        <location filename="src/server/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="56"/>
+        <location filename="src/server/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="61"/>
+        <location filename="src/server/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="63"/>
+        <location filename="src/server/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="69"/>
+        <location filename="src/server/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="71"/>
+        <location filename="src/server/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="76"/>
+        <location filename="src/server/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="78"/>
+        <location filename="src/server/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="83"/>
+        <location filename="src/server/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="85"/>
+        <location filename="src/server/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="89"/>
+        <location filename="src/server/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="91"/>
+        <location filename="src/server/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="93"/>
+        <location filename="src/server/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="119"/>
+        <location filename="src/server/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="120"/>
+        <location filename="src/server/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="127"/>
+        <location filename="src/server/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="128"/>
+        <location filename="src/server/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="135"/>
+        <location filename="src/server/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="146"/>
+        <location filename="src/server/message_log_widget.cpp" line="143"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/server/message_log_widget.cpp" line="160"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/server/message_log_widget.cpp" line="176"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/server/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/server/message_log_widget.cpp" line="183"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/server/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/server/message_log_widget.cpp" line="195"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <location filename="src/server/message_log_widget.cpp" line="198"/>
         <source>%1 points from their %2 to %3&apos;s %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <location filename="src/server/message_log_widget.cpp" line="204"/>
         <source>%1 points from %2&apos;s %3 to their own %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <location filename="src/server/message_log_widget.cpp" line="210"/>
         <source>%1 points from %2&apos;s %3 to %4&apos;s %5.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/server/message_log_widget.cpp" line="223"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/server/message_log_widget.cpp" line="225"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/server/message_log_widget.cpp" line="235"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <location filename="src/server/message_log_widget.cpp" line="237"/>
         <source>%1 has loaded a deck with %2 sideboard cards (%3).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/server/message_log_widget.cpp" line="247"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <source>%1 gives %2 control over %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/server/message_log_widget.cpp" line="300"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/server/message_log_widget.cpp" line="302"/>
         <source>%1 puts %2 into play%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/server/message_log_widget.cpp" line="305"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <source>%1 exiles %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/server/message_log_widget.cpp" line="309"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/server/message_log_widget.cpp" line="312"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <location filename="src/server/message_log_widget.cpp" line="314"/>
         <source>%1 puts %2%3 onto the bottom of their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/server/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <location filename="src/server/message_log_widget.cpp" line="320"/>
         <source>%1 puts %2%3 into their library %4 cards from the top.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/server/message_log_widget.cpp" line="323"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/server/message_log_widget.cpp" line="326"/>
         <source>%1 plays %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <location filename="src/server/message_log_widget.cpp" line="329"/>
         <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/server/message_log_widget.cpp" line="348"/>
         <source>%1 tries to draw from an empty library</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/server/message_log_widget.cpp" line="350"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/server/message_log_widget.cpp" line="360"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <location filename="src/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <comment>top card for singular, top %3 cards for plural</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/server/message_log_widget.cpp" line="380"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/server/message_log_widget.cpp" line="386"/>
         <source>The game has been closed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/server/message_log_widget.cpp" line="397"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/server/message_log_widget.cpp" line="403"/>
         <source>%1 is now watching the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/server/message_log_widget.cpp" line="408"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/server/message_log_widget.cpp" line="415"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/server/message_log_widget.cpp" line="421"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <location filename="src/server/message_log_widget.cpp" line="427"/>
         <source>%1 is not ready to start the game any more.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <location filename="src/server/message_log_widget.cpp" line="436"/>
         <source>%1 shuffles their deck and draws a new hand of %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/server/message_log_widget.cpp" line="441"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/server/message_log_widget.cpp" line="447"/>
         <source>You are watching a replay of game #%1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/server/message_log_widget.cpp" line="452"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/server/message_log_widget.cpp" line="478"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <location filename="src/server/message_log_widget.cpp" line="480"/>
         <source>%1 card(s)</source>
         <comment>a card for singular, %1 cards for plural</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/server/message_log_widget.cpp" line="489"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/server/message_log_widget.cpp" line="494"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/server/message_log_widget.cpp" line="500"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/server/message_log_widget.cpp" line="506"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/server/message_log_widget.cpp" line="513"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/server/message_log_widget.cpp" line="519"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/server/message_log_widget.cpp" line="521"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/server/message_log_widget.cpp" line="527"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/server/message_log_widget.cpp" line="534"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/server/message_log_widget.cpp" line="541"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/server/message_log_widget.cpp" line="556"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <location filename="src/server/message_log_widget.cpp" line="563"/>
         <source>%1 flips %2 coins. There are %3 heads and %4 tails.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/server/message_log_widget.cpp" line="573"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/server/message_log_widget.cpp" line="601"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/server/message_log_widget.cpp" line="607"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
+        <location filename="src/server/message_log_widget.cpp" line="618"/>
         <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="645"/>
+        <location filename="src/server/message_log_widget.cpp" line="620"/>
         <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="663"/>
+        <location filename="src/server/message_log_widget.cpp" line="638"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/server/message_log_widget.cpp" line="650"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/server/message_log_widget.cpp" line="652"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/server/message_log_widget.cpp" line="671"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <location filename="src/server/message_log_widget.cpp" line="676"/>
         <source>%1 changes the PT of %2 from nothing to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <location filename="src/server/message_log_widget.cpp" line="679"/>
         <source>%1 changes the PT of %2 from %3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/server/message_log_widget.cpp" line="687"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/server/message_log_widget.cpp" line="689"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/server/message_log_widget.cpp" line="707"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/server/message_log_widget.cpp" line="707"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/server/message_log_widget.cpp" line="710"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/server/message_log_widget.cpp" line="710"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/server/message_log_widget.cpp" line="726"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/server/message_log_widget.cpp" line="730"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/server/message_log_widget.cpp" line="735"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/server/message_log_widget.cpp" line="740"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/server/message_log_widget.cpp" line="756"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/server/message_log_widget.cpp" line="762"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -5640,201 +4998,163 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1466"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <source>Add message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1451"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1452"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1453"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1455"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1456"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1457"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1460"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1461"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1462"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="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="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="60"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="62"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -5842,17 +5162,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -5923,57 +5243,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="154"/>
         <source>Untap step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="156"/>
         <source>Upkeep step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="158"/>
         <source>Draw step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation type="unfinished"/>
     </message>
@@ -5981,192 +5301,703 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
-        <source>View top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game/player/player.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
-        <source>View bottom cards of library</source>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
-        <source>Shuffle top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
-        <source>Shuffle bottom cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
-        <source>Draw cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <source>Create tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
-        <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
-        <source>(max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
-        <source>Change power/toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
-        <source>Change stats to:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
-        <source>Set annotation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
-        <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game/player/player.cpp" line="769"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
         <source>S&amp;ay</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <source>View bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <source>Shuffle top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1276"/>
+        <source>Shuffle bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <source>Which position should this card be placed:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <source>(max. %1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change power/toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change stats to:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3653"/>
+        <source>Set annotation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3654"/>
+        <source>Please enter the new annotation:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Set counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6174,7 +6005,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"/>
     </message>
@@ -6182,17 +6013,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6200,124 +6031,66 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Descending</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6325,42 +6098,42 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
@@ -6368,92 +6141,92 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -6461,17 +6234,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation type="unfinished"/>
     </message>
@@ -6479,108 +6252,70 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <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="60"/>
-        <source>&amp;View exile</source>
-        <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;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="67"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
@@ -6588,32 +6323,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SequenceEdit</name>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation type="unfinished"/>
     </message>
@@ -6621,27 +6356,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -6649,53 +6384,53 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1642"/>
         <source>Do you really want to restore all default shortcuts?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1649"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1650"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6703,12 +6438,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -6716,13 +6451,13 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -6731,58 +6466,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -6790,48 +6512,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -6839,27 +6561,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -6867,17 +6589,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -6885,112 +6607,112 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"/>
     </message>
@@ -6998,53 +6720,53 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="116"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7052,61 +6774,68 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <source>&amp;Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7114,22 +6843,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7137,138 +6866,138 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="175"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="179"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <source>Are you sure you want to delete the selected decks?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -7276,17 +7005,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7294,7 +7023,7 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -7302,396 +7031,406 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <source>Replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <source>Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <source>Player List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <source>Messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <source>Next &amp;phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="230"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="233"/>
         <source>Next &amp;turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="236"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="239"/>
         <source>&amp;Remove all local arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="242"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="245"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="248"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="260"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="263"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Are you sure you want to concede this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <source>Are you sure you want to leave this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1053"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
-        <source>You have been kicked out of the game.</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
-        <source>Home</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
+        <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="67"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -7699,37 +7438,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation type="unfinished"/>
     </message>
@@ -7737,185 +7476,105 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
-        <source>Failed to get code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Either this server does not support replay sharing, or does not permit replay sharing for you.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
-        <source>Failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
-        <source>Replay Share Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Others can use this code to add the replay to their list of remote replays:
-%1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -7923,47 +7582,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation type="unfinished"/>
     </message>
@@ -7971,35 +7630,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -8007,92 +7666,87 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8100,38 +7754,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"/>
@@ -8140,7 +7794,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -8148,13 +7802,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation type="unfinished"/>
     </message>
@@ -8162,13 +7816,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"/>
@@ -8177,42 +7831,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -8220,7 +7874,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
@@ -8228,206 +7882,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="76"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="77"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <source>This user does not exist.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="93"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="213"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="234"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="238"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="218"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="235"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="247"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="247"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8435,173 +8067,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation type="unfinished"/>
     </message>
@@ -8609,137 +8241,137 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="873"/>
         <source>General interface settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="874"/>
         <source>&amp;Double-click cards to play them (instead of single-click)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="875"/>
         <source>&amp;Clicking plays all selected cards (instead of just the clicked card)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="876"/>
         <source>&amp;Play all nonlands onto the stack (not the battlefield) by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="877"/>
         <source>Close card view window when last card is removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="878"/>
         <source>Auto focus search bar when card view window is opened</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="879"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="880"/>
         <source>Use tear-off menus, allowing right click menus to persist on screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="883"/>
         <source>Notify in the taskbar for game events while you are spectating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="884"/>
         <source>Notify in the taskbar when users in your buddy list connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <source>&amp;Tap/untap animation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="887"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="888"/>
         <source>Open deck in new tab by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="889"/>
         <source>Use visual deck storage in game lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="890"/>
         <source>Use selection animation for Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="892"/>
         <source>When adding a tag in the visual deck storage to a .txt deck:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="898"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="899"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -8747,78 +8379,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
         <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="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
         <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="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
         <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -8826,17 +8425,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
@@ -8844,22 +8443,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="56"/>
+        <location filename="src/client/ui/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="57"/>
+        <location filename="src/client/ui/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="165"/>
+        <location filename="src/client/ui/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="165"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8867,27 +8466,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
         <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8895,7 +8494,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -8903,19 +8502,19 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySetFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
+        <location filename="src/client/ui/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="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8923,27 +8522,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="34"/>
+        <location filename="src/client/ui/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="60"/>
+        <location filename="src/client/ui/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="61"/>
+        <location filename="src/client/ui/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="172"/>
+        <location filename="src/client/ui/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="172"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8951,37 +8550,32 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
         <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="205"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
         <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="206"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
         <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="207"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
         <source>Filter by set</source>
         <translation type="unfinished"/>
     </message>
@@ -8989,12 +8583,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <source>Draw a new sample hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -9002,38 +8596,38 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
         <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_editor_widget.cpp" line="194"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <source>Quick search and add card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
         <source>Configure how cards are sorted within their groups</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
         <source>Overlap Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
         <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
         <source>Flat Layout</source>
         <translation type="unfinished"/>
     </message>
@@ -9041,7 +8635,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9049,47 +8643,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="120"/>
+        <location filename="src/client/ui/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="121"/>
+        <location filename="src/client/ui/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="122"/>
+        <location filename="src/client/ui/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="123"/>
+        <location filename="src/client/ui/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="124"/>
+        <location filename="src/client/ui/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="125"/>
+        <location filename="src/client/ui/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="128"/>
+        <location filename="src/client/ui/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="129"/>
+        <location filename="src/client/ui/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="130"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9097,7 +8691,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -9105,22 +8699,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -9128,17 +8722,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9146,43 +8740,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"/>
     </message>
@@ -9190,133 +8784,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WndSets</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="40"/>
         <source>Move selected set to the top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="47"/>
         <source>Move selected set up</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="54"/>
         <source>Move selected set down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="61"/>
         <source>Move selected set to the bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="69"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="75"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Enable all sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="113"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="113"/>
         <source>Disable all sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="114"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="114"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="115"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="132"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="134"/>
         <source>first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom)</source>
         <comment>%1 is a link to the wiki</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="163"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="150"/>
         <source>To enable ordering again, click the column header until this message disappears.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="153"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="154"/>
         <source>Sorts the set priority using the same column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9329,67 +8923,67 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="219"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -9397,7 +8991,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Eesti Keel (Estonian)</translation>
     </message>
@@ -9418,1005 +9012,991 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
         <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="527"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <source>Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <source>Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <source>Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/settings/shortcuts_settings.h" line="641"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/settings/shortcuts_settings.h" line="692"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_fi.ts b/cockatrice/translations/cockatrice_fi.ts
index 1202e1f1e..b8ad6b0cc 100644
--- a/cockatrice/translations/cockatrice_fi.ts
+++ b/cockatrice/translations/cockatrice_fi.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Lisää countteri... </translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Lisää countteri</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Countterin uusi arvo &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,81 +36,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -118,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -131,312 +129,251 @@ 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"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>Teeman asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Nykyinen teema:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>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/dialogs/dlg_settings.cpp" line="663"/>
         <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/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <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/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <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/dialogs/dlg_settings.cpp" line="691"/>
         <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/dialogs/dlg_settings.cpp" line="692"/>
         <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/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Suurin fonttikoko korteissa näkyville infoteksteille:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>Bännää &amp;käyttäjä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>Bännää &amp;IP osoite </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>Bännää client I&amp;D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Bännäyksen tyyppi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>Bännätty pysyvästi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>Bännätty väliaikaisesti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>Päivät:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>Tunnit:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>Minuutit:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Bännin kesto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Kerro bännäyksen syy. 
 Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Kerro bännäyksen syy. Tämä näkyy bännätylle henkilölle. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Peruuta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Bännää pelaaja serveriltä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Valitse nimi, IP -osoite, clientid tai joku näiden yhdistelmä asettaaksesi bännin. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Bännää nimi kentässä pitää olla arvo ennen valintaruudun valitsemista</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Bännää ip kentässä pitää olla arvo ennen valintaruudun valitsemista. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Bännää ClientID kentässä pitää olla arvo ennen valintaruudun valitsemista. </translation>
     </message>
@@ -444,22 +381,22 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>Ei vastausta päivitysserveriltä.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Päivitysserveri vastasi virheellisesti</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>Ei vastausta tiedoston päivitysserveriltä.</translation>
     </message>
@@ -467,32 +404,32 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Setit</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Mana cost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Korttityyppi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Väri(t) </translation>
     </message>
@@ -500,101 +437,96 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>JA</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>TAI</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>JA EI</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>TAI EI</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Muoto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Väri</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Teksti</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>Setti</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Manacosti</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Harvinaisuus</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Power</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Toughness</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Loyalty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Formaatti</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -602,22 +534,22 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +557,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -648,294 +580,172 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Siirrä</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Power / toughness</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>käsikorttinsa</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1n käsi</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>heidän pakkansa</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1n pakka</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>heidän pakastaan</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1n pakasta</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>heidän pakkansa</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1n pakka</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>heidän pakkansa</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>%1n pakka</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>heidän pakkansa</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1n pakka</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>Heidän hautansa</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1n hauta</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>heidän exilensä</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1n exile</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>heidän sideboardinsa</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1n sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>heidän sideboardinsa</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1n sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -944,7 +754,7 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -952,60 +762,15 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1013,47 +778,47 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,97 +826,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +914,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1177,114 +932,109 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1042,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,227 +1050,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>Onnistui</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation>Muokkaa URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>Päivitetään...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation>Valitse polku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <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/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>Spoilerit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <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/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation>Spoilerien sijainti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>Muokattu viimeksi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <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/dialogs/dlg_settings.cpp" line="1216"/>
         <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/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>Numero</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Kortti</translation>
     </message>
@@ -1528,12 +1245,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,17 +1258,17 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,7 +1276,7 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,62 +1284,62 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,166 +1347,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>Serverin vastausta ei pystytty selvittämään.</translation>
     </message>
@@ -1813,58 +1472,54 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
+        <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
-        <source>Ready to start</source>
-        <translation>Ready to start</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
-        <translation>Sideboard unlocked</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
-        <translation>Sideboard locked</translation>
+        <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1872,19 +1527,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1892,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Ladataan...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Tunnetut Isännät</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Päivitä servereiden lista tunnetuilla julkisilla servereillä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Lisää Isäntä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Portti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>Pelaajan &amp;nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>&amp;Salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Tallenna salasana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>Yhdistä &amp;Automaattisesti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Kirjaudu sisään automaattisesti kun Cockatrice käynnistyy </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>Jos sinulla on ongelmia yhdistämisessä tai rekisteröinnissä ota yhteyttä serverin henkilökuntaan!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Websivu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Yhdistä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Serveri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Kirjaudu sisään</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>Serverin yhteystiedot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Yhdistä serveriin</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>Serverin URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>Tietoliikenneportti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>Uniikki serverin nimi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Yhteysvaroitus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>Anna nimi uudelle yhteysprofiilillesi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Yhdistämisvaroitus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Pelaajan nimi ei voi olla tyhjä. </translation>
     </message>
@@ -2041,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>&amp;Muista asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Kuvaus:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>&amp;Pelaajat:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>Yleinen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Pelimuoto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Vain &amp;Kaverit voivat liittyä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Vain &amp;Rekisteröityneet käyttäjät voivat liittyä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Liittymisehdot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>&amp;Salli katsojat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Katsojilta &amp;vaaditaan salasana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Katsojat voivat &amp;keskustella</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Katsojat &amp;näkevät käsikortit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Katsojat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;Tyhjennä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Luo peli</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Tietoa pelistä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Serverivirhe.</translation>
     </message>
@@ -2164,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nimi:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Tokeni</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Väri</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>valkoinen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>sininen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>musta</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>punainen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>vihreä</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>monivärinen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>väritön</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Kommentti:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Tuhoa tokeni kun se lähtee pöydästä</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Tokenin  data</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Näytä &amp;kaikki tokenit</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Näytä kaikki tämän &amp;pakan tokenit</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Valitse tokeni listasta</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Luo token</translation>
     </message>
@@ -2262,53 +1907,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2316,40 +1961,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Ei valittua kuvaa.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Valitse kuva vaihtaaksesi avataria.
 Poistaaksesi nykyisen avatarisi: Hyväksy valitsematta uutta kuvaa.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Selaa...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Vaihda avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Avaa Kuva</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Kuvatiedostot (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Kuva ei kelpaa. </translation>
     </message>
@@ -2357,17 +2002,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2375,38 +2020,38 @@ Poistaaksesi nykyisen avatarisi: Hyväksy valitsematta uutta kuvaa.</translation
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Vanha salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Uusi salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Vahvista uusi salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Vaihda salasana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Uusi salasana ei täsmää</translation>
     </message>
@@ -2414,93 +2059,93 @@ Poistaaksesi nykyisen avatarisi: Hyväksy valitsematta uutta kuvaa.</translation
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Väri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>valkoinen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>sininen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>musta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>punainen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>vihreä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>monivärinen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>väritön</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Kommentti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Tokenin  data</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Lisää token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Poista token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>Muokkaa tokeneita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Anna tokenin nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>Nimi on ristiriidassa olemassaolevan kortin tai tokenin kanssa.
@@ -2510,27 +2155,27 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Maa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Ei määritelty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Oikea nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Muokkaa käyttäjäprofiilia</translation>
     </message>
@@ -2538,143 +2183,137 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>Pelin &amp;kuvaus:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Tekijän nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>Yleinen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>&amp;Pelimuodot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>&amp;vähintään:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>&amp;enintään:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Suurin pelaajamäärä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Ehdot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Suodata pelit</translation>
     </message>
@@ -2682,52 +2321,52 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Portti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>Pelaajan &amp;nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>Email -osoite ei voi olla tyhjä</translation>
     </message>
@@ -2735,37 +2374,37 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Portti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>Pelaajan &amp;nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Pelaajan nimi ei voi olla tyhjä. </translation>
     </message>
@@ -2773,86 +2412,86 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Portti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>Pelaajan &amp;nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Tokeni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Uusi Salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Pelaajan nimi ei voi olla tyhjä. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>Tokeni ei voi olla tyhjä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>Uusi salasana ei voi olla tyhjä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>Salasanat eivät täsmää</translation>
     </message>
@@ -2860,7 +2499,7 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -2868,146 +2507,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Pakka ei ole kelvollinen. </translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Lataa pakka</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3015,91 +2571,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Portti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>Pelaajan &amp;nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>&amp;Salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>&amp;Salasana (uudelleen):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Email (uudelleen):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Maa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Ei määritelty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Oikea nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Rekisteröidy serverille</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Rekisteröintivaroitus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Salasanat eivät täsmää, yritä uudelleen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Sähköpostiosoitteet eivät täsmää, yritä uudelleen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Pelaajan nimi ei voi olla tyhjä. </translation>
     </message>
@@ -3107,17 +2663,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -3125,55 +2681,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3190,7 +2731,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3207,7 +2748,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2757,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3225,7 +2766,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3234,7 +2775,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3243,59 +2784,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Yleinen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Ulkonäkö</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <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/dialogs/dlg_settings.cpp" line="1873"/>
         <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/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Äänet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Pikanäppäimet</translation>
     </message>
@@ -3303,39 +2844,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3343,17 +2884,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>Seuraava</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>Edellinen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Päivän vinkki</translation>
     </message>
@@ -3361,165 +2902,169 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Tämänhetkinen julkaisukanava</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Asenna uudelleen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Peruuta Lataus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Avaa Lataussivu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>Cockatricessä ei ole SSL tukea, joten päivityksiä ei voi ladata automaattisesti!
 Vieraile lataussivulla päivittääksesi ohjelman manuaalisesti. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Etsitään päivityksiä...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Päivitysten haku on päättynyt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Ei uusia päivityksiä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice on ajan tasalla!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>Sinulla on käytössä viimeisin versio, joka on saatavilla valitussa julkaisukanavassa.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Nykyinen versio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Valitse julkaisukanava</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Päivitys Saatavilla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Uusi versio Cockatricesta on saatavilla!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Uusi versio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>Julkaistu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Muutosloki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Haluatko päivittää nyt?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Päivitysvirhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Virhe päivityksiä tarkistettaessa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Virhe tiedostoa ladatessa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Asennetaan...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice ei voi avata asennustiedostoa.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Yritä asentaa manuaalisesti sulkemalla Cockatrice ja käynnistämällä asennusohjelma. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>Latausten sijainti</translation>
     </message>
@@ -3527,162 +3072,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Tyhjennä loki sammutuksen yhteydessä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Debug loki</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3690,47 +3103,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3738,44 +3151,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3783,7 +3190,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>Anna suodatin tähän</translation>
     </message>
@@ -3791,325 +3198,244 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Liity ensin oikeaan huoneeseen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Väärä salasana.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Tähän peliin ei päästetä katsojia.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>Peli on jo täynnä.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>Peliä ei enää ole.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Peli on tarkoitettu vain rekisteröityneille käyttäjille.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Peli on tarkoitettu vain sen tekijän kavereille.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Pelin luoja ei huomioi sinua.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Liity peliin</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>Liity ensin asianmukaiseen huoneeseen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Suodata pelit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>&amp;Poista suodattimet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>&amp;Luo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>&amp;Liity</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>Liity &amp;katsojana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
+        <location filename="src/game/game_selector.cpp" line="388"/>
+        <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
-        <source>Games shown: %1 / %2</source>
-        <translation>Games shown: %1 / %2</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Pelit</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>salasana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>vain kaverit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>vain rekisteröityneet käyttäjät</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>voi jutella</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>katso käsikortit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>voi nähdä käsikortit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>ei sallittu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Huone</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Ikä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Luoja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Muoto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Ehdot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Pelaajat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Katsojat</translation>
     </message>
@@ -4117,609 +3443,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>Serveri on täynnä, yritä myöhemmin uudelleen. </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Liian monta samanaikaista yhteyttä osoitteestasi.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Bännätty moderaattorin toimesta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Arvioitu päättymisaika: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>Bänni kestää loputtomasti.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Ajastettu serverin sammutus.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Väärä käyttäjänimi.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>Sinut kirjattiin ulos koska kirjauduit sisään toisesta paikasta. </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Yhteys suljettu</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>Serveri katkaisi yhteyden.
 Syy: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4730,1554 +3652,1359 @@ Kaikki pelit joudutaan lopettamaan
 Syy: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Ajastettu serverin sammutus.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Onnistui</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Rekisteröinti hyväksytty
 Kirjautuu.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Tilin aktivointi hyväksytty.
 Kirjautuu.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Pelaajien lukumäärä</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Anna pelaajien lukumäärä.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Pelaaja %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Lataa replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>Tieto sovelluksesta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>Versio</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatricen Webbsivut</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Projektipäällikkö:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>Edelliset projektipäälliköt:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>Kehittäjät:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>Kehittäjämme</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>Auta kehittämään!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Kääntäjät:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>Kääntäjät</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>Auta Kääntämään!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Tuki:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Ilmoita puute</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Vianhaku</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Serverin aikakatkaisu</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Kirjautuminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>Sovelluksestasi puuttuu ominaisuuksia, joita serveri vaatii yhteyden muodostamiseksi.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>Päivitä sovellus: &apos;Apua&apos; -&gt; &apos;Tarkasta onko päivityksiä&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Väärä käyttäjänimi tai salasana. Tarkista todennustietosi ja yritä uudelleen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Tällä käyttäjänimellä on jo aktiivinen sessio käynnissä. Sulje se ensin ja kirjaudu sisään uudelleen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Sinut on bännätty %1 saakka.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Sinut on bännätty lopullisesti</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>Serveri vaatii rekisteröitymisen. Haluatko rekisteröityä nyt? </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
-        <translation>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
-Please close and reopen your client to try again.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>Sisäinen virhe! Sulje ja käynnistä Cockatrice uudelleen ennenkuin yrität uudestaan.
 Jos ongelma jatkuu, tarkasta että käytössäsi on sovelluksen uusin versio ja tarvittaessa ota yhteyttä sovelluksen kehittäjiin.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Tilin aktivointi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>Tiliäsi ei ole vielä aktivoitu
 Ole hyvä ja anna aktivointikoodi, jonka sait sähköpostiisi.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>Serveri on täynnä</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Tuntematon kirjautumisvirhe: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 Yleensä tämä tarkoittaa, että sovelluksesi on päivittämättä ja serveri lähetti vastauksen, jota sovellus ei ymmärrä.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>Käyttäjänimesi täytyy olla näiden sääntöjen mukainen:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>%1 - %2 merkkiä pitkä</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>voi sisältää %1 pientä kirjainta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>EI</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>voi sisältää %1 isoa kirjainta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>voi sisältää %1 numeroa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>voi sisältää seuraavat merkit: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>ensimmäinen kirjain ei voi olla %1 merkki</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>ei voi sisältää näitä sanoja: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>ei voi sisältää seuraavia asioita: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>Voit käyttää käyttäjänimessä merkkejä A-Z, a-z, 0-9, _, ., ja - </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>Rekisteröinti evätty</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>Tämä serveri ei ota tällä hetkellä vastaan rekisteröintejä</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>Käyttäjänimi on jo olemassa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>Rekisteröintiin on annettava toimiva sähköpostiosoite.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>Näyttää siltä että yrität rekisteröidä uutta tiliä tälle serverille, vaikka sinulla on tällä sähköpostilla jo olemassaoleva tili. Tämä serveri rajoittaa tilien määrää, jotka tulevat samasta osoitteesta. Ota yhteyttä serverin tukeen pyytääksesi apua tai saadaksesi kirjautumistietosi.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>Salasana on liian lyhyt.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>Rekisteröinti epäonnistui serverin vian vuoksi.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>Tuntematon rekisteröintivirhe: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>Tilin aktivointi epäonnistui</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Pistokevirhe: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>Yritit yhdistää vanhentuneeseen palvelimeen. Käytä vanhempaa versiota Cockatricesta tai yhdistä sopivaan palvelimeen.
 Paikallinen versio on %1, etäversio on %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>Cockatrice-ohjelmasi on vanhentunut. Päivitä Cockatrice-versiosi.
 Paikallinen versio on %1, etäversio on %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Yhdistetään: %1...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>Rekisteröidytään %1:een %2:na</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Yhteys katkaistu</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Yhteys luotu, kirjaudutaan %1:n</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Requesting forgotten password to %1 as %2...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Yhdistä...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Katkaise yhteys</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>Aloita &amp;paikallinen peli...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Katso replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>K&amp;oko näyttö</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Rekisteröidy serverille...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Exit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>&amp;Toiminnot</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;Korttitietokanta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
-        <translation>&amp;Manage sets...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
-        <translation>Edit custom &amp;tokens...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>Avaa mukautettu kuvakansio</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>Avaa mukautettu setit -kansio</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>Lisää mukautettuja settejä/kortteja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;Apua</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Tietoa Cockatricesta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Päivän vinkki</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>Etsi päivityksiä</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>Uusi versio</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1016"/>
+        <location filename="src/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice asennettu</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1151"/>
+        <location filename="src/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>Korttitietokanta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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 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;</translation>
+        <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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Avaa asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <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/client/ui/window_main.cpp" line="1156"/>
         <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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>Näytä setit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Tervetuloa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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>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.</translation>
+        <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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Tietoa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <source>Unable to run the card database updater: </source>
-        <translation>Unable to run the card database updater: </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
+        <location filename="src/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <source>This server supports additional features that your client doesn't have.
 This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
 To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>This server supports additional features that your client doesn&apos;t have.
-This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
-
-To update your client, go to Help -&gt; Check for Updates.</translation>
+        <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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation>Lataa setit/kortit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <source>Selected file cannot be found.</source>
-        <translation>Selected file cannot be found.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
         <source>You can only import XML databases at this time.</source>
-        <translation>You can only import XML databases at this time.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/client/ui/window_main.cpp" line="1428"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1451"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Sets/cards failed to import.</source>
-        <translation>Sets/cards failed to import.</translation>
+        <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/client/ui/window_main.cpp" line="1502"/>
         <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>
-</context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="137"/>
+        <location filename="src/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
-        <translation>%1 has unconceded the game.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="227"/>
+        <location filename="src/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>kortti</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <source>%1 is looking at %2.</source>
-        <translation>%1 is looking at %2.</translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="387"/>
+        <location filename="src/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <source>%1 turns %2 face-down.</source>
-        <translation>%1 turns %2 face-down.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/server/message_log_widget.cpp" line="380"/>
         <source>%1 turns %2 face-up.</source>
-        <translation>%1 turns %2 face-up.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation>Peli alkaa.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
-        <translation>cards</translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
+        <location filename="src/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <source>%1 reveals %2 to %3.</source>
-        <translation>%1 reveals %2 to %3.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
+        <location filename="src/server/message_log_widget.cpp" line="500"/>
         <source>%1 reveals %2.</source>
-        <translation>%1 reveals %2.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/server/message_log_widget.cpp" line="506"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
-        <translation>%1 randomly reveals %2%3 to %4.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="541"/>
+        <location filename="src/server/message_log_widget.cpp" line="513"/>
         <source>%1 randomly reveals %2%3.</source>
-        <translation>%1 randomly reveals %2%3.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
+        <location filename="src/server/message_log_widget.cpp" line="519"/>
         <source>%1 peeks at face down card #%2.</source>
-        <translation>%1 peeks at face down card #%2.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="553"/>
+        <location filename="src/server/message_log_widget.cpp" line="521"/>
         <source>%1 peeks at face down card #%2: %3.</source>
-        <translation>%1 peeks at face down card #%2: %3.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/server/message_log_widget.cpp" line="527"/>
         <source>%1 reveals %2%3 to %4.</source>
-        <translation>%1 reveals %2%3 to %4.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/server/message_log_widget.cpp" line="534"/>
         <source>%1 reveals %2%3.</source>
-        <translation>%1 reveals %2%3.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
+        <location filename="src/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation>käänteinen</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation>normaali</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>Kruuna</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>Klaava</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <source>%1 sets annotation of %2 to %3.</source>
-        <translation>%1 sets annotation of %2 to %3.</translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="650"/>
+        <location filename="src/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <source>%1 sets %2 to not untap normally.</source>
-        <translation>%1 sets %2 to not untap normally.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="684"/>
+        <location filename="src/server/message_log_widget.cpp" line="652"/>
         <source>%1 sets %2 to untap normally.</source>
-        <translation>%1 sets %2 to untap normally.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
+        <location filename="src/server/message_log_widget.cpp" line="671"/>
         <source>%1 removes the PT of %2.</source>
-        <translation>%1 removes the PT of %2.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
+        <location filename="src/server/message_log_widget.cpp" line="676"/>
         <source>%1 changes the PT of %2 from nothing to %4.</source>
-        <translation>%1 changes the PT of %2 from nothing to %4.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
+        <location filename="src/server/message_log_widget.cpp" line="679"/>
         <source>%1 changes the PT of %2 from %3 to %4.</source>
-        <translation>%1 changes the PT of %2 from %3 to %4.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="720"/>
+        <location filename="src/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
-        <translation>%1 shuffles the bottom %3 cards of %2.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="769"/>
+        <location filename="src/server/message_log_widget.cpp" line="735"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
-        <translation>%1 shuffles the top %3 cards of %2.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="774"/>
+        <location filename="src/server/message_log_widget.cpp" line="740"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
-        <translation>%1 shuffles cards %3 - %4 of %2.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="789"/>
+        <location filename="src/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 peruuttaa viimeisimmän kortinnostonsa. (%2).</translation>
     </message>
@@ -6285,224 +5012,181 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <source>Word1 Word2 Word3</source>
-        <translation>Word1 Word2 Word3</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Viesti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
-        <translation>Edit message</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation>Keskusteluasetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <source>Custom alert words</source>
-        <translation>Custom alert words</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1451"/>
         <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/dialogs/dlg_settings.cpp" line="1452"/>
         <source>Enable mention completer</source>
-        <translation>Enable mention completer</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <source>Ignore chat room messages sent by unregistered users</source>
-        <translation>Ignore chat room messages sent by unregistered users</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1457"/>
         <source>Ignore private messages sent by unregistered users</source>
-        <translation>Ignore private messages sent by unregistered users</translation>
+        <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <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/dialogs/dlg_settings.cpp" line="1460"/>
         <source>Enable desktop notifications for private messages</source>
-        <translation>Enable desktop notifications for private messages</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1461"/>
         <source>Enable desktop notification for mentions</source>
-        <translation>Enable desktop notification for mentions</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1462"/>
         <source>Enable room message history on join</source>
-        <translation>Enable room message history on join</translation>
+        <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <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/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
-        <translation>Separate words with a space, alphanumeric characters only</translation>
-    </message>
-</context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
-        <translation>Card Type</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
-        <translation>Color(s)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
-        <translation>Loyalty</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
-        <translation>Main Card Type</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
-        <translation>Mana Cost</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
-        <translation>P/T</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
-        <translation>Side</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
-        <translation>Layout</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
-        <translation>Color Identity</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -6510,334 +5194,824 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
-        <translation>Unknown Phase</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
-        <translation>Untap</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
-        <translation>Upkeep</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
-        <translation>Draw</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
-        <translation>First Main</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
-        <translation>Beginning of Combat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
-        <translation>Declare Attackers</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
-        <translation>Declare Blockers</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
-        <translation>Combat Damage</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
-        <translation>End of Combat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
-        <translation>Second Main</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
-        <translation>End/Cleanup</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
+        <location filename="src/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="160"/>
         <source>First main phase</source>
-        <translation>First main phase</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="162"/>
         <source>Beginning of combat step</source>
-        <translation>Beginning of combat step</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="164"/>
         <source>Declare attackers step</source>
-        <translation>Declare attackers step</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="166"/>
         <source>Declare blockers step</source>
-        <translation>Declare blockers step</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="168"/>
         <source>Combat damage step</source>
-        <translation>Combat damage step</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="170"/>
         <source>End of combat step</source>
-        <translation>End of combat step</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="172"/>
         <source>Second main phase</source>
-        <translation>Second main phase</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
-        <translation>End of turn step</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal 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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
-        <source>View bottom cards of library</source>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
-        <source>Shuffle top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
-        <source>Shuffle bottom cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <source>(max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change power/toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change stats to:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
-        <source>Set annotation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
-        <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
-        <source>Set counters</source>
-        <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/player.cpp" line="769"/>
         <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/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
         <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>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</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/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <source>View bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <source>Shuffle top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1276"/>
+        <source>Shuffle bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <source>Which position should this card be placed:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <source>(max. %1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation>Nosta käsi</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation>0 ja alempi on verraten nykyiseen käsikokoon</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change power/toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change stats to:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3653"/>
+        <source>Set annotation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3654"/>
+        <source>Please enter the new annotation:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Set counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</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/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6845,7 +6019,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"/>
     </message>
@@ -6853,17 +6027,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6871,545 +6045,406 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
-        <translation>Services</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
-        <translation>Hide %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
-        <translation>Hide Others</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
-        <translation>Show All</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
-        <translation>Preferences...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
-        <translation>Quit %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
-        <translation>About %1</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
-        <translation>Cockatrice card database (*.xml)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
-        <translation>All files (*.*)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
-        <translation>Cockatrice replays (*.cor)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
-        <translation>Maindeck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
-        <translation>Sideboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
-        <translation>Tokens</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
-        <translation>Save</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
-        <translation>Save All</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
-        <translation>Avaa</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
-        <translation>&amp;Yes</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
-        <translation>Yes to &amp;All</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
-        <translation>&amp;Ei</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
-        <translation>N&amp;o to All</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
-        <translation>Abort</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
-        <translation>Retry</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
-        <translation>Sivuuta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
-        <translation>Close</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
-        <translation>Cancel</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
-        <translation>Discard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
-        <translation>Help</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
-        <translation>Apply</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
-        <translation>Nollaa</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
-        <translation>Restore Defaults</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
-        <translation>ID</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
-        <translation>Upload time</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
-        <translation>ID</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
-        <translation>Players</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
-        <translation>Keep</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
-        <translation>Time started</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
-        <translation>Duration (sec)</translation>
-    </message>
-</context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
-        <translation>Rooms</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
-        <translation>Joi&amp;n</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
-        <translation>Room</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
-        <translation>Description</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
-        <translation>Permissions</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
-        <translation>Players</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
-        <translation>Choose an action from the table</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
-        <translation>Hit the key/combination of keys you want to set for this action</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
-        <translation>Invalid key</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
-        <translation>Clear</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
-        <translation>Restore default</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
-        <translation>Enabled</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
-        <translation>Set type</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
-        <translation>Set code</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
-        <translation>Long name</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
-        <translation>Release date</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <source>Restore all default shortcuts</source>
-        <translation>Restore all default shortcuts</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1642"/>
         <source>Do you really want to restore all default shortcuts?</source>
-        <translation>Do you really want to restore all default shortcuts?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1649"/>
         <source>Clear all default shortcuts</source>
-        <translation>Clear all default shortcuts</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1650"/>
         <source>Do you really want to clear all shortcuts?</source>
-        <translation>Do you really want to clear all shortcuts?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
-        <translation>Section:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
-        <translation>Action:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
-        <translation>Shortcut:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <source>How to set custom shortcuts</source>
-        <translation>How to set custom shortcuts</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7417,12 +6452,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -7430,170 +6465,155 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
-        <translation>Your configuration file contained invalid shortcuts.
-Please check your shortcut settings!</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
-        <translation>The following shortcuts have been set to default:
-</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
-        <translation>&amp;Reason for shutdown:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
-        <source>&amp;Time until shutdown (minutes):</source>
-        <translation>&amp;Time until shutdown (minutes):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
-        <source>Shut down server</source>
-        <translation>Shut down server</translation>
-    </message>
-</context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
+        <source>&amp;Time until shutdown (minutes):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
+        <source>Shut down server</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <source>Enable &amp;sounds</source>
-        <translation>Enable &amp;sounds</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Current sounds theme:</source>
-        <translation>Current sounds theme:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Test system sound engine</source>
-        <translation>Test system sound engine</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
-        <translation>Sound settings</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
-        <translation>Master volume</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
-        <translation>Spoilers season has ended</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
-        <translation>Deleting spoiler.xml. Please run Oracle</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
-        <translation>Spoilers download failed</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
-        <translation>No internet connection</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
-        <translation>Error</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
-        <translation>Spoilers already up to date</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
-        <translation>No new spoilers added</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
-        <translation>Spoilers have been updated!</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
-        <translation>Last change:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
-        <translation>No reply received from the release update server.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
-        <translation>Invalid reply received from the release update server.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
-        <translation>No reply received from the tag update server.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
-        <translation>Invalid reply received from the tag update server.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -7601,345 +6621,235 @@ Please check your shortcut settings!</translation>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
-        <translation>Administration</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
-        <translation>Update server &amp;message</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
-        <translation>&amp;Shut down server</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
-        <translation>&amp;Reload configuration</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
-        <translation>Server administration functions</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
-        <translation>&amp;Unlock functions</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
-        <translation>&amp;Lock functions</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
-        <translation>Card Info</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
-        <source>Deck</source>
-        <translation>Deck</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
-        <source>Filters</source>
-        <translation>Filters</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
-        <source>&amp;View</source>
-        <translation>&amp;View</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
+        <source>Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
+        <source>Filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
+        <source>&amp;View</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
-        <translation>Visible</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
-        <translation>Floating</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
-        <translation>Reset layout</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
-        <translation>Deck: %1</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="118"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7947,22 +6857,22 @@ Please check your shortcut settings!</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7970,139 +6880,138 @@ Please check your shortcut settings!</translation>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
-        <translation>Local file system</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
-        <translation>Server deck storage</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
-        <translation>Open in deck editor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
-        <translation>Upload deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
-        <translation>Download deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="175"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
-        <translation>New folder</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
-        <translation>Delete</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
-        <translation>Enter deck name</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
-        <translation>This decklist does not have a name.
-Please enter a name:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
-        <translation>Unnamed deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
-        <translation>Delete local file</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
-        <translation>Name of new folder:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8110,17 +7019,17 @@ Please enter a name:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8128,7 +7037,7 @@ Please enter a name:</translation>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8136,615 +7045,550 @@ Please enter a name:</translation>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <source>Replay</source>
-        <translation>Replay</translation>
+        <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <source>Game</source>
-        <translation>Game</translation>
+        <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <source>Player List</source>
-        <translation>Player List</translation>
+        <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <source>Card Info</source>
-        <translation>Card Info</translation>
+        <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <source>Messages</source>
-        <translation>Messages</translation>
+        <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
-        <translation>Replay Timeline</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
-        <translation>&amp;Phases</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
-        <translation>&amp;Game</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <source>Next &amp;phase</source>
-        <translation>Next &amp;phase</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="230"/>
         <source>Next phase with &amp;action</source>
-        <translation>Next phase with &amp;action</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="233"/>
         <source>Next &amp;turn</source>
-        <translation>Next &amp;turn</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="236"/>
         <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/client/tabs/tab_game.cpp" line="239"/>
         <source>&amp;Remove all local arrows</source>
-        <translation>&amp;Remove all local arrows</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="242"/>
         <source>Rotate View Cl&amp;ockwise</source>
-        <translation>Rotate View Cl&amp;ockwise</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="245"/>
         <source>Rotate View Co&amp;unterclockwise</source>
-        <translation>Rotate View Co&amp;unterclockwise</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="248"/>
         <source>Game &amp;information</source>
-        <translation>Game &amp;information</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
-        <translation>&amp;Concede</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
-        <source>&amp;Leave game</source>
-        <translation>&amp;Leave game</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
-        <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"/>
-        <source>&amp;Focus Chat</source>
-        <translation>&amp;Focus Chat</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
-        <source>&amp;Say:</source>
-        <translation>&amp;Say:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
+        <source>&amp;Leave game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="260"/>
+        <source>C&amp;lose replay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="263"/>
+        <source>&amp;Focus Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
+        <source>&amp;Say:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
-        <translation>&amp;View</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
-        <translation>Visible</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
-        <translation>Floating</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
-        <translation>Reset layout</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
-        <translation>Concede</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Are you sure you want to concede this game?</source>
-        <translation>Are you sure you want to concede this game?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
-        <translation>Unconcede</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation>Poistu pelistä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
-        <source>You have been kicked out of the game.</source>
-        <translation>You have been kicked out of the game.</translation>
+        <location filename="src/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>Isäntä tai moderaattori poisti sinut pelistä</translation>
     </message>
-</context>
-<context>
-    <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>pelaaja katkaisi yhteyden serveriin</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
+        <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
-        <translation>Logs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
-        <translation>Time;SenderName;SenderIP;Message;TargetID;TargetName</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
-        <translation>Room Logs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
-        <translation>Game Logs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
-        <translation>Chat Logs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
-        <translation>You must select at least one filter.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
-        <translation>You have to select a valid number of days to locate.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>Käyttäjätunnus:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>IP-osoite:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>Pelin Nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>Peli-ID:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>Viesti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
-        <translation>Main Room</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
-        <translation>Game Room</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
-        <translation>Private Chat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
-        <translation>Past X Days: </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>Tänään</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
-        <translation>Last Hour</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
-        <translation>Maximum Results: </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
-        <translation>At least one filter is required.
-The more information you put in, the more specific your results will be.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
-        <translation>Get User Logs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
-        <translation>Clear Filters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
-        <translation>Filters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
-        <translation>Log Locations</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
-        <translation>Date Range</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
-        <translation>Maximum Results</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
-        <translation>Message History</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
-        <translation>Failed to collect message history information.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
-        <translation>There are no messages for the selected filters.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
-        <translation>Private &amp;chat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
-        <translation>&amp;Leave</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
-        <translation>%1 - Private chat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
-        <translation>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
-        <translation>Private message from</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
-        <translation>%1 has left the server.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
-        <translation>%1 has joined the server.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
-        <translation>Local file system</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
-        <translation>Server replay storage</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
-        <translation>Watch replay</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
-        <translation>Delete</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
-        <translation>Download replay</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
-        <translation>Toggle expiration lock</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
-        <translation>Delete local file</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
-        <translation>Delete remote replay</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -8752,83 +7596,83 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
-        <translation>&amp;Say:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
-        <translation>Chat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
-        <translation>&amp;Room</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
-        <translation>&amp;Leave room</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
-        <translation>&amp;Clear chat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
-        <translation>Chat Settings...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
-        <translation> mentioned you.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
-        <translation>Click to view</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
-        <translation>You are flooding the chat. Please wait a couple of seconds.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
-        <translation>Server</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -8836,155 +7680,135 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>Oletko varma?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
-        <translation>There are still open games. Are you sure you want to quit?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
-        <translation>Click to view</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
-        <translation>Your buddy %1 has signed on!</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>Tuntematon Tapahtuma</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
 To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>The server has sent you a message that your client does not understand.
-This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
-
-To update your client, go to Help -&gt; Check for Updates.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
-        <translation>Idle Timeout</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
-        <translation>You are about to be logged out due to inactivity.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
-        <translation>Promotion</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
-        <translation>You have been promoted. Please log out and back in for changes to take effect.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
-        <translation>Warned</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
-        <translation>You have received a warning due to %1.
-Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
-        <translation>You have received the following message from the server.
-(custom messages like these could be untranslated)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -8992,28 +7816,28 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
-        <translation>Unable to analyze the deck.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>Tiedostoa ei ole olemassa.
 </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>Tiedoston avaaminen epäonnistui.
@@ -9023,42 +7847,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
-        <translation>Life</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Valkoinen</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Sininen</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Musta</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Punainen</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Vihreä</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Väritön</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Muu</translation>
     </message>
@@ -9066,214 +7890,192 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
-        <translation>Could not open the file for reading.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
-        <translation>User &amp;details</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
-        <translation>Private &amp;chat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
-        <translation>Show this user&apos;s &amp;games</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
-        <translation>Add to &amp;buddy list</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
-        <translation>Remove from &amp;buddy list</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
-        <translation>Add to &amp;ignore list</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
-        <translation>Remove from &amp;ignore list</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
-        <translation>Kick from &amp;game</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
-        <translation>Warn user</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
-        <translation>View user&apos;s war&amp;n history</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
-        <translation>Ban from &amp;server</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
-        <translation>View user&apos;s &amp;ban history</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
-        <translation>&amp;Promote user to moderator</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
-        <translation>Dem&amp;ote user from moderator</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
-        <translation>Demote user from judge</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <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 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 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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
-        <translation>%1&apos;s games</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
-        <translation>Ban History</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
-        <translation>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
-        <translation>User has never been banned.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
-        <translation>Failed to collect ban information.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
-        <translation>Warning History</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
-        <translation>Warning Time;Moderator;User Name;Reason</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
-        <translation>User has never been warned.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
-        <translation>Failed to collect warning information.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
-        <translation>Success</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
-        <translation>Successfully promoted user.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
-        <translation>Successfully demoted user.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
-        <translation>Failed</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
-        <translation>Failed to promote user.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
-        <translation>Failed to demote user.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
-        <translation>Copy hash to clipboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -9281,326 +8083,311 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
-        <translation>Location:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
-        <translation>Account Age:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>Muokkaa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>Vaihda Salasana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>Vaihda avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
-        <translation>Administrator</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
-        <translation>Moderator</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
-        <translation>Registered user</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
-        <translation>Unregistered user</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
-        <translation>Judge</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
-        <translation>Unknown</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
-        <translation>Information</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
-        <translation>User information updated.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
-        <translation>This server does not permit you to update your user informations.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
-        <translation>Password changed.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
-        <translation>This server does not permit you to change your password.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
-        <translation>The new password is too short.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
-        <translation>The old password is incorrect.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
-        <translation>Avatar updated.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
-        <translation>This server does not permit you to update your avatar.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
-        <translation>An error occured while trying to updater your avatar.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="873"/>
         <source>General interface settings</source>
-        <translation>General interface settings</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="874"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation>Ilmoitusasetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="974"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="884"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation>Animaatioasetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <source>&amp;Tap/untap animation</source>
-        <translation>&amp;Tap/untap animation</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9608,241 +8395,86 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9850,27 +8482,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9878,7 +8510,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/client/ui/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 +8518,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9906,37 +8538,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9944,93 +8566,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10038,25 +8612,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10064,52 +8659,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10117,7 +8707,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10125,22 +8715,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10148,17 +8738,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10166,258 +8756,258 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
-        <translation>Which warning would you like to send?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
-        <translation>&amp;Cancel</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
-        <translation>Warn user for misconduct</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
-        <translation>User name to send a warning to can not be blank, please specify a user to warn.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
-        <translation>Warning to use can not be blank, please select a valid warning to send.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WndSets</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="40"/>
         <source>Move selected set to the top</source>
-        <translation>Move selected set to the top</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="47"/>
         <source>Move selected set up</source>
-        <translation>Move selected set up</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="54"/>
         <source>Move selected set down</source>
-        <translation>Move selected set down</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="61"/>
         <source>Move selected set to the bottom</source>
-        <translation>Move selected set to the bottom</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="69"/>
         <source>Search by set name, code, or type</source>
-        <translation>Search by set name, code, or type</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
-        <translation>Default order</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <source>Restore original art priority order</source>
-        <translation>Restore original art priority order</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Enable all sets</source>
-        <translation>Enable all sets</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="113"/>
         <source>Disable all sets</source>
-        <translation>Disable all sets</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="114"/>
         <source>Enable selected set(s)</source>
-        <translation>Enable selected set(s)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="115"/>
         <source>Disable selected set(s)</source>
-        <translation>Disable selected set(s)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
-        <translation>Deck Editor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
-        <translation>Card Art</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <source>How to use custom card art</source>
-        <translation>How to use custom card art</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
-        <translation>Hints</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
-        <translation>Note</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="153"/>
         <source>Use the current sorting as the set priority instead</source>
-        <translation>Use the current sorting as the set priority instead</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="148"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="154"/>
         <source>Sorts the set priority using the same column</source>
-        <translation>Sorts the set priority using the same column</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="187"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
-        <translation>Manage sets</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <source>shuffle when closing</source>
-        <translation>shuffle when closing</translation>
+        <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="240"/>
         <source>pile view</source>
-        <translation>pile view</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Suomi (Finnish)</translation>
     </message>
@@ -10425,1071 +9015,1004 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
-        <translation>Connect on startup</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
-        <translation>Debug to file</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
-        <translation>Main Window</translation>
+        <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
-        <translation>Deck Editor</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
-        <translation>Game Lobby</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
-        <translation>Card Counters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
-        <translation>Player Counters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
-        <translation>Power and Toughness</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
-        <translation>Game Phases</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
-        <translation>Playing Area</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
-        <translation>Move Selected Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
-        <translation>View</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
-        <translation>Move Top Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
-        <translation>Move Bottom Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
-        <translation>Gameplay</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
-        <translation>Drawing</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
-        <translation>Chat Room</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
-        <translation>Game Window</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
-        <translation>Load Deck from Clipboard</translation>
+        <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
-        <translation>Check for Card Updates...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
-        <translation>Connect...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>Katkaise yhteys</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
-        <translation>Exit</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
-        <source>Full screen</source>
-        <translation>Full screen</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
-        <source>Register...</source>
-        <translation>Register...</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
-        <source>Settings...</source>
-        <translation>Settings...</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
-        <source>Start a Local Game...</source>
-        <translation>Start a Local Game...</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
-        <source>Watch Replay...</source>
-        <translation>Watch Replay...</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
-        <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
+        <source>Full screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
+        <source>Register...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
+        <source>Start a Local Game...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
+        <source>Watch Replay...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
+        <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
-        <translation>Clear All Filters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
-        <translation>Clear Selected Filter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
-        <translation>Close</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
-        <translation>Remove Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
-        <translation>Manage Sets...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
-        <translation>Edit Custom Tokens...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
-        <translation>Add Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
-        <translation>Load Deck...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
-        <translation>Load Deck from Clipboard...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
-        <translation>New Deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
-        <translation>Open Custom Pictures Folder</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
-        <translation>Print Deck...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
-        <translation>Delete Card</translation>
+        <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
-        <translation>Reset Layout</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>Tallenna Pakka</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
-        <translation>Save Deck as...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
-        <translation>Save Deck to Clipboard, Annotated</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
-        <translation>Save Deck to Clipboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
-        <translation>Load Local Deck...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
-        <translation>Load Remote Deck...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
-        <translation>Set Ready to Start</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
-        <translation>Toggle Sideboard Lock</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
-        <translation>Add Green Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
-        <translation>Remove Green Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
-        <translation>Set Green Counters...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
-        <translation>Add Red Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
-        <translation>Remove Red Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
-        <translation>Set Red Counters...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
-        <translation>Add Life Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
-        <translation>Remove Life Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
-        <translation>Set Life Counters...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
-        <translation>Add White Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
-        <translation>Remove White Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
-        <translation>Set White Counters...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
-        <translation>Add Blue Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
-        <translation>Remove Blue Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
-        <translation>Set Blue Counters...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
-        <translation>Add Black Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
-        <translation>Remove Black Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
-        <translation>Set Black Counters...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
-        <translation>Add Colorless Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
-        <translation>Remove Colorless Counter</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
-        <translation>Set Colorless Counters...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
+        <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
-        <source>Add Power (+1/+0)</source>
-        <translation>Add Power (+1/+0)</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
-        <translation>Remove Power (-1/-0)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
-        <translation>Move Toughness to Power (+1/-1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
-        <translation>Add Toughness (+0/+1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
-        <translation>Remove Toughness (-0/-1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
-        <translation>Move Power to Toughness (-1/+1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
-        <translation>Add Power and Toughness (+1/+1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
-        <translation>Remove Power and Toughness (-1/-1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
-        <translation>Set Power and Toughness...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
-        <translation>Reset Power and Toughness</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
-        <translation>Untap</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
-        <translation>Upkeep</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
-        <translation>Draw</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
-        <translation>First Main Phase</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
-        <translation>Start Combat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
-        <translation>Attack</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
-        <translation>Block</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
-        <translation>Damage</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
-        <translation>End Combat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
-        <translation>Second Main Phase</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
-        <translation>End</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
-        <translation>Next Phase</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
-        <translation>Next Phase Action</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
-        <translation>Next Turn</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
-        <translation>Tap / Untap Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
-        <translation>Untap All</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
-        <translation>Turn Card Over</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
-        <source>Peek Card</source>
-        <translation>Peek Card</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
-        <source>Play Card</source>
-        <translation>Play Card</translation>
-    </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
+        <source>Peek Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
+        <source>Play Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
-        <translation>Attach Card...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
-        <translation>Unattach Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
-        <translation>Clone Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
-        <translation>Create Token...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
-        <translation>Create All Related Tokens</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
-        <translation>Create Another Token</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
-        <translation>Set Annotation...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
+        <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
-        <source>Bottom of Library</source>
-        <translation>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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <source>Exile</source>
-        <translation>Exile</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <source>Graveyard</source>
-        <translation>Graveyard</translation>
+        <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <source>Hand</source>
-        <translation>Hand</translation>
+        <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
-        <translation>Top of Library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
-        <translation>Battlefield, Face Down</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
-        <translation>Battlefield</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
-        <translation>Library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
-        <translation>Sideboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
-        <translation>Top Cards of Library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
-        <translation>Close Recent View</translation>
+        <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <source>Stack</source>
-        <translation>Stack</translation>
+        <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
-        <translation>Draw Arrow...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
-        <translation>Remove Local Arrows</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
-        <translation>Leave Game</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
-        <translation>Concede</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
-        <translation>Roll Dice...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
-        <translation>Shuffle Library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
-        <translation>Mulligan</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
-        <translation>Draw a Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
-        <translation>Draw Multiple Cards...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
-        <translation>Undo Draw</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
-        <translation>Always Reveal Top Card</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
-        <translation>Rotate View Clockwise</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
-        <translation>Rotate View Counterclockwise</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
-        <translation>Unfocus Text Box</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
-        <translation>Focus Chat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
-        <translation>Clear Chat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
-        <translation>Refresh</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_fr.ts b/cockatrice/translations/cockatrice_fr.ts
index f50d3afd6..fb3acce32 100644
--- a/cockatrice/translations/cockatrice_fr.ts
+++ b/cockatrice/translations/cockatrice_fr.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>Nombre de marqueur&amp;s…</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Nombre de marqueurs</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nouvelle valeur des marqueurs « %1 » :</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <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,83 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation>Il n&apos;y a pas de cartes dans le deck à exporter</translation>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
+        <translation>Aucun deck n&apos;a été sélectionné pour être exporté.</translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation>Notes de mises à jour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation>Notes d&apos;administrateur pour %1</translation>
     </message>
@@ -120,12 +118,12 @@ Vérifiez que le répertoire ne soit pas en lecture seule et réessayez.</transl
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation>Deck principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation>Réserve</translation>
     </message>
@@ -133,312 +131,251 @@ 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"/>
-        <source> seconds</source>
-        <translation>secondes</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <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/dialogs/dlg_settings.cpp" line="657"/>
         <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/dialogs/dlg_settings.cpp" line="658"/>
         <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"/>
-        <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"/>
-        <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"/>
-        <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/dialogs/dlg_settings.cpp" line="660"/>
         <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/dialogs/dlg_settings.cpp" line="661"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="663"/>
         <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/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <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"/>
-        <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>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
+        <translation>Remplacer toutes les illustrations de cartes par les préférences personnelles (comportement avant modification du ProviderID) [Nécessite le redémarrage du client]</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation>lignes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <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/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation>Marqueur %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <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/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <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/dialogs/dlg_settings.cpp" line="691"/>
         <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/dialogs/dlg_settings.cpp" line="692"/>
         <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/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Taille maximale de la police pour les informations affichées sur les cartes  :</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation>Thème</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation>Recadrage d&apos;image d&apos;une carte aléatoire</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation>Recadrage d&apos;image du fichier background.cod</translation>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>bannir &amp;nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>bannir &amp;adresse IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>bannir &amp;ID du client</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Type du bannissement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;bannissement permanent</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>bannissement &amp;temporaire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Jours :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Heures :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutes :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Durée du bannissement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Veuillez expliquer la raison du bannissement.
 Cette information sera consultable uniquement par les modérateurs et ne sera pas visible par la personne bannie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Veuillez expliquer la raison du bannissement. Cette information sera visible par la personne bannie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Censurer tous les messages de cet utilisateur dans toutes les salles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Bannir le joueur du serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Vous devez choisir un bannissement à partir du nom, de l&apos;adresse IP, de l&apos;ID du client, ou une combinaison des trois.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Vous devez remplir le champ du nom du banni en le choisissant dans la liste.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Vous devez saisir l&apos;adresse IP du banni en le choisissant dans la liste.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Vous devez saisir l&apos;ID du client banni en le choisissant dans la liste.</translation>
     </message>
@@ -446,22 +383,22 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>Le serveur de mise à jour ne répond pas.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Réponse reçue du serveur de mise à jour de version invalide .</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>Le serveur de mise à jour de fichier ne répond pas.</translation>
     </message>
@@ -469,32 +406,32 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Éditions</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Coût de mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Type de carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>F/E</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Couleur(s)</translation>
     </message>
@@ -502,101 +439,96 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>ET</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OU</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>ET PAS</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OU PAS</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Couleur</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>Édition</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Coût de mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>Valeur de Mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Rareté</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Force</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Endurance</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Loyauté</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation>Type principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation>Sous-type</translation>
     </message>
@@ -604,22 +536,22 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation>Les deux</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation>Voir la transformation</translation>
     </message>
@@ -627,22 +559,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation>Réserve</translation>
     </message>
@@ -650,294 +582,172 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation>Cartes associées :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation>Carte inconnue :</translation>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation>Révéler à...</translation>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Déplacer vers</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation>&amp;Tous les joueurs</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <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"/>
-        <source>Token: </source>
-        <translation>Jeton :</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation>Tout les jetons</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation>&amp;Sélectionner Tout</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Play</source>
-        <translation>&amp;Jouer</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation>&amp;Cacher</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <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"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
-        <source>T&amp;urn Over</source>
-        <extracomment>Turn face up/face down</extracomment>
-        <translation>Reto&amp;urner</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="460"/>
-        <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"/>
-        <source>&amp;Clone</source>
-        <translation>&amp;Cloner</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <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"/>
-        <source>Unattac&amp;h</source>
-        <translation>Détac&amp;her</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <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"/>
-        <source>&amp;Set annotation...</source>
-        <translation>&amp;Annoter...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation>&amp;Changer le nombre de marqueurs (%1)...</translation>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Force / Endurance</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation>Taille de la Carte</translation>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <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/card_zone.cpp" line="63"/>
         <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/card_zone.cpp" line="67"/>
         <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/card_zone.cpp" line="68"/>
         <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/card_zone.cpp" line="70"/>
         <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/card_zone.cpp" line="71"/>
         <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="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="81"/>
         <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/card_zone.cpp" line="81"/>
         <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/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation>sa zone d&apos;exil</translation>
+        <translation>l&apos;exil</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <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/card_zone.cpp" line="87"/>
         <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="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <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/card_zone.cpp" line="96"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
-        <translation>sa zone personnalisée &apos;%1&apos;</translation>
+        <translation>leur 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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>La zone personnalisée &apos;%2&apos; de %1</translation>
@@ -946,7 +756,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Erreur de lecture à la ligne %1 (colonne %2)</translation>
     </message>
@@ -954,60 +764,15 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Erreur de lecture à la ligne %1 (colonne %2)</translation>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation>Zones pe&amp;rsonnalisés</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation>Voir la zone personnalisée &apos;%1&apos;</translation>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Infos de la carte</translation>
     </message>
@@ -1015,47 +780,47 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation>Rechercher par nom de carte (ou expression de recherche)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation>Ajouter au deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation>Ajouter à la réserve</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <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"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation>Afficher sur EDHRec (Commandant)</translation>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation>Afficher sur EDHRec (carte)</translation>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Ajouter carte à la ré&amp;serve</translation>
     </message>
@@ -1063,97 +828,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation>Choisir l&apos;impression</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation>&amp;Nom du deck :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation>Paramètres de visibilité de la carte bannière et des étiquettes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation>Montrer le menu de sélection de carte bannière</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation>Montrer le menu de sélection d&apos;étiquettes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Commentaires :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation>Grouper par :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation>Empreinte :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation>Augmenter quant&amp;ité</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation>&amp;Diminuer quantité</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation>&amp;Retirer la ligne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation>Échanger la carte vers/depuis la réserve</translation>
     </message>
@@ -1161,17 +916,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation>Enlever la sélection</translation>
     </message>
@@ -1179,114 +934,109 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation>&amp;Éditeur de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation>&amp;Nouveau deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation>&amp;Charger un deck...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation>Charger un deck récent...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation>&amp;Sauvegarder le deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation>S&amp;auvegarder le deck sous...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Charger un deck depuis le presse-pap&amp;ier...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation>Éditer le deck dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation>Avec annotations</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation>Sans annotation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation>Copier le deck dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation>Annoté (pas d&apos;info sur l&apos;extension)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation>Pas annoté (pas d&apos;info sur l&apos;extension)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation>Im&amp;primer le deck...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation>Charger un deck depuis un service en ligne...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation>Envoyer le deck au service en &amp;ligne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation>Créer une liste de deck (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation>Créer une liste de deck (decklist.xyz)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation>&amp;Analyser le deck sur deckstats.net</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation>Analyser le deck (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
@@ -1294,7 +1044,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation>Sélection d&apos;impression</translation>
     </message>
@@ -1302,227 +1052,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>Réussite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <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/dialogs/dlg_settings.cpp" line="1217"/>
         <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/dialogs/dlg_settings.cpp" line="1219"/>
         <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/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <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/dialogs/dlg_settings.cpp" line="1224"/>
         <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/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation>Effacer Lien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation>Jour(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>Mise à jour...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <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/dialogs/dlg_settings.cpp" line="1205"/>
         <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/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <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/dialogs/dlg_settings.cpp" line="1208"/>
         <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/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>Dernier changement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <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/dialogs/dlg_settings.cpp" line="1216"/>
         <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/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <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>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation>Compter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation>Édition</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Carte</translation>
     </message>
@@ -1530,12 +1247,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation>Tous les fichiers (*.*)</translation>
     </message>
@@ -1543,17 +1260,17 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation>Mode : correspondance exacte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation>Mode : inclure</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation>Mode de filtre par identité de couleur (conjonctions AND/OR/NOT de filtres)</translation>
     </message>
@@ -1561,7 +1278,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation>Éditer les étiquettes...</translation>
     </message>
@@ -1569,62 +1286,62 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation>Gestionnaire d&apos;étiquettes de decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>Gérer vos étiquettes de decks. Ajouter ou retirer les étiquettes comme nécessaire, ou en créer de nouveaux :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Ajouter une nouvelle étiquette (e.g., Elfes)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation>Ajouter Étiquette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation>Filtrer les étiquettes...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation>Éditer les étiquettes par défaut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation>Entrée invalide</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation>Le nom de l&apos;étiquette ne peut pas être vide !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation>Étiquette dupliquée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation>Cette étiquette existe déjà.</translation>
     </message>
@@ -1632,166 +1349,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation>Suppression échouée</translation>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>La réponse du serveur n&apos;a pas pu être analysée.</translation>
     </message>
@@ -1815,59 +1474,55 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
-        <translation>Charger depuis un site web...</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation>Annuler le chargement du deck</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Ready to start</source>
         <translation>Prêt à démarrer</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation>Forcer le démarrage</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation>Réserve déverrouillée</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -1875,12 +1530,12 @@ Cela va éjecter de la partie tous les joueurs non prêts à démarrer.</transla
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation>Conversion de format de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
@@ -1889,7 +1544,7 @@ Les étiquettes ne peuvent être ajoutées qu&apos;aux decks au format .cod.
 Voulez-vous convertir le deck au format .cod ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation>Mémoriser et appliquer automatiquement le choix à l&apos;avenir</translation>
     </message>
@@ -1897,148 +1552,148 @@ Voulez-vous convertir le deck au format .cod ?</translation>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Téléchargement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Hôtes connus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation>Supprimer le serveur enregistré actuellement sélectionné</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Actualiser la liste de serveurs avec des serveurs publics connus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Nouvel hôte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Nom  :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hôte :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nom du joueur :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>Mot de p&amp;asse :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Se souvenir du mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>Connexion a&amp;utomatique</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Se connecter automatiquement avec les identifiants les plus récents à l&apos;ouverture de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>Si vous rencontrez des difficultés pour vous connecter ou vous inscrire, contactez le personnel du serveur pour obtenir de l&apos;aide !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Page web</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Réinitialiser le mot de masse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation>Mot de passe oublié ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Connecter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Identifiants</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>Contact du serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Se connecter au serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>URL du serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>Port de communication</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>Nom de serveur unique</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Avertissement de connexion</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>Vous devez attribuer un nom à votre nouveau profil de connexion.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Avertissement de connexion</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Le nom du joueur ne peut être vide.</translation>
     </message>
@@ -2046,122 +1701,112 @@ Voulez-vous convertir le deck au format .cod ?</translation>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Conserver les para&amp;mètres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Description :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>&amp;Joueurs :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Type de partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>Mot de &amp;passe :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Seuls les &amp;amis peuvent rejoindre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Seuls les joueurs en&amp;registrés peuvent rejoindre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Conditions pour rejoindre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>Les &amp;spectateurs peuvent observer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Les spectateurs ont besoin d&apos;un &amp;mot de passe pour observer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Les spectateurs peuvent dis&amp;cuter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Les spectateurs peuvent voir les &amp;mains des joueurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>Créer la partie en tant que spectateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Spectateurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation>Total initial de point de vie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation>Ouvrir les listes de deck dans le lobby</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation>Options de configuration de la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>Effa&amp;cer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Créer une partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Informations sur la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Erreur serveur.</translation>
     </message>
@@ -2169,97 +1814,97 @@ Voulez-vous convertir le deck au format .cod ?</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nom :</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Jeton</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;ouleur :</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>blanc</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>bleu</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>noir</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>rouge</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>vert</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolore</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>incolore</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/E :</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotation :</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Detruire le jeton lorsqu&apos;il quitte le champ de bataille</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation>Créer face-cachée (cache seulement le nom)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Données du jeton</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Afficher &amp;tous les jetons</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Afficher les jetons présents dans ce &amp;deck</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Choisir un jeton dans la liste</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Créer un jeton</translation>
     </message>
@@ -2267,53 +1912,53 @@ Voulez-vous convertir le deck au format .cod ?</translation>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation>Éditer les étiquettes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation>Confirmer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation>Entrer une étiquette et valider avec Entrée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation>✖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation>Entrée invalide</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation>Le nom de l&apos;étiquette ne peut pas être vide !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation>Étiquette dupliquée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation>Cette étiquette existe déjà.</translation>
     </message>
@@ -2321,40 +1966,40 @@ Voulez-vous convertir le deck au format .cod ?</translation>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Aucune image choisie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Pour changer votre avatar, choisissez une nouvelle image.
 Pour enlever votre avatar actuel, confirmez sans choisir une nouvelle image.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Parcourir...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Changer d&apos;avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Ouvrir l&apos;image</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Fichiers image (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>L&apos;image choisie est invalide.</translation>
     </message>
@@ -2362,17 +2007,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation>Liste de deck invalide.</translation>
     </message>
@@ -2380,38 +2025,38 @@ Pour enlever votre avatar actuel, confirmez sans choisir une nouvelle image.</tr
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Ancien mot de passe :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nouveau mot de passe :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Confirmer le nouveau mot de passe :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Changer le mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Mot de passe trop court</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Les nouveaux mots de passe ne correspondent pas.</translation>
     </message>
@@ -2419,93 +2064,93 @@ Pour enlever votre avatar actuel, confirmez sans choisir une nouvelle image.</tr
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nom :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;ouleur :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>blanc</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>bleu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>noir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>rouge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>vert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>multicolore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>incolore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/E :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotation :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Données du jeton</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Ajouter un jeton</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Retirer le jeton</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>Éditer les jetons personnalisés</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Entrez le nom du jeton :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>Le nom choisi est en conflit avec une carte ou un jeton existant.
@@ -2515,27 +2160,27 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Adresse email :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Pays :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Indéfini</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Nom réel :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Modifier le profil utilisateur</translation>
     </message>
@@ -2543,143 +2188,137 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>Sans limite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5 minutes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10 minutes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30 minutes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1 heure</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2 heures</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>Ne pas afficher les parties « amis uniquement »</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation>Cacher les parties pleines</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation>Cacher les parties qui ont commencées</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation>Cacher les parties protégées par un mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>Cacher les parties des utilisateurs ignorés</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
+        <translation>Cacher les parties non créées par des amis.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation>Masquer les parties avec les listes de decks ouvertes forcées</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Créées avant :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Description de la partie :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>Nom du &amp;créateur :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>Types de &amp;partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>au &amp;moins :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>au &amp;plus :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Nombre de joueurs maximum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Restrictions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Montrer les parties uniquement si les %spectateurs peuvent observer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Montrer les parties où les spectateurs doivent ent&amp;rer un mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Montrer uniquement si les spectateurs peuvent p&amp;arler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Montrer uniquement si les spectateurs peuvent voir les &amp;mains</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation>Spectateurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Flitrer les parties</translation>
     </message>
@@ -2687,52 +2326,52 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation>Avertissement Réinitialisation du mot de passe Challenge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Un probleme est survenu. Veuillez réessayer de demander un nouveau mot de passe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation>Veuillez entrer les informations du serveur et du compte pour lesquels vous voulez demander un nouveau mot de passe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hôte :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nom du joueur :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>Adresse e-mail :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation>Réinitialisation du mot de passe Challenge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation>Erreur Réinitialisation du mot de passe Challenge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>L&apos;adresse e-mail ne peut être vide.</translation>
     </message>
@@ -2740,37 +2379,37 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation>Entrez les informations du serveur pour lequel vous souhaitez demander un nouveau mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hôte :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nom du joueur :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation>Demande de réinitialisation du mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation>Erreur lors de la réinitialisation du mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Le nom du joueur ne peut être vide.</translation>
     </message>
@@ -2778,86 +2417,86 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation>Avertissement lors de la réinitialisation du mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Un problème est survenu. Veuillez demander un nouveau mot de passe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation>Entrez le code reçu et le nouveau mot de passe afin d&apos;initialiser le nouveau mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hôte :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nom du joueur :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Jeton :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Nouveau mot de passe :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Réinitialiser le mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Le nom du joueur ne peut être vide.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation>Erreur de réinitialisation du mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>Le jeton ne peut pas être vide.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>Le nouveau mot de passe ne peut être vide.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation>Mot de passe trop court</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>Les mots de passe ne correspondent pas.</translation>
     </message>
@@ -2865,7 +2504,7 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation>Charger un deck</translation>
     </message>
@@ -2873,152 +2512,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Liste de Deck invalide.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation>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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-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>L&apos;URL fournie n&apos;est pas reconnue comme une URL de deck valide.
-Les URL de deck valides ressemblent à ceci:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</translation>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Charger Deck</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation 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/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation>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/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation>Filtre invalide</translation>
     </message>
@@ -3026,91 +2576,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Entrez votre identifiant et l&apos;identifiant du serveur auquel vous voulez vous connecter. Un e-mail va vous être envoyé pour vérifier votre compte. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hôte :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nom du joueur :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>Mot de p&amp;asse :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Mot de passe (encore) :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Adresse mail :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Adresse mail (encore) :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Pays :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Indéfini</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Nom réel :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>S&apos;enregistrer sur le serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Avertissement d&apos;enregistrement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>Mot de passe trop court</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Vos mots de passe ne correspondent pas, veuillez réessayer.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Vos adresses mail ne correspondent pas, veuillez réessayer.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Le nom du joueur ne peut pas être vide.</translation>
     </message>
@@ -3118,17 +2668,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation>Nombre de faces:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation>Nombre de dés:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation>Lancer les dés</translation>
     </message>
@@ -3136,55 +2686,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation>Cartes non modifiées :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation>Cartes modifiées :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation>Cliquer sur des Extensions pour les activer. Glisser-et-déposer pour les réarranger et changer leur priorité. Les cartes utiliseront la version de l&apos;extension activée ayant la plus haut priorité.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation>Nettoyer toutes les informations sur les extensions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation>Tout régler selon vos préférences</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3201,7 +2736,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3218,7 +2753,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2766,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3240,7 +2775,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3249,7 +2784,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3262,59 +2797,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Apparence</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>Interface utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <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/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Son</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Raccourcis</translation>
     </message>
@@ -3322,12 +2857,12 @@ Voulez-vous changer l&apos;emplacement de votre base de données ?</translation>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation>Vérification de la mise à jour des cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/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>
@@ -3336,27 +2871,27 @@ Choisissez comment vous souhaitez exécuter le programme de mise à jour de la b
 Vous pouvez toujours modifier ce comportement dans l&apos;onglet « Général » des paramètres.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation>S&apos;exécuter en tâche principale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation>S&apos;exécuter en tâche de fond</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation>S&apos;exécuter en tâche de fond, et toujours le faire à partir de maintenant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation>Ne pas demander à nouveau et ne pas exécuter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation>Ne pas exécuter cette fois</translation>
     </message>
@@ -3364,17 +2899,17 @@ Vous pouvez toujours modifier ce comportement dans l&apos;onglet « Général »
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>suivant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>précédent</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Conseil du jour</translation>
     </message>
@@ -3382,166 +2917,170 @@ Vous pouvez toujours modifier ce comportement dans l&apos;onglet « Général »
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Branche logicielle actuelle</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Réinstaller</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Annuler le téléchargement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Ouvrir la page de téléchargement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation>Vérification des mises à jour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>Cockatrice n&apos;as pas été construit avec le support du SSL, donc il n&apos;est pas possible de télécharger les mises à jour automatiquement.
 Veuillez s&apos;il vous plaît visiter la page de téléchargement, pour mettre à jour manuellement.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation>Téléchargement de la mise à jour : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Vérification des mises à jour...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Fin de la recherche des mises à jour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Pas de mises à jour disponibles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice est à jour !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>Vous avez déjà la dernière version correspondant à votre branche.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Version actuelle</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Branche logicielle sélectionnée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Mise à jour disponible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Une nouvelle version de Cockatrice est disponible !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Nouvelle version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>Sortie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Notes de version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Voulez-vous mettre à jour maintenant ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation>Malheureusement, la mise à jour automatique n&apos;a pas pu trouver un téléchargement compatible.
 Vous allez peut-être devoir télécharger manuellement la nouvelle version.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation>Veuillez vérifier la &lt;a href=&quot;%1&quot;&gt;page &quot;releases&quot;&lt;/a&gt; sur notre Github et télécharger le programme pour votre système.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Erreur de mise à jour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Une erreur est survenur pendant la vérification des mises à jour :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Une erreur est survenue pendant le téléchargement de la mise à jour :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Installation...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice n&apos;a pas pu ouvrir l&apos;installateur.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Essayer de mettre à jour manuellement en fermant Cockatrice et en exécutant l&apos;installateur.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>Répertoire de téléchargement</translation>
     </message>
@@ -3549,162 +3088,30 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Effacer le journal lors de la fermeture</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation>Charger vers le presse-papier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Journal de debug</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <translation>Dans %1 deck(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation>%1% de %2 deck(s)</translation>
     </message>
@@ -3712,47 +3119,47 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <translation>Card Hoarder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <translation>Card Kingdom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <translation>Card Market</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <translation>Face 2-Face</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <translation>Mana Pool</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <translation>MTG Stocks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <translation>Scg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <translation>Tcgl</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation>Tcgplayer</translation>
     </message>
@@ -3760,44 +3167,38 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation>%1% synergie</translation>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation>Combos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation>Deck moyen</translation>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation>Game Changers</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation>Budget</translation>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation>Sel :</translation>
     </message>
@@ -3805,7 +3206,7 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>Tapez votre filtre ici</translation>
     </message>
@@ -3813,325 +3214,244 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation>Confirmer la suppression</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation>Êtes-vous sûr de vouloir supprimer le filtre &apos;%1&apos; ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation>Suppression échouée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation>Échec de la suppression du filtre &apos;%1&apos;.</translation>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation>Éjecté par l&apos;hôte de la partie ou un modérateur</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation>joueur a quitté la partie</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation>joueur déconnecté du serveur</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation>raison inconnue</translation>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Veuillez d&apos;abord rejoindre le bon salon.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Mot de passe incorrect.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Les spectateurs ne sont pas autorisés dans cette partie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>Cette partie est déjà complète.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>La partie n&apos;existe plus.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Cette partie n&apos;est accessible qu&apos;aux joueurs enregistrés.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Cette partie n&apos;est accessible qu&apos;aux amis de son créateur.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Vous avez été ignoré par le créateur de la partie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation>Rejoindre la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation>Rejoindre la partie comme spectateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation>Informations sur la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Rejoindre partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Mot de passe :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>Veuillez d&apos;abord rejoindre le bon salon.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtrer les jeux</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>Effacer les fi&amp;ltres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>C&amp;réer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>Re&amp;joindre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>Rej&amp;oindre en tant que spectateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation>Parties affichées : %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Parties</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation>&gt; 1 jour</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 h</numerusform><numerusform>%1%2 h</numerusform><numerusform>%1%2 h</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation>Nouveau</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>amis uniquement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>joueurs enregistrés uniquement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation>Ouvrir les listes de deck</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>peut discuter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>voir les mains</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>peut voir les mains</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>non autorisé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Salon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Âge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Créateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Restrictions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Joueurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Spectateurs</translation>
     </message>
@@ -4139,609 +3459,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cimetière</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;All players</source>
-        <translation>&amp;Tous les joueurs</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Main</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exil</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation>Révéler une carte au hasard à...</translation>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Main</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation>&amp;Voir la main</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation>&amp;Déplacer la main vers…</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cimetière</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exil</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <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"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation>Révéler une c&amp;arte au hasard à...</translation>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <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"/>
-        <source>Browse Decks</source>
-        <translation>Parcourir les Decks</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <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"/>
-        <source>Browse EDHRec</source>
-        <translation>Parcourir EDHRec</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation>Voir les replays</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation>Quitter</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation>Connection...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation>Se connecter</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation>Jouer</translation>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation>&amp;Bibliothèque</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Draw card</source>
-        <translation>&amp;Piocher une carte</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle</source>
-        <translation>Mélanger</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;All players</source>
-        <translation>&amp;Tous les joueurs</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <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"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation>Nombre de cartes : (max. %1)</translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>Le serveur a atteint sa capacité maximale de joueurs simultanés, veuillez réessayer plus tard.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Il y a trop de connexions simultanées depuis votre ordinateur.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Banni par un modérateur</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Fin théorique : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>Banni définitivement.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Fermeture prévue du serveur.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Nom d&apos;utilisateur non valide.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>Vous avez avez été déconnecté pour avoir changé d&apos;endroit.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Connexion fermée</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>Le serveur a coupé votre connexion.
 Raison: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4754,574 +3670,584 @@ Aucune partie en cours ne sera sauvegardée.
 Raison de la fermeture : %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Fermeture prévue du serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Réussite</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Enregistrement accepté.
 Connexion en cours.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Activation du compte acceptée.
 Connexion en cours.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Nombre de joueurs</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Entrez s&apos;il vous plaît le nombre de joueurs.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Joueur %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Charger replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>À propos de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Page web de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Chef de projet:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>Anciens chefs de projet:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>Développeurs :</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>Nos développeurs</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>Aidez à développer !</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Traducteurs :</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>Nos traducteurs</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>Aidez à traduire !</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Assistance :</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Signaler un problème</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Dépannage</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>F.À.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Délai de la demande dépassé</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Connexion échouée</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>Il semble que certaines fonctionnalités nécessaires à la connexion à ce serveur sont absentes de votre client.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>Pour mettre à jour Cockatrice, allez dans « Aide -&gt; Vérifier les mises à jour&apos; ».</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Nom d&apos;utilisateur ou mot de passe incorrect. Veuillez vérifier vos identifiants et réessayer.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Il y a déjà une session ouverte avec le même nom d&apos;utilisateur.
 Fermez cette session puis reconnectez vous.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Vous êtes banni jusqu&apos;au %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Vous êtes banni indéfiniment.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>Vous devez être enregistré pour accéder à ce serveur. Voulez-vous vous enregistrer ?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation>Ce serveur requiert un ID de client. Soit votre client a échoué lors de la génération d&apos;un ID, soit vous utilisez un client modifié.
 Veuillez fermer et rouvrir votre client pour réessayer.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>Une erreur interne est survenue. Veuillez fermer et rouvrir Cockatrice avant de réessayer.
 Si l&apos;erreur persiste, vérifiez que utilisez la dernière version du logiciel, ou contactez les développeurs si nécessaire.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Activation du compte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>Votre compte n&apos;a pas encore été activé.
 Vous devez activer le jeton de l&apos;activation reçu dans le mail d&apos;activation.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>Serveur complet</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Erreur de connexion inconnue : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 Cela veut généralement dire que votre client n&apos;est plus à jour, et que le serveur a envoyé une réponse que votre client ne comprend pas.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>Votre nom d&apos;utilisateur doit respecter ces règles :</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>est long de %1 - %2 caractères</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>peut %1 contenir des caractères minuscules</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>PAS</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>peut %1 contenir des caractères majuscules</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>peut %1 contenir des caractères numériques</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>peut contenir la ponctuation suivante : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>le premier caractère peut %1 être une marque de ponctuation</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation>Pas de langage inacceptable comme spécifié par ces règles du serveur:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>ne peut contenir les mots suivants : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>ne correspond à aucune des expressions suivantes : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>Vous pouvez utiliser seulement A-Z, a-z, 0-9, _, ., et - dans votre nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>Enregistrement refusé</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>L&apos;enregistrement est désactivé sur ce serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>Il existe déjà un compte avec le même nom d&apos;utilisateur.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>Il est obligatoire de spécifier une adresse e-mail valide lors de l&apos;enregistrement.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>Il semble que vous essayez d&apos;enregistrer un nouveau compte alors que vous en avez déjà un enregistré avec cet e-mail sur ce serveur. Ce serveur restreint le nombre de comptes par e-mail. Veuillez contacter l&apos;administrateur du serveur pour obtenir vos identifiants ou plus d&apos;informations.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>Mot de passe trop court.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>Enregistrement échoué lié à un problème technique du serveur.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation>La connexion au serveur a été perdue.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>Erreur d&apos;enregistrement inconnue : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>Activation du compte échouée</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Erreur de socket : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>Vous tentez de vous connecter à un serveur obsolète. Veuillez utiliser une ancienne version de Cockatrice, ou connectez-vous à un serveur approprié.
 La version locale est %1, la version distante est %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>Votre client Cockatrice est obsolète. Veuillez mettre à jour votre version de Cockatrice.
 La version locale est %1, la nouvelle version est %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Connexion à %1...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>Enregistrement de %1 en tant que %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Déconnecté</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Connecté, connexion à %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation>Envoi de la requête de mot de passe oublié à %1 en tant que %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Connecter...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Déconnecter</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>Démarrer une partie &amp;locale...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Regarder un replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Plein écran</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>S&apos;enregistrer sur le serveur...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Restaurer le mot de passe...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Paramètres...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>Actions</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>B&amp;ase de données de cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Gérer les éditions...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Éditer les &amp;jetons personnalisés…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>Ouvrir le dossier d&apos;images personnalisées</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>Ouvrir le dossier d&apos;éditions personnalisées</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>Ajouter des éditions / cartes personnalisées</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation>Recharger la base de cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>A&amp;ide</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>À propos de Cock&amp;atrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Conseil du jour</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>Vérifier les mises à jour</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation>Vérifier les mises à jour des cartes…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation>Vérifier les mises à jour des cartes (automatiquement)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation>Montrer la barre de statut</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation>Voir journal de &amp;Debug</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation>Ouvrir le dossier des paramètres</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation>Montrer/Cacher</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>Nouvelle version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <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/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <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/client/ui/window_main.cpp" line="1133"/>
         <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 +4256,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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Ouvrir les paramètres</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <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/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5365,17 +4291,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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>Voir les éditions</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Bienvenue</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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 +4310,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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Informations</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <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/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <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/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,863 +4379,669 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1393"/>
         <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/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <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/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <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>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation>Base de mana</translation>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation>Courbe de mana</translation>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation>Dévotion au mana</translation>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 reste dans la partie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>une carte</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation>dessous</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation>dessus</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation>La partie commence.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation>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/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation>inversé</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>Face</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>Pile</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 annule sa dernière pioche (%2).</translation>
     </message>
@@ -6317,206 +5049,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <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/dialogs/dlg_settings.cpp" line="1467"/>
         <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/dialogs/dlg_settings.cpp" line="1468"/>
         <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/dialogs/dlg_settings.cpp" line="1469"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Message :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <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/dialogs/dlg_settings.cpp" line="1449"/>
         <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/dialogs/dlg_settings.cpp" line="1450"/>
         <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/dialogs/dlg_settings.cpp" line="1451"/>
         <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/dialogs/dlg_settings.cpp" line="1452"/>
         <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/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <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/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <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/dialogs/dlg_settings.cpp" line="1465"/>
         <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>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation>Déplacer vers</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Main</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cimetière</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exil</translation>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation>Type de carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation>Valeur de Mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation>Couleur(s)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation>Loyauté</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation>Type de carte principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation>Coût de mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation>F/E</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation>Côté</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation>Design</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation>Identité couleur</translation>
     </message>
@@ -6524,17 +5213,17 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation>Cartes à superposer :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation>Pourcentage de superposition :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation>Direction de superposition :</translation>
     </message>
@@ -6542,62 +5231,62 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation>Phase inconnue</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation>Dégagement</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation>Entretien</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation>Pioche</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation>Première phase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation>Début de combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation>Déclaration des attaquants</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation>Déclaration des bloqueurs </translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation>Blessures de combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation>Fin de combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation>Seconde phase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation>Phase de fin</translation>
     </message>
@@ -6605,57 +5294,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Phase de fin de tour</translation>
     </message>
@@ -6663,213 +5352,703 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>fr</translation>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation>Voir les cartes du dessus de la bibliothèque</translation>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <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/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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <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.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>&amp;Voir le cimetière</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>Voir les cartes e&amp;xilées</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>Joueur « %1 »</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;Cimetière</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;Exil</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>Déplacer la &amp;main vers…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>&amp;Dessus de la bibliothèque</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>Dessous de la &amp;bibliothèque</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>Déplacer le cimetière vers...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;Main</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>&amp;Déplacer les cartes exilées vers...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>&amp;Voir la bibliothèque</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation>Voir &amp;main</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <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/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>Révéler &amp;la bibliothèque à...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <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/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>&amp;Voir la réserve</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;Piocher une carte</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>P&amp;iocher plusieurs cartes...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>Annu&amp;ler la dernière pioche</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>Faire un &amp;mulligan</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <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/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation>Mettre la carte du dessus dans le cimetière</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation>Exiler la carte du dessus</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <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/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>E&amp;xiler les cartes du dessus...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>Mettre la carte du dessus au-&amp;dessous</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <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.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation>Prêter la bibliothèque à...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation>Mélanger</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation>Placer les cartes du dessus sur la pile j&amp;usqu&apos;à...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation>Mélanger les cartes du dessus...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation>Mélanger les cartes du dessous...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>&amp;Révéler la main à...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Révéler une c&amp;arte au hasard à...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation>Révéler une carte au hasard à...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>Ré&amp;serve</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Bibliothèque</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>Mar&amp;queurs</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation>&amp;Zones personnalisés</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation>Voir la zone personnalisée &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>Dé&amp;gager tous les permanents</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>Lancer un &amp;dé...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>&amp;Créer un jeton...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>C&amp;réer un autre jeton</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>C&amp;réer un jeton prédéfini</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation>Ma&amp;rqueurs sur la carte</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>&amp;Tous les joueurs</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>D&amp;ire</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation>&amp;Sélectionner Tout</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation>Sél&amp;ectionne une ligne</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation>Sél&amp;ectionne une colonne</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Jouer</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>&amp;Cacher</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>Jouer &amp;face cachée</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <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/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Activer / désactiver dégagement &amp;normal</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <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/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>&amp;Regarder furtivement la carte face cachée</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>&amp;Cloner</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>Attac&amp;her à une carte...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>Détac&amp;her</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>&amp;Tracer une flèche...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>&amp;Augmenter la force</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>&amp;Diminuer la force</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>A&amp;ugmenter l&apos;endurance</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>D&amp;iminuer l&apos;endurance</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>Au&amp;gmenter la force et l&apos;endurance</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>Di&amp;minuer la force et l&apos;endurance</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation>Augmenter la force et diminuer l&apos;endurance</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation>Diminuer la force et augmenter l&apos;endurance</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>Changer la &amp;force et l&apos;endurance...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation>Réinitialiser la f&amp;orce et l&apos;endurance</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>&amp;Annoter...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>&amp;Ajouter un marqueur (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;Retirer un marqueur (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>&amp;Changer le nombre de marqueurs (%1)...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <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/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation>X carte(s) du dessus de la bibliothèque...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <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/player.cpp" line="1162"/>
+        <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.cpp" line="1175"/>
         <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.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <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"/>
-        <source>Draw hand</source>
-        <translation>Piocher une main</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <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"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Number:</source>
-        <translation>Nombre :</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <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.cpp" line="3188"/>
         <source>Which position should this card be placed:</source>
-        <translation>Dans quelle position cette carte doit-elle être placée :</translation>
+        <translation>Dans quel position cette carte sera placé</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <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.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation>Piocher une main</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <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.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>Piocher plusieurs cartes</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>Nombre :</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <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.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation>Révéler les cartes du dessus à...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation>&amp;Dessus de la bibliothèque</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation>&amp;Dessous de la bibliothèque</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation>&amp;Toujours révéler la carte du dessus</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <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/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation>&amp;Jouer la carte du dessus de la bibliothèque</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation>&amp;Piocher la carte du dessous </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation>P&amp;iocher la carte du dessous </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation>&amp;Jouer la carte du dessous</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <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/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation>Mettre la carte du dessous dans le &amp;cimetière</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation>E&amp;xiler les cartes du dessous</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation>Mettre les cartes du dessous dans le cime&amp;tière...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation>&amp;Exiler les cartes du dessus...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation>Mettre la carte du dessous au-&amp;dessus</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation>Cartes &amp;sélectionnées</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>Exiler les cartes du dessus</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <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.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation>Exiler les cartes du dessus</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation>Piocher la carte du dessous </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation>Créer un autre jeton %1</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation>Créer des jetons</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation>Mettre les X cartes du dessus de la bibliothèque</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change power/toughness</source>
-        <translation>Changer la force/l&apos;endurance</translation>
+        <translation>Changer la force et l&apos;endurance</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change stats to:</source>
-        <translation>Changer les stats pour :</translation>
+        <translation>Changer les stats à :</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player.cpp" line="3653"/>
         <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.cpp" line="3654"/>
         <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.cpp" line="3747"/>
         <source>Set counters</source>
-        <translation>Définir les marqueurs</translation>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
-        <translation>Joueur &quot;%1&quot;</translation>
+        <translation>Nombre de marqueurs</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <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"/>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation>Révéler à...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation>Voir les cartes associées</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>Jeton :</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>Tout les jetons</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</source>
+        <translation>&lt;b&gt;Attention :&lt;/b&gt; Vous semblez utiliser des illustrations de cartes personnalisées, qui présentent des bugs connus lorsque vous utilisez également le sélecteur d&apos;impression dans cette version de Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation>Afficher les cartes associées</translation>
     </message>
@@ -6877,7 +6056,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation>Rechercher par nom d&apos;extension ou code d&apos;extension</translation>
     </message>
@@ -6885,17 +6064,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation>Carte précédente dans le deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation>Sélection groupée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation>Carte suivante dans le deck</translation>
     </message>
@@ -6903,132 +6082,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation>Alphabétiquement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <translation>Date de Sortie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="36"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <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>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation>Force / Endurance</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation>&amp;Augmenter la force</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation>&amp;Diminuer la force</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation>A&amp;ugmenter l&apos;endurance</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <translation>D&amp;iminuer l&apos;endurance</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
-        <source>In&amp;crease power and toughness</source>
-        <translation>Au&amp;gmenter la force et l&apos;endurance</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation>Dim&amp;inuer la force et l&apos;endurance</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation>Augmenter la force et diminuer l&apos;endurance</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation>Diminuer la force et augmenter l&apos;endurance</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <translation>Changer la &amp;force et l&apos;endurance...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
-        <source>Reset p&amp;ower and toughness</source>
-        <translation>Réinitialiser la f&amp;orce et l&apos;endurance</translation>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>Services</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>Cacher %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>Cacher les autres</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>Montrer tout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>Préférences...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>Quitter %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>À propos %1</translation>
     </message>
@@ -7036,162 +6149,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Base de données de cartes Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>Tous les fichiers (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Replays Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation>Maindeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation>Jetons</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation>Écraser le fichier existant ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <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>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation>Sauvegarder tout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation>&amp;Oui</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation>Dire oui à tout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation>&amp;Non</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation>Dire non à tout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation>Abandonner</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation>Réessayer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation>Appliquer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation>Réinitialiser</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation>Remettre à zéro</translation>
     </message>
@@ -7199,17 +6285,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Temps de chargement</translation>
     </message>
@@ -7217,149 +6303,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>Joueurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>Garder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>Le temps a commencé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>Durée (sec)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exil</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Main</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cimetière</translation>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Salons</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Rejoindre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Salon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>Permissions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Joueurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation>Choisir une action de la table</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation>Choisissez la combinaison de touches que vous voulez utiliser pour cette action</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation>Touche invalide</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation>Raccourci déjà utilisé par :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation>Options par défaut</translation>
     </message>
@@ -7367,27 +6407,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>Activée</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>Code</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Nom complet</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>Date de sortie</translation>
     </message>
@@ -7395,53 +6435,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation>Section :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation>Action :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation>Raccourci :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <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/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation>Rechercher par nom de raccourci</translation>
     </message>
@@ -7449,12 +6489,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Action</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Raccourci</translation>
     </message>
@@ -7462,13 +6502,13 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Votre fichier de configuration contenait des raccourcis invalides. Merci de vérifier vos paramètres de raccourci !</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Les raccourcis suivants ont été définis par défaut:
@@ -7478,58 +6518,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>&amp;Raison de la fermeture :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;Temps avant la fermeture (minutes):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>Fermer le serveur</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation>&amp;Réserve</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation>&amp;Voir la réserve</translation>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <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/dialogs/dlg_settings.cpp" line="1544"/>
         <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/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <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/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>Volume principal</translation>
     </message>
@@ -7537,48 +6564,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation>La saison des spoilers est terminée</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Suppression de spoiler.xml. S&apos;il vous plaît exécuter Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation>Échec du téléchargement des spoilers</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation>Pas de connexion Internet</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation>Spoilers déjà à jour</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation>Aucun nouveau spoilers ajouté</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation>Les spoilers ont été mis à jour!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation>Dernier changement:</translation>
     </message>
@@ -7586,27 +6613,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation>Défaut</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>Aucune réponse reçue de la part du serveur de mise à jour.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Réponse invalide reçue de la part du serveur de mise à jour.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>Aucune réponse reçue de la part du serveur de mise à jour des tags.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Réponse invalide reçue de la part du serveur de mise à jour des tags.</translation>
     </message>
@@ -7614,17 +6641,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation>Ajouter à la liste d&apos;amis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation>Ajouter à la liste noire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
@@ -7632,289 +6659,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>Mettre à jour le &amp;message du serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;Fermer le serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>&amp;Recharger la configuration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Fonctions d&apos;administration du serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation>Fonctions de modérateur du serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation>Replay ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation>Accorder l&apos;accès au Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation>Nom d&apos;utilisateur à activer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation>Forcer l&apos;activation d&apos;un utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>&amp;Débloquer fonctions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>&amp;Bloquer fonctions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation>Succès</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation>Accès au Replay accordé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation>Incapable d&apos;accorder l&apos;accès au Replay. Le Replay ID est invalide.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation>Incapable d&apos;accorder l&apos;accès au Replay. Erreur interne.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation>Utilisateur activé avec succès</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation>Incapable d&apos;activer l&apos;utilisateur. Nom d&apos;utilisateur invalide</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation>Incapable d&apos;activer l&apos;utilisateur. Utilisateur déjà actif</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation>Incapable d&apos;activer l&apos;utilisateur. Erreur interne</translation>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <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/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>Bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>Filtres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>&amp;Voir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation>Imprimer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>Flottant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <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/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Deck : %1</translation>
     </message>
@@ -7922,55 +6826,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation>Analyse de deck</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation>Réinitialiser l&apos;interface</translation>
     </message>
@@ -7978,22 +6895,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation>Vue de deck visuel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation>Affichage visuel de la base de données</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation>Analyse de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation>Exemple de main</translation>
     </message>
@@ -8001,139 +6918,139 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>Système de fichier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Serveur de stockage de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Ouvrir dans l&apos;éditeur de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation>Renommer le deck ou le dossier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Envoyer deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Télécharger deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>Nouveau dossier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation>Ouvrir le dossier des decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation>Renommer le dossier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation>Renommer le fichier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation>Nouveau nom :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>Érreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation>Renommage échoué</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation>Fichier de deck invalide</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Entrez le nom du deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>Ce deck n&apos;a pas de nom.
 Veuillez entrer un nom:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Deck sans nom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation>Erreur lors de l&apos;importation du deck sur le serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>Supprimer fichier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>Nom du nouveau dossier :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation>Stockage de deck</translation>
     </message>
@@ -8141,17 +7058,17 @@ Veuillez entrer un nom:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation>Stockage visuel de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation>N&apos;a pas pu ouvrir le deck à %1</translation>
     </message>
@@ -8159,7 +7076,7 @@ Veuillez entrer un nom:</translation>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation>EDHREC :</translation>
     </message>
@@ -8167,391 +7084,407 @@ Veuillez entrer un nom:</translation>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation>&amp;Cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation>Commandants populaires</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation>Étiquettes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation>Rechercher une carte ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation>Rechercher</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
-        <translation>EDHRec :</translation>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
+        <translation>EDHREC :</translation>
     </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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <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/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>&amp;Phases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>&amp;Partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <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/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <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/client/tabs/tab_game.cpp" line="236"/>
         <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/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <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/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <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/client/tabs/tab_game.cpp" line="257"/>
         <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/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <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/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>&amp;Dire :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <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/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>&amp;Voir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>Flottant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <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/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>Concéder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <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/client/tabs/tab_game.cpp" line="493"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <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/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>Éjecté par l&apos;hôte de la partie ou un modérateur</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>joueur a quitté la partie</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>joueur déconnecté du serveur</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation>raison inconnue</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>Vous avez été expulsé de la partie.</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation>Accueil</translation>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>Journaux</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>Durée;Expéditeur;IPExpéditeur;Message;IDCible;NomCible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>Journaux du salon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>Journaux de la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>Journaux du chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>Vous devez sélectionner au moins un filtre.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>Vous devez sélectionner un nombre valide de jours à identifier.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>Nom d&apos;utilisateur:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>Adresse IP :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>Nom de la partie :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>ID de la partie :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>Message :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>Salon principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>Salon de jeu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>Chat privé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>Les X derniers jours :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>La dernière heure</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>Résultats maximum :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>Au moins un filtre est requis.
 Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>Obtenir les journaux de l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>Effacer les filtres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>Filtres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>Emplacement des journaux</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>Intervalle de dates</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>Résultats maximum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>Historique des messages</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>Impossible de récupérer l&apos;historique des messages.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Il n&apos;y a pas de messages pour les filtres sélectionnés.</translation>
     </message>
@@ -8559,37 +7492,37 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>&amp;Chat privé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Chat privé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>Cet utilisateur vous ignore, il ne peut pas voir vos messages dans le chat principal et vous ne pouvez pas rejoindre ses parties.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>Message privé de</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 a quitté le serveur.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 a rejoint le serveur.</translation>
     </message>
@@ -8597,185 +7530,105 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>Système de fichier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>Stockage du serveur de replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>Voir replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation>Renommer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation>Nouveau fichier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation>Ouvrir le dossier des Replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>Télécharger replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>Changer le verrouillage de l&apos;expiration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation>Obtenir le code de partage du replay</translation>
-    </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>Regarder un replay depuis un code de partage</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation>Renommer le dossier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation>Renommer le fichier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation>Nouveau nom:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation>Renommage échoué</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation>Nom du nouveau fichier:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>Supprimer fichier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Êtes-vous certain de vouloir supprimer les fichiers sélectionnés?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Êtes-vous certain de vouloir supprimer cet enregistrement?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <translation>Echec d&apos;obtention du code</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="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>Soit ce serveur ne prend pas en charge le partage de replay, soit il ne vous autorise pas à partager des replays.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="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>Échec</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation>Impossible d&apos;obtenir le code de replay</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <translation>Code de Partage de Replay</translation>
-    </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>D&apos;autres peuvent utiliser ce code pour ajouter la replay à leur liste de replay distantes :%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation>Copier vers le presse-papier</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation>Code de partage de replay</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation>Code de replay trouvé</translation>
-    </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>Le replay a été ajoutée, ou vous y aviez déjà accès.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation>Code de replay non trouvé</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation>Échec de l&apos;envoi du code</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation>Erreur inattendue</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>Supprimer le replay distant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation>Replays de parties</translation>
     </message>
@@ -8783,47 +7636,47 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;Dire :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;Salon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Quitter le salon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>Effacer le &amp;Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>Paramètres du chat...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation>vous a mentionné.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>Cliquer pour voir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>Vous floodez le chat. Veuillez patienter quelques secondes.</translation>
     </message>
@@ -8831,35 +7684,35 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation>Impossible de rejoindre le salon: il n&apos;existe pas sur le serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation>Le serveur considère que vous êtes dans le salon mais votre client est incapable de l&apos;afficher. Essayez en relançant votre client.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation>Vous n&apos;avez pas la permission requise pour rejoindre ce salon.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation>Impossible de rejoindre le salon à cause d&apos;un erreur inconnue: %1</translation>
     </message>
@@ -8867,97 +7720,87 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation>Éditeur de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation>Éditeur de deck visuel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation>EDHrec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation>Accueil</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation>Stockage &amp;visuel de decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation>Affichage visuel de la base de données</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation>Stockage de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation>Replays de parties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation>Journaux</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>Êtes-vous sûr ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>Il y a encore des parties en cours. Êtes-vous sûr de vouloir quitter ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation>Cliquer pour regarder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Votre ami %1 s&apos;est inscrit !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>Événement inconnu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8968,39 +7811,39 @@ Ce message peut signifier qu&apos;il y a une nouvelle version de Cockatrice disp
 Pour mettre à jour votre client, allez dans « Aide -&gt; Vérifier les mises à jour ».</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation>Temporisation inactive</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Vous allez d&apos;être déconnecté en raison de l&apos;inactivité.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>Promotion</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation>Vous avez été promu modérateur. Veuillez vous reloguer pour que les changements prennent effet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>Averti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>You avez reçu un avertissement pour la raison : %1.
 Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre vous. Si vous avez des questions, veuillez contacter un modérateur en privé.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>Vous avez reçu le message suivant du serveur.
@@ -9010,12 +7853,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation>Affichage visuel de la base de données</translation>
     </message>
@@ -9023,13 +7861,13 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>Impossible d&apos;analyser le Deck.</translation>
     </message>
@@ -9037,14 +7875,14 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>Le fichier n&apos;existe pas.
 </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>Échec de l&apos;ouverture du fichier.
@@ -9054,42 +7892,42 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Points de vie</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Blanc</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Bleu</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Noir</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Rouge</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Vert</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Incolore</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Autre</translation>
     </message>
@@ -9097,7 +7935,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>Impossible d&apos;ouvrir le fichier en lecture.</translation>
     </message>
@@ -9105,206 +7943,184 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>&amp;Détails utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>&amp;Chat privé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Voir les parties du &amp;joueur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>Ajouter à la liste d&apos;&amp;amis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Retirer de la liste d&apos;&amp;amis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>Ajouter à la l&amp;iste noire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Retirer de la l&amp;iste noire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>Exclure de la &amp;partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>Avertir le joueur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Voir l&apos;historique des avertisseme&amp;nts du joueur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>Bannir du &amp;serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Voir l&apos;historique de &amp;bannissement du joueur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promouvoir d&apos;utilisateur à modérateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Rétr&amp;ograder de modérateur à utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation>Promouvoir utilisateur à &amp;arbitre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation>Destituer arbitre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation>Voir les notes d&apos;administrateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="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>Erreur</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <source>This user does not exist.</source>
-        <translation>Cet utilisateur n&apos;existe pas.</translation>
-    </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>Vous avez été ignoré par %1 et ne pouvez pas voir ses parties.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation>Impossible d&apos;obtenir les parties de %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>Parties de %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>Historique des bannissements</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>Heure de bannissement;Modérateur;Durée de bannissement;Raison du bannissement;Raison visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>Le joueur n&apos;a jamais été banni.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation>Impossible de collecter les informations de bannissement.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>Historique des avertissements</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>Heure d&apos;avertissement;Modérateur;Nom d&apos;utilisateur;Raison</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>Le joueur n&apos;a jamais reçu d&apos;avertissement.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation>Impossible de collecter les informations d&apos;avertissements.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation>Impossible de récupérer les notes d&apos;administrateur.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>Succès</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>L&apos;utilisateur a été promu avec succès.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>L&apos;utilisateur a été rétrogradé avec succès.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>Échec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>L&apos;utilisateur n&apos;a pas été promu.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>L&apos;utilisateur n&apos;a pas été rétrogradé.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation>Copier le hash</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Supprimer les messages de cet utilisateur</translation>
     </message>
@@ -9312,173 +8128,173 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Localisation :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>Ancienneté du compte :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>Éditer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>Changer le mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>Changer l&apos;avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Administrateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>Modérateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Joueur enregistré</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Joueur non enregistré</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation>Arbitre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation>Le mot de passe est incorrect</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>Informations de l&apos;utilisateur mises à jour.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation>Informations utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation>Nom réel :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation>Rang :</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation><numerusform>%n année.</numerusform><numerusform>%n années.</numerusform><numerusform>%n année(s).</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation><numerusform>%10%n jour %20</numerusform><numerusform>%10%n jours %20</numerusform><numerusform>%10%n jour(s) %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>Saisir le mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation>La vérification du mot de passe est requise pour changer votre adresse e-mail</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation>Une erreur est survenue lors de la mise à jour de vos informations personnelles.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>Ce serveur ne vous permet pas de mettre à jour vos informations personnelles.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>Mot de passe changé.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>Ce serveur ne vous permet pas de changer votre mot de passe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>Le nouveau mot de passe est trop court.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>L&apos;ancien mot de passe est incorrect.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>Avatar mis à jour.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Ce serveur ne vous permet pas de mettre à jour votre avatar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>Une erreur est survenue lors de la mise à jour de votre avatar.</translation>
     </message>
@@ -9486,152 +8302,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <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/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <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/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <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/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <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/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <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/dialogs/dlg_settings.cpp" line="901"/>
         <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/dialogs/dlg_settings.cpp" line="902"/>
         <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/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Temps de tampon pour les sauts en arrière via un raccourci :</translation>
     </message>
@@ -9639,241 +8440,86 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation>Joueurs connectés au serveur : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation>Joueurs dans ce salon : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation>Amis connectés : %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation>Joueurs sur liste noire connectés : %1 / %2</translation>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation>Incrémenter tous les marqueurs de la carte</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation>&amp;Dégager tous les permanents</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation>L&amp;ancer un dé...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation>&amp;Créer un jeton...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation>C&amp;réer un autre jeton</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation>C&amp;réer un jeton prédéfini</translation>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <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="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation>Mode de filtre (conjonctions AND/OR/NOT de filtres)</translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation>Sauvegarder le filtre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation>Sauvegarder tous les filtres actuellement appliqués dans un fichier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <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"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation>Mode : inclure</translation>
     </message>
@@ -9881,27 +8527,27 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
+        <translation>Filtrer par nom...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation>Charger depuis un deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation>Appliquer tous les noms de cartes du deck actuellement chargé comme filtres de nom exacts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation>Charger depuis le presse-papier...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation>Appliquer tous les noms de cartes du presse-papier comme filtres de nom exacts</translation>
     </message>
@@ -9909,7 +8555,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/client/ui/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 +8563,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation>Mode : inclure</translation>
     </message>
@@ -9937,37 +8583,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation>Mode : inclure</translation>
     </message>
@@ -9975,93 +8611,45 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation>Rechercher par nom de carte (ou expression de recherche)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation>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/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</source>
+        <translation>Sauvegarder et charger des filtres</translation>
     </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 type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</source>
+        <translation>Filtrer par nom exact de carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
+        <translation>Filtrer par sous-type de carte</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</source>
+        <translation>Filtrer par extension</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation>Taille de l&apos;exemple de main</translation>
     </message>
@@ -10069,25 +8657,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <source>Click and drag to change the sort order within the groups</source>
+        <translation>Cliquer et glisser pour changer l&apos;ordre dans les groupes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation>Recherchez la correspondance la plus proche dans la base de données (avec suggestions automatiques) et ajoutez l&apos;impression souhaitée au deck en appuyant sur Entrée</translation>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation>Configurez le mode de tri des cartes dans leurs groupes.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation>Interface de superposition</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation>Modifier l&apos;affichage des cartes dans les zones (i.e. superposées ou entièrement visibles).</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation>Interface plate</translation>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation>Stockage de deck</translation>
     </message>
@@ -10095,52 +8704,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation>Chemin de fichier</translation>
     </message>
@@ -10148,7 +8752,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation>Rechercher par chemin de fichier (ou expressions de recherche)</translation>
     </message>
@@ -10156,22 +8760,22 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation>Trier par ordre alphabétique (nom de deck)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation>Trier par ordre alphabétique (nom de fichier)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation>Trier par date de dernière modification</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation>Trier par date de dernier chargement</translation>
     </message>
@@ -10179,17 +8783,17 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation>Chargement de la base de données ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation>Recharger les fichiers chargés</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation>Paramètres du stockage visuel des decks</translation>
     </message>
@@ -10197,43 +8801,43 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>Quel avertissement voudriez-vous envoyer ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Censurer tous les messages de cet utilisateur dans toutes les salles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>Envoyer un avertissement au joueur pour mauvaise conduite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>Le nom d&apos;utilisateur du joueur à avertir ne peut pas être vide, merci d&apos;entrer un joueur à avertir.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>L&apos;avertissement à utiliser ne peut pas être vide, merci de sélectionner un avertissement valide à envoyer.</translation>
     </message>
@@ -10241,133 +8845,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <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/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation>Astuces</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation>Gérer les éditions</translation>
     </message>
@@ -10375,72 +8979,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>vue de la pile</translation>
     </message>
@@ -10448,7 +9052,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Français (French)</translation>
     </message>
@@ -10456,12 +9060,12 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation>Connecter au démarrage</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation>Débuguer dans journal</translation>
     </message>
@@ -10469,1058 +9073,991 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>Fenêtre principale</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>Éditeur de deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>Hall</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation>Marqueurs sur la carte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation>Marqueurs sur le joueur</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Force et Endurance</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Phases de jeu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>Zone de jeu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation>Déplacer la carte sélectionnée</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation>Déplacer la carte du dessus</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation>Déplacer la carte du dessous</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Gameplay</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation>Piocher</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation>Salon de discussion</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation>Fenêtre de jeu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation>Charger un deck depuis le presse-papier</translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation>Replays</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation>Vérifier les mises à jour des cartes…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation>Se connecter…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>Déconnecter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation>S&apos;enregistrer…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation>Paramètres…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation>Démarrer une partie locale…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation>Regarder un replay…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation>Analyser le deck (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation>Analyser le deck (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation>Effacer tous les filtres</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation>Effacer le filtre sélectionné</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation>Retirer la carte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation>Gérer les éditions…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation>Éditer les jetons personnalisés…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation>Exporter le deck (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation>Exporter le deck (decklist.xyz)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation>Ajouter une carte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation>Charger un deck…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Charger un deck depuis le presse-papier…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation>Éditer le deck dans le presse-papier, avec annotations</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation>Éditer le deck dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation>Nouveau deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Ouvrir le dossier d&apos;images personnalisées</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation>Imprimer le deck…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation>Supprimer la carte</translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation>Réinitialiser l&apos;interface</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>Sauvegarder le deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation>Sauvegarder le deck sous…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Copier le deck annoté</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation>Copier le deck, avec annotations (sans information d&apos;extension)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation>Copier le deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation>Copier le deck (sans information d&apos;extension)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation>Charger un deck local…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation>Charger un deck distant…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation>Marquer prêt à démarrer</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Verrouiller / déverrouiller la réserve</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation>Ajouter un marqueur vert</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation>Retirer un marqueur vert</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation>Nombre de marqueurs verts…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation>Ajouter un marqueur rouge</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation>Retirer un marqueur rouge</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation>Nombre de marqueurs rouges…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation>Gagner 1 point de vie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation>Montrer la barre de statut</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation>Annuler le chargement du deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation>Forcer le démarrage</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation>Ajouter un marqueur de carte (F)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation>Retirer un marqueur de carte (F)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation>Nombre de marqueurs de carte (F)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation>Ajouter un marqueur de carte (E)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation>Retirer un marqueur de carte (E)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation>Nombre de marqueurs de carte (E)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation>Ajouter un marqueur de carte (D)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation>Retirer un marqueur de carte (D)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation>Nombre de marqueurs de carte (D)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation>Ajouter un marqueur de carte (C)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation>Retirer un marqueur de carte (C)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation>Nombre de marqueurs de carte (C)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation>Ajouter un marqueur de carte (B)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation>Retirer un marqueur de carte (B)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation>Nombre de marqueurs de carte (B)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation>Ajouter un marqueur de carte (A)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation>Retirer un marqueur de carte (A)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation>Nombre de marqueurs de carte (A)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation>Perdre 1 point de vie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation>Nombre de points de vie…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation>Ajouter un marqueur blanc</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation>Retirer un marqueur blanc</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation>Nombre de marqueurs blancs…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation>Ajouter un marqueur bleu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation>Retirer un marqueur bleu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation>Nombre de marqueurs bleus…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation>Ajouter un marqueur noir</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation>Retirer un marqueur noir</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation>Nombre de marqueurs noirs…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation>Ajouter un marqueur incolore</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation>Retirer un marqueur incolore</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation>Nombre de marqueurs incolores…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation>Ajouter un autre marqueur</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation>Supprimer un autre marqueur</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation>Mettre d&apos;autres compteurs...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation>Incrémenter tous les marqueurs de la carte</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation>Augmenter la force (+1/+0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Diminuer la force (-1/-0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Endurance vers force (+1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Augmenter l&apos;endurance (+0/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Diminuer l&apos;endurance (-0/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Force vers endurance (-1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Augmenter la force et l&apos;endurance (+1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Diminuer la force et l&apos;endurance (-1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation>Changer la force et l&apos;endurance…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation>Réinitialiser la force et l&apos;endurance</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>Dégager</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>Entretien</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>Piocher</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation>Première phase principale</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation>Début de combat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>Attaquer</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>Bloquer</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>Blessures</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation>Fin de combat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation>Seconde phase principale</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation>Phase suivante</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation>Étape suivante avec action</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation>Tour suivant</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation>Cache la carte dans la fenêtre Révéler</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation>Engage / dégager la carte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation>Tout dégager</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation>Retourner la carte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation>Regarder la carte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation>Jouer la carte</translation>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation>Attacher la carte…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <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/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation>Cloner la carte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <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/settings/shortcuts_settings.h" line="515"/>
         <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/settings/shortcuts_settings.h" line="518"/>
         <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/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation>Annoter…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <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"/>
-        <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/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation>Dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation>Champ de bataille, face cachée</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation>Champ de bataille</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>Réserve</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation>Cartes du dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation>Cartes du dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation>Fermer la vue récente</translation>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <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/settings/shortcuts_settings.h" line="615"/>
         <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/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <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/settings/shortcuts_settings.h" line="624"/>
         <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/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation>Quitter la partie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>Concéder</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation>Lancer un dé…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <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/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <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/settings/shortcuts_settings.h" line="650"/>
         <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/settings/shortcuts_settings.h" line="653"/>
         <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/settings/shortcuts_settings.h" line="656"/>
         <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/settings/shortcuts_settings.h" line="659"/>
         <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"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <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/settings/shortcuts_settings.h" line="665"/>
         <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/settings/shortcuts_settings.h" line="668"/>
         <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/settings/shortcuts_settings.h" line="671"/>
         <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/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation>Effacer le chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation>Rafraichir</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation>Avance en avant</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <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/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation>Jouer/Pause</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation>Activer l&apos;avance rapide</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation>Accueil</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <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/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation>Stockage de deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation>Journaux</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_it.ts b/cockatrice/translations/cockatrice_it.ts
index 8356063d6..09941a2bd 100644
--- a/cockatrice/translations/cockatrice_it.ts
+++ b/cockatrice/translations/cockatrice_it.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>Imposta &amp;contatore...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Imposta contatore</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nuovo valore per il contatore &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Acquisisci set e numero (se disponibili)</translation>
     </message>
@@ -36,83 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation>Non ci sono carte da esportare nel tuo mazzo</translation>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
-        <translation>Aggiungi pannello di analisi</translation>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
+        <translation>Nessun mazzo da esportare è stato selezionato.</translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation>Aggiorna note</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation>Note amministratori su %1</translation>
     </message>
@@ -120,12 +118,12 @@ Controlla se la cartella è valida e prova ancora.</translation>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation>Mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -133,312 +131,251 @@ 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"/>
-        <source> seconds</source>
-        <translation> secondi</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>Impostazioni temi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Tema attuale:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation>Apri cartella temi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <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"/>
-        <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"/>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation>Impostazioni menù</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <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"/>
-        <source>Show game filter toolbar above list in room tab</source>
-        <translation>Mostra barra di filtro sopra la lista delle partite</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="663"/>
         <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/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <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"/>
-        <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>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
+        <translation>Sovrascrivi tutte le immagini delle carte con set personale (Comportamento pre-modifica Provider ID) [richiede riavvio]</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation> file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <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/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation>Segnalino %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <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/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <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/dialogs/dlg_settings.cpp" line="691"/>
         <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/dialogs/dlg_settings.cpp" line="692"/>
         <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/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Dimensione massima carattere per le informazioni mostrate sulle carte:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation>Apri mazzo nell&apos;editor dei mazzi</translation>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation>Tema</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation>Illustrazione di una carta casuale</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation>Illustrazione di un file background.cod</translation>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>Banna &amp;user name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>Banna indirizzo &amp;IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>Banna client I&amp;D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Tipo di ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>Ban &amp;permanente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>Ban &amp;temporaneo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Giorni:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Ore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minuti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Durata del ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Per favore inserisci la ragione del ban.
 Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Per favore inserisci la ragione del ban che sarà visibile alla persona bannata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Elimina tutti i messaggi di questo utente in tutte le stanze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annulla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Banna utente dal server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Seleziona un nome, un IP, un client ID o una combinazione di questi per impostare un ban.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Devi inserire un valore nel campo nome quando il ban per nome è selezionato.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Devi inserire un valore nel campo ip quando il ban per ip è selezionato.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Devi inserire un valore nel campo clientid quando il ban per clientid è selezionato.</translation>
     </message>
@@ -446,22 +383,22 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>Nessuna risposta ricevuta dal server degli aggiornamenti.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Risposta non valida ricevuta dal server degli aggiornamenti.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>Nessuna risposta ricevuta dal server degli aggiornamenti.</translation>
     </message>
@@ -469,32 +406,32 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Costo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>F/C</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Colore</translation>
     </message>
@@ -502,101 +439,96 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>AND</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OR</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>AND NOT</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OR NOT</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation>Nome (esatto)</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Colore</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Costo di mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>Valore di mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Rarità</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Forza</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Costituzione</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Fedeltà</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation>Sottotipo</translation>
     </message>
@@ -604,22 +536,22 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation>Immagine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation>Entrambi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation>Visualizza trasformazione</translation>
     </message>
@@ -627,22 +559,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation>Mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -650,294 +582,172 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation>Set:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation>Numero di collezione:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation>Carte correlate:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation>Carta sconosciuta:</translation>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation>Ri&amp;vela a...</translation>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Metti in</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation>&amp;Tutti i giocatori</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation>Guarda carte correlate</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation>Pedina: </translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation>Tutte le pedine</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation>&amp;Seleziona tutto</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Play</source>
-        <translation>&amp;Gioca</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation>&amp;Nascondi</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <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"/>
-        <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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
-        <source>T&amp;urn Over</source>
-        <extracomment>Turn face up/face down</extracomment>
-        <translation>Capovolgi</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="460"/>
-        <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"/>
-        <source>&amp;Clone</source>
-        <translation>&amp;Copia</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <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"/>
-        <source>Unattac&amp;h</source>
-        <translation>Tog&amp;li</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation>&amp;Disegna una freccia...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation>&amp;Imposta note...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation>Imposta &amp;segnalini (%1)...</translation>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Forza / Costituzione</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
-        <translation>Dimensioni carte</translation>
+        <translation>Dimensioni della carta</translation>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <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/card_zone.cpp" line="63"/>
         <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/card_zone.cpp" line="67"/>
         <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/card_zone.cpp" line="68"/>
         <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/card_zone.cpp" line="70"/>
         <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/card_zone.cpp" line="71"/>
         <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="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="81"/>
         <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/card_zone.cpp" line="81"/>
         <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/card_zone.cpp" line="83"/>
         <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/card_zone.cpp" line="83"/>
         <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/card_zone.cpp" line="87"/>
         <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="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <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/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>la zona personalizzata &apos;%2&apos; di %1</translation>
@@ -946,7 +756,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Errore di lettura alla riga %1 posizione %2:</translation>
     </message>
@@ -954,60 +764,15 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Errore di lettura alla riga %1 posizione %2:</translation>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation>&amp;Zone personalizzate</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation>Visualizza la zona personalizzata &apos;%1&apos;</translation>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation>Aggiungi pannello</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation>Rimuovi pannello</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation>Salva disposizione</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation>Carica disposizione</translation>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation>Database carte</translation>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Info carta</translation>
     </message>
@@ -1015,47 +780,47 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation>Cerca per nome della carta (o espressioni di ricerca)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation>Aggiungi al mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation>Aggiungi alla sideboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <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"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation>Mostra su EDHRec (Commander)</translation>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation>Mostra su EDHRec (Carta)</translation>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Aggiungi carta alla &amp;sideboard</translation>
     </message>
@@ -1063,97 +828,87 @@ 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"/>
-        <source>Loading Database...</source>
-        <translation>Caricamento database...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation>Seleziona stampa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation>Mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation>&amp;Nome mazzo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation>Impostazioni carta copertina/etichette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation>Visualizza menu di selezione carta copertina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation>Visualizza menu di selezione etichette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Commenti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation>Raggruppa per:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation>Formato:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation>Hash:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation>&amp;Aumenta il numero</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation>&amp;Diminuisci il numero</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation>&amp;Rimuovi carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation>Sposta carta in maindeck/sideboard</translation>
     </message>
@@ -1161,17 +916,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation>Elimina filtro</translation>
     </message>
@@ -1179,114 +934,109 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation>&amp;Editor dei mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation>&amp;Nuovo mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation>&amp;Carica mazzo...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation>Carica mazzo recente...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation>Svuota</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation>&amp;Salva mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation>Salva mazzo &amp;con nome...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Carica mazzo dagli app&amp;unti...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation>Modifica mazzo negli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation>Con annotazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation>Senza annotazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation>Salva il mazzo negli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation>Con annotazioni (senza info set)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation>Senza annotazioni (senza info set)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation>Stam&amp;pa mazzo...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation>Carica mazzo dal servizio online...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation>&amp;Invia mazzo al servizio online</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation>Crea una decklist (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation>Crea una decklist (decklist.xyz)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation>Analizza mazzo (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation>Analizza mazzo (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation>&amp;Chiudi</translation>
     </message>
@@ -1294,7 +1044,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation>Selettore di stampa</translation>
     </message>
@@ -1302,227 +1052,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>Fatto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation>Modifica indirizzo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <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/dialogs/dlg_settings.cpp" line="1219"/>
         <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/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <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/dialogs/dlg_settings.cpp" line="1224"/>
         <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/dialogs/dlg_settings.cpp" line="1226"/>
         <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/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation>Giorno/i</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>Aggiornando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <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/dialogs/dlg_settings.cpp" line="1205"/>
         <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/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>Spoiler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <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/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation>Indirizzo spoiler:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>Ultima modifica</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <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/dialogs/dlg_settings.cpp" line="1216"/>
         <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/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>Cache in memoria per immagini non attualmente su schermo</translation>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation>Annulla</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation>Ripeti</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation>Annulla/Ripeti Storico</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation>Clicca su una riga per ritornare a quel punto nello storico delle modifiche.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation>[ripeti]</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation>[annulla]</translation>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation>Quantità</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>Numero</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Carta</translation>
     </message>
@@ -1530,12 +1247,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation>Tutti i file (*.*)</translation>
     </message>
@@ -1543,17 +1260,17 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation>Modalità: Corrispondenza esatta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation>Modalità: Include</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation>Filtraggio identità di colore (utilizzabile con connettivi logici AND/OR/NOT)</translation>
     </message>
@@ -1561,7 +1278,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation>Imposta etichette...</translation>
     </message>
@@ -1569,62 +1286,62 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation>Gestore etichette del mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>Gestisci le etichette del mazzo. Assegna o rimuovi etichette, oppure creane di nuove.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Aggiungi una nuova etichetta (Es.: Aggro️)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation>Aggiungi etichetta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation>Filtra etichette...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation>Conferma</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation>Modifica etichette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation>Input non valido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation>Il nome dell&apos;etichetta non può essere vuoto!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation>Duplica Etichetta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation>Questa etichetta esiste già.</translation>
     </message>
@@ -1632,166 +1349,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation>Eliminazione non riuscita</translation>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation>Rinominato mazzo in &quot;%1&quot; da &quot;%2&quot;</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation>Commenti aggiornati (prima %1 caratteri, ora %2 caratteri)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation>Impostata carta copertina a %1 (%2)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation>Etichette modificate</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation>Formato impostato a %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation>Aggiunto (%1): %2 (%3) %4</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation>Spostato in %1 1 × &quot;%2&quot; (%3)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation>Rimosso &quot;%1&quot; (tutte le copie)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <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"/>
-        <source>Added</source>
-        <translation>Aggiunto</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation>Rimosso</translation>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>La risposta del server non può essere analizzata.</translation>
     </message>
@@ -1815,59 +1474,55 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
-        <translation>Carica dal sito...</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation>Deseleziona mazzo</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Ready to start</source>
         <translation>Pronto ad iniziare</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation>Forza avvio</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation>Sideboard sbloccata</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -1875,12 +1530,12 @@ Ciò espellerà dalla partita tutti i giocatori che non sono pronti.</translatio
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation>Conversione formato mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
@@ -1889,7 +1544,7 @@ Le etichette possono essere aggiunte solo a mazzi in formato .cod.
 Vuoi convertire il mazzo al formato .cod?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation>Ricorda e applica automaticamente la scelta in futuro</translation>
     </message>
@@ -1897,148 +1552,148 @@ Vuoi convertire il mazzo al formato .cod?</translation>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Scaricamento...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Host Conosciuti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation>Elimina il server salvato attualmente selezionato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Aggiorna la lista dei server con server pubblici</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Nuovo indirizzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome giocatore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Salva password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>Connetti a&amp;utomaticamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Connetti automaticamente all&apos;ultimo server utilizzato all&apos;avvio di Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>Se hai problemi a connetterti o registrarti contatta lo staff del server per aiuto!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Sito web</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Resetta Password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation>Hai dimenticato la password?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Connetti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>Contatto server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Connetti al server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>URL Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>Numero porta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>Nome univoco del server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Avviso di connessione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>È necessario impostare un nome per il nuovo profilo di connessione.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Problema di connessione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Il nome del giocatore non può essere vuoto.</translation>
     </message>
@@ -2046,122 +1701,112 @@ Vuoi convertire il mazzo al formato .cod?</translation>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Ricorda impostazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Descrizione:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>G&amp;iocatori:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>Generali</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Formato di gioco</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Solo gli &amp;amici possono entrare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Solo &amp;utenti registrati possono entrare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Restrizioni d&apos;ingresso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>&amp;Gli spettatori possono osservare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Gli spettatori &amp;necessitano di password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Gli spettatori possono &amp;chattare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Gli spettatori vedono le mani</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>Crea partita come spettatore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Spettatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation>Punti vita iniziali:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation>Apri mazzi nella lobby</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation>Crea partita come arbitro</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation>Configurazione partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>Pulisci</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Crea partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Informazioni partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Errore del server.</translation>
     </message>
@@ -2169,97 +1814,97 @@ Vuoi convertire il mazzo al formato .cod?</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Pedina</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;olore:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>bianco</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>blu</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>nero</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>rosso</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolore</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>incolore</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/C:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Note:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Elimina la pedina quando lascia il campo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation>Crea a faccia in giù (nasconde solo il nome)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Dati pedina</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Mostra &amp;tutte le pedine</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Mostra pedine di questo &amp;mazzo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Scegli pedina dalla lista</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Crea pedina</translation>
     </message>
@@ -2267,53 +1912,53 @@ Vuoi convertire il mazzo al formato .cod?</translation>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation>Modifica etichette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation>Conferma</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation>Scrivi il nome dell&apos;etichetta e premi Invio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation>✖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation>Input non valido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation>Il nome dell&apos;etichetta non può essere vuoto!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation>Duplica Etichetta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation>Questa etichetta esiste già.</translation>
     </message>
@@ -2321,40 +1966,40 @@ Vuoi convertire il mazzo al formato .cod?</translation>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Nessuna immagine selezionata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Per cambiare il tuo avatar, scegli una nuova immagine.
 Per rimuovere il tuo avatar attuale, conferma senza scegliere una nuova immagine.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Cerca...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Cambia avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Apri immagine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>File immagine (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Immagine selezionata non valida.</translation>
     </message>
@@ -2362,17 +2007,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation>Lista del mazzo non valida.</translation>
     </message>
@@ -2380,38 +2025,38 @@ Per rimuovere il tuo avatar attuale, conferma senza scegliere una nuova immagine
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Vecchia password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nuova password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Conferma nuova password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Cambia password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>La nuova password è troppo corta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Le password non coincidono.</translation>
     </message>
@@ -2419,123 +2064,123 @@ Per rimuovere il tuo avatar attuale, conferma senza scegliere una nuova immagine
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;olore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>bianco</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>blu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>nero</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>rosso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>multicolore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>incolore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/C:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Note:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Dati pedina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Aggiungi pedina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Rimuovi pedina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>Modifica pedine personalizzate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Inserisci il nome della pedina:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>Il nome scelto è in conflitto con una carta o pedina esistente.
-Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;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>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Stato:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Non definito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Nome reale:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Modifica profilo utente</translation>
     </message>
@@ -2543,143 +2188,137 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Gestisci
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>nessun limite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5 minuti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10 minuti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30 minuti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1 ora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2 ore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>Nascondi partite &apos;solo per amici&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation>Nascondi partite al completo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation>Nascondi partite iniziate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation>Nascondi partite protette da password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>Nascondi partite degli utenti ignorati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation>Nascondi partite non create dagli amici</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation>Nascondi partite con liste di mazzo rivelate</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Più nuovo di:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Descrizione partita:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>Nome &amp;creatore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>Tipi di &amp;partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>Minimo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>Massimo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Numero di giocatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Restrizioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Mostra le partite solo se &amp;gli spettatori possono guardare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Mostra partite protette da password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Mostra le partite solo se gli spettatori possono guardare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Mostra le partite solo se gli spettatori possono guardare le mani</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation>Spettatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Filtro partite</translation>
     </message>
@@ -2687,52 +2326,52 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Gestisci
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation>Avviso di reimpostazione della password di verifica della sfida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Si è verificato un problema. Prova a richiedere di nuovo una nuova password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation>Inserisci le informazioni del server e dell&apos;account per cui desideri richiedere una nuova password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome giocatore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation>Reimposta password sfida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation>Errore di reimpostazione della password di verifica della sfida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>L&apos;indirizzo email non può essere vuoto.</translation>
     </message>
@@ -2740,37 +2379,37 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Gestisci
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation>Inserisci le informazioni del server per il quale desideri richiedere una nuova password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome giocatore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation>Richiesta di reimpostazione della password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation>Errore di ripristino della password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Il nome del giocatore non può essere vuoto.</translation>
     </message>
@@ -2778,86 +2417,86 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Gestisci
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation>Avviso di reimpostazione della password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Si è verificato un problema. Prova a richiedere di nuovo una nuova password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation>Inserisci il token ricevuto e la nuova password per impostare la tua nuova password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome giocatore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Token:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Nuova password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Resetta la password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Il nome del giocatore non può essere vuoto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation>Errore di ripristino della password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>Il token non può essere vuoto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>La nuova password non può essere vuota.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation>La tua password è troppo corta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>Le password non coincidono.</translation>
     </message>
@@ -2865,7 +2504,7 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Gestisci
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation>Carica mazzo</translation>
     </message>
@@ -2873,154 +2512,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Lista del mazzo non valida.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation>Incolla il link a una lista di mazzo online per importarla.
-(Sono supportati Archidekt, Deckstats, Moxfield, e TappedOut).</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation>Carica Mazzo dal Sito</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation>Impossibile acquisire lista di mazzo da questo sito.
-(Sono supportati Archidekt, Deckstats, Moxfield, e TappedOut).</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation>Errore di rete: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation>Ricevuta lista di mazzo vuota.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation>Impossibile acquisire i dati del mazzo: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-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>L&apos;URL fornito non è riconosciuto come valido.
-Un URL valido assomiglia a uno di questi:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-nome-del-tuo-mazzo/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/nome-del-tuo-mazzo/</translation>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Carica mazzo</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation>Giocatori:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation>Generale</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation>Punti vita iniziali:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation>Configurazione partita</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation>Ricorda impostazioni</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation>Configurazione partita locale</translation>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation>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/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation>Filtro non valido</translation>
     </message>
@@ -3028,92 +2576,92 @@ https://tappedout.net/mtg-decks/nome-del-tuo-mazzo/</translation>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Inserisci le tue informazioni e le informazioni del server a cui desideri registrarti.
 La tua email verrà utilizzata per verificare il tuo account.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome giocatore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Password (conferma):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Email (conferma):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Stato:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Non definito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Nome reale:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Registrati sul server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Avviso Registrazione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>La tua password è troppo corta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Le password non combaciano, riprova.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Gli indirizzi email non combaciano, riprova.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Il nome del giocatore non può essere vuoto.</translation>
     </message>
@@ -3121,17 +2669,17 @@ La tua email verrà utilizzata per verificare il tuo account.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation>Numero di facce:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation>Numero di dadi:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation>Lancia dado</translation>
     </message>
@@ -3139,55 +2687,40 @@ La tua email verrà utilizzata per verificare il tuo account.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation>Carte non modificate:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation>Carte modificate:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation>Seleziona i set per abilitarli. Trascina per riordinarli e modificare la loro priorità. Le carte useranno la stampa del set abilitato con la priorità massima.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation>Elimina tutte le info sui set</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation>Imposta tutti come preferiti</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation>Stampe modificate massivamente.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation>Informazioni sulle stampe eliminate.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation>Imposta tutte le stampe come preferite.</translation>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3204,7 +2737,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3221,7 +2754,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2766,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3242,7 +2775,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3251,7 +2784,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3264,59 +2797,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Aspetto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>Interfaccia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation>Immagini carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Suoni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Scorciatoie</translation>
     </message>
@@ -3324,12 +2857,12 @@ Desideri modificare l&apos;impostazione della posizione del database?</translati
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation>Controllo aggiornamenti carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/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>
@@ -3338,27 +2871,27 @@ Seleziona la modalità di esecuzione dell&apos;aggiornamento.
 Potrai comunque cambiarla in seguito dalle impostazioni, nella scheda &apos;Generale&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation>Esegui in primo piano</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation>Esegui in background</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation>Esegui in background da ora in poi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation>Non eseguire e non chiedere più</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation>Non eseguire stavolta</translation>
     </message>
@@ -3366,17 +2899,17 @@ Potrai comunque cambiarla in seguito dalle impostazioni, nella scheda &apos;Gene
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>Prossimo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>Precedente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Suggerimento del giorno</translation>
     </message>
@@ -3384,40 +2917,40 @@ Potrai comunque cambiarla in seguito dalle impostazioni, nella scheda &apos;Gene
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Canale della versione corrente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Reinstalla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Annulla download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Apri pagina di download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation>Verifica la presenza di aggiornamenti del client</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>Cockatrice non è stato creato con il supporto SSL, quindi gli aggiornamenti non possono essere scaricati automaticamente!
@@ -3425,126 +2958,130 @@ Please visit the download page to update manually.</source>
 Per favore, visitate la pagina di download per aggiornare manualmente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation>Download dell&apos;aggiornamento: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Ricerca aggiornamenti...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Controllo aggiornamenti terminato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Nessun aggiornamento disponibile</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice è aggiornato!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>Hai già la versione più recente nel canale della versione scelto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Versione corrente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Canale della versione selezionato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Aggiornamento disponibile</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Una nuova versione di Cockatrice è disponibile!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Nuova versione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>Data di rilascio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Changelog</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Vuoi aggiornare adesso?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation>Purtroppo l&apos;aggiornamento automatico non è riuscito a trovare una versione compatibile. 
 Dovrai scaricare la nuova versione manualmente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation>Per favore, controlla la &lt;a href=&quot;%1&quot;&gt;pagina delle release&lt;/a&gt; sul nostro Github e scarica la versione giusta per il tuo sistema.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Errore durante l&apos;aggiornamento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Errore durante il controllo degli aggiornamenti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Errore durante il download di un aggiornamento:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Installazione...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice non riesce ad aprire il file di installazione.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Prova ad aggiornare manualmente chiudendo Cockatrice ed eseguento il file di installazione.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>Percorso download</translation>
     </message>
@@ -3552,162 +3089,30 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Pulisci la cronologia al riavvio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation>Copia negli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Registro di debug</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation>Impostazioni probabilità di pescare</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation>Criterio:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation>Nome carta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation>Sottotipo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation>Valore di mana</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation>Precisione:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation>Almeno</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation>Esattamente</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation>Quantità (N):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation>Carte pescate (M):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation>carte</translation>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation>Probabilità di pescare</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation>Probabilità di pescare</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation>Nome carta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation>Quantità</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation>Probabilità (%)</translation>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <translation>In %1 mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation>%1% di %2 mazzi</translation>
     </message>
@@ -3715,47 +3120,47 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <translation>Card Hoarder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <translation>Card Kingdom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <translation>Card Market</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <translation>Face 2-Face</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <translation>Mana Pool</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <translation>MTG Stocks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <translation>Scg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <translation>Tcgl</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation>Tcgplayer</translation>
     </message>
@@ -3763,44 +3168,38 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation>Sinergia %1%</translation>
     </message>
 </context>
 <context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation>Carte decisive</translation>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <source>Combos</source>
+        <translation>Combo</translation>
     </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <source>Average Deck</source>
+        <translation>Mazzo medio</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation>Game Changer</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
         <source>Budget</source>
         <translation>Budget</translation>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
-        <source>Combos</source>
-        <translation>Combo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
-        <source>Average Deck</source>
-        <translation>Mazzo medio</translation>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation>Sale:</translation>
     </message>
@@ -3808,7 +3207,7 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>Scrivi il filtro qui</translation>
     </message>
@@ -3816,325 +3215,244 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation>Conferma eliminazione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation>Vuoi davvero eliminare il filtro &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation>Eliminazione non riuscita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation>Impossibile eliminare il filtro &apos;%1&apos;.</translation>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation>espulso da proprietario del gioco o moderatore</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation>il giocatore ha lasciato la partita</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation>il giocatore si è disconnesso dal server</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation>ragione sconosciuta</translation>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Si prega di entrare prima in una stanza adeguata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Password errata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Spettatori non ammessi in questa partita.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>La partita è piena.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>Questa partita non esiste più.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Questa partita è solo per utenti registrati.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Questa stanza è aperta solo agli amici del suo creatore.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Sei stato ingnorato dal creatore di questa partita.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation>Entra nella partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation>Osserva partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation>Informazioni partita</translation>
     </message>
     <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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Entra nella partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>Si prega di entrare prima nella rispettiva stanza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtra partite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>E&amp;limina filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>Cr&amp;ea</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>&amp;Entra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation>Unisciti come arbitro</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>Entra c&amp;ome spettatore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation>Unisciti come arbitro spettatore</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation>Partite mostrate: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Partite</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation>Tutti i tipi</translation>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 giorno</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 ora</numerusform><numerusform>%1%2 ore</numerusform><numerusform>%1%2 ora(e)</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation>nuovo</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>solo amici</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>solo utenti registrati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation>Apri impostazioni</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>può chattare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>vede mani</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>può vedere mani</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>non ammessi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Stanza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Età</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Creatore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Restrizioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Giocatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Spettatori</translation>
     </message>
@@ -4142,609 +3460,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cimitero</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation>&amp;Guarda il cimitero</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;All players</source>
-        <translation>&amp;Tutti i giocatori</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Mano</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Esilio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation>Rivela carta casuale a...</translation>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Mano</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation>&amp;Vedi mano</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation>Ordina mano per...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation>Valore di mana</translation>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cimitero</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Esilio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <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"/>
-        <source>All players</source>
-        <translation>Tutti i giocatori</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation>Rivela carta c&amp;asuale a...</translation>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation>Crea un nuovo mazzo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation>Esplora i mazzi</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <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"/>
-        <source>Browse EDHRec</source>
-        <translation>Esplora EDHRec</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation>Esplora Archidekt</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation>Guarda i replay</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation>Esci</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation>Connessione in corso...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation>Connetti</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation>Gioca</translation>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation>&amp;Grimorio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation>&amp;Guarda il grimorio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Lend library to...</source>
-        <translation>Presta il grimorio a...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
-        <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"/>
-        <source>&amp;Top of library...</source>
-        <translation>&amp;In cima al grimorio...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</source>
-        <translation>&amp;In fondo al grimorio...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Draw card</source>
-        <translation>&amp;Pesca una carta</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle</source>
-        <translation>Mescola</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;All players</source>
-        <translation>&amp;Tutti i giocatori</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation>Rivela le carte in cima al grimorio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation>Numero di carte: (max. %1)</translation>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>Il server ha raggiunto la sua massima capacità di utenti, riprova più tardi.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Ci sono troppe connessioni contemporanee dal tuo indirizzo.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Bannato dal moderatore</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Fine prevista: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>Questo ban dura a tempo indeterminato.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Spegnimento del server in programma.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Nome utente non valido.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>Sei stato disconnesso: ti sei connesso da un&apos;altra postazione.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Connessione chiusa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>Hai perso la connessione con il server.
 Ragione: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4757,574 +3671,584 @@ Tutti le partite saranno perse.
 Ragione dello spegnimento: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Spegnimento del server in programma</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Successo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Registrazione accettata.
 Login in corso.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Attivazione account accettata.
 Login in corso.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Numero di giocatori</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Inserisci il numero di giocatori:</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Giocatore %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Carica replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>Info su Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Sito di Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Manager del progetto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>Manager precedenti:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>Sviluppatori:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>I nostri sviluppatori</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>Aiutaci nello sviluppo!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Traduttori:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>I nostri traduttori</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>Aiutaci nella traduzione!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Supporto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Segnala un problema</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Risoluzione dei problemi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Timeout del server</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Login fallito</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>La tua versione del programma non supporta funzionalità richieste dal server, aggiorna il programma e riprova.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>Per aggiornare la tua versione di Cockatrice, vai su &apos;Aiuto -&gt; Controlla aggiornamenti client&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Nome utente o password non validi. Ricontrolla i tuoi dati di accesso e riprova.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Sei già loggato in un&apos;altra sessione con questo username.
 Chiudi prima quella sessione e riprova a loggare.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Sei bannato fino a %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Sei stato bannato per tempo indeterminato.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>Questo server richiede la registrazione degli utenti. Vuoi registrarti adesso?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation>Il server richiede un client ID. Il tuo programma non ha generato un client ID.
 Riprova dopo aver chiuso e riaperto il programma.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>Si è verificato un errore, riprova dopo aver chiuso e riaperto il programma.
 Se l&apos;errore persiste, aggiorna il programma all&apos;ultima versione e se necessario chiedi assistenza agli sviluppatori.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Attivazione account</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>Il tuo account non è ancora stato attivato.
 Per attivarlo inserisci il codice di attivazione ricevuto tramite email,</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>Server pieno</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Errore di login sconosciuto: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 Solitamente questo significa che stai usando una vecchia versione del programma, e il server ha inviato un messaggio che il tuo programma non è in grado di comprendere.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>Il nome utente deve seguire queste regole:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>essere lungo %1 - %2 caratteri</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>%1 può contenere caratteri minuscoli</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>NON</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>%1 può contenere caratteri maiuscoli</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>%1 può contenere numeri</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>può contenere la punteggiatura: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>il primo carattere %1 può essere punteggiatura</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation>non usare un linguaggio inaccettabile, come specificato nelle regole del server:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>non può contenere le seguenti parole: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>non può corrispondere alle seguenti espressioni: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>Puoi usare solo i caratteri A-Z, a-z, 0-9, _, ., e - nel tuo nome utente.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>Registrazione negata</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>La registrazione è disabilitata su questo server</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>Esiste già un account con lo stesso nome utente.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>E&apos; obbligatorio specificare un indirizzo email valido per la registrazione.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>Sembra che tu stia tentando di registrare un nuovo account su questo server ma hai già un account registrato sull&apos;indirizzo email fornito. Questo server restringe il numero di account un utente più avere per indirizzo. Per favore contatta l&apos;amministratore del server per ulteriore assistenza o per ottenere le tue credenziali di accesso.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>Password troppo corta.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>La registrazione è fallita a causa di un problema tecnico sul server.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation>La connessione al server è stata interrotta.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>Errore di registrazione sconosciuto: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>Attivazione account fallita</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Errore nella connessione: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>Stai cercando di connetterti a un server obsoleto. Declassa la versione di Cockatrice per farlo funzionare o connetti ad un altro server.
 La tua versione è la %1, la versione remota è la %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>La tua versione di Cockatrice è obsoleta. Aggiorna la tua versione di Cockatrice.
 La tua versione è la %1, la versione online è la %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Connessione a %1...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>Registrazione su %1 come %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Disconnesso</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Connesso, login in corso su %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation>Richiesta recupero password su %1 come %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Connetti...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Disconnetti</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>Inizia partita in &amp;locale...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Guarda replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Schermo intero</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Registrati sul server...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation>Recupera &amp;password...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Impostazioni...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>A&amp;zioni</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;Database carte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <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"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Modifica pedine personalizzate</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>Apri cartella immagini personalizzate</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>Apri cartella set personalizzati</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>Aggiungi set di carte personalizzato</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation>Ricarica database carte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation>&amp;Schede</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Info su Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>Suggerimento del giorno</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>Controlla aggiornamenti client</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation>Controlla aggiornamenti carte...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation>Controlla aggiornamenti carte in background</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation>Mostra barra di stato</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation>Vedi Registro di &amp;debug</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation>Apri cartella impostazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation>Mostra/Nascondi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>Nuova versione</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice installata</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>Database carte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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 +4257,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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Apri impostazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <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/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5368,84 +4292,84 @@ Codici dei set: %1
 Desideri attivarli?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>Vedi set</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Benvenuto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Informazione</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <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/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <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/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,863 +4380,669 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1393"/>
         <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/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation>Reimposta Password</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <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>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation>Configurazione Base di mana</translation>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation>Base di mana</translation>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation>Raggruppa per:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation>tipo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation>colore</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation>sottotipo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation>forza</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation>costituzione</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation>Filtri (opzionali):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation>Mostra il grafico principale</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation>Mostra i grafici per categorie</translation>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation>Curva di mana</translation>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation>Modalità di visualizzazione:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation>A torta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation>A barre</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation>A barra combinata</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation>Filtri per colore (opzionali):</translation>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation>Simboli di mana</translation>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation>Modalità di visualizzazione principale:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation>A torta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation>A barre</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation>Colori:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation>Mostra grafici per colore</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation>%1 simboli (%2 carte)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation>%1 mana (%2 carte)</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation>Produzione + Devozione di mana</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation>Impostazioni distribuzione di mana</translation>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 ha annullato la concessione della partita.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>una carta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation>in fondo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation>in cima</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation>La partita è iniziata.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation>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/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation>invertito</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation>normale</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>Testa</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>Croce</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 annulla la sua ultima pescata (%2).</translation>
     </message>
@@ -6320,206 +5050,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <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/dialogs/dlg_settings.cpp" line="1467"/>
         <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/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation>Modifica Messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation>Rimuovi Messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Messaggio:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation>Modifica messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation>Impostazioni chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <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/dialogs/dlg_settings.cpp" line="1451"/>
         <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/dialogs/dlg_settings.cpp" line="1452"/>
         <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/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <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/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <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/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separare le parole con uno spazio; solo caratteri alfanumerici</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation>&amp;Metti in</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation>&amp;In cima al grimorio in ordine casuale</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <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"/>
-        <source>&amp;Bottom of library in random order</source>
-        <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"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Mano</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cimitero</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Esilio</translation>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation>Valore di Mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation>Colore</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation>Fedeltà</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation>Tipo principale</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation>Costo di mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation>F/C</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation>Lato</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation>Disposizione</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation>Identità di colore</translation>
     </message>
@@ -6527,17 +5214,17 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation>Carte da sovrapporre:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation>Percentuale di sovrapposizione:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation>Direzione di sovrapposizione:</translation>
     </message>
@@ -6545,62 +5232,62 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation>Fase sconosciuta</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation>STAP</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation>Mantenimento</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation>Acquisizione</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation>Prima fase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation>Inizio combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation>Dichiarazione attaccanti</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation>Dichiarazione bloccanti</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation>Danno da combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation>Fine combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation>Seconda fase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation>Finale / Cancellazione</translation>
     </message>
@@ -6608,57 +5295,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Sottofase finale</translation>
     </message>
@@ -6666,213 +5353,703 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>it</translation>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation>Guarda le carte in cima al grimorio</translation>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>Rivela le prime carte del 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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <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"/>
-        <source>View bottom cards of library</source>
-        <translation>Guarda le carte in fondo al grimorio</translation>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>&amp;Guarda il cimitero</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
-        <source>Shuffle top cards of library</source>
-        <translation>Mescola le carte in cima al grimorio</translation>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>&amp;Guarda la zona di esilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
-        <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"/>
-        <source>Draw hand</source>
-        <translation>Pesca mano</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <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"/>
-        <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>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Number:</source>
-        <translation>Numero:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <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"/>
-        <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"/>
-        <source>(max. %1)</source>
-        <translation>(max %1)</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change power/toughness</source>
-        <translation>Cambia forza/costituzione</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change stats to:</source>
-        <translation>Cambia valori a:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
-        <source>Set annotation</source>
-        <translation>Imposta note</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
-        <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"/>
-        <source>Set counters</source>
-        <translation>Imposta i segnalini</translation>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/player.cpp" line="769"/>
         <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/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;Cimitero</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;Esilio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>&amp;Sposta mano in...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>&amp;Cima al grimorio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>&amp;Fondo al grimorio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>&amp;Muovi cimitero in...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;Mano</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>&amp;Muovi esilio in...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>&amp;Guarda il grimorio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation>&amp;Vedi mano</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <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/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>Rive&amp;la grimorio a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>Rivela &amp;sempre la prima carta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>&amp;Guarda la sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;Pesca una carta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>P&amp;esca carte...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>&amp;Annulla l&apos;ultima pescata</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>Mu&amp;lliga</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>Gioca la prima carta a faccia in giù</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <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/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation>E&amp;silia la prima carta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>Metti le prime carte nel &amp;cimitero...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>&amp;Esilia le prime carte...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>Metti la prima carta in &amp;fondo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation>Guarda le carte in fondo al grimorio...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation>Presta il grimorio a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation>Mescola</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation>Metti le carte in cima alla pila fino a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation>Mescola le carte in cima...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation>Mescola le carte in fondo...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>&amp;Rivela mano a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Rivela carta c&amp;asuale a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation>Rivela carta casuale a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>&amp;Sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Grimorio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
         <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 type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation>&amp;Zone personalizzate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation>Visualizza la zona personalizzata &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>&amp;STAPpa tutti i permanenti</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>L&amp;ancia un dado...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>&amp;Crea una pedina...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>C&amp;rea un&apos;altra pedina</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>Cr&amp;ea pedina predefinita</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation>Segnalini delle ca&amp;rte</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>&amp;Tutti i giocatori</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>P&amp;arla</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation>Seleziona tutto</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation>Seleziona fila</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation>Seleziona colonna</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Gioca</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>&amp;Nascondi</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>Gioca a &amp;faccia in giù</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation>&amp;TAPpa/STAPpa</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Blocca/Sblocca &amp;STAP normale</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation>Capovolgi</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>&amp;Sbircia la faccia della carta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>&amp;Copia</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>Asse&amp;gna alla carta...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>Tog&amp;li</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>&amp;Disegna una freccia...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>&amp;Aumenta forza</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>&amp;Diminuisci forza</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>A&amp;umenta costituzione</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>D&amp;iminuisci costituzione</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>Au&amp;menta forza e costituzione</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>Dim&amp;inuisci forza e costituzione</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation>Aumenta forza e diminuisci costituzione</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation>Diminuisci forza e aumenta costituzione</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>Imposta &amp;forza e costituzione...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation>Resetta &amp;forza e costituzione</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>&amp;Imposta note...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>&amp;Aggiungi segnalino (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;Rimuovi segnalino (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>Imposta &amp;segnalini (%1)...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation>&amp;In cima al mazzo in ordine casuale</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation>Posizione X dalla cima del grimorio...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation>In &amp;fondo al grimorio in ordine casuale</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>Guarda le carte in cima al grimorio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <source>View bottom cards of library</source>
+        <translation>Guarda le carte in fondo al grimorio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <source>Shuffle top cards of library</source>
+        <translation>Mescola le carte in cima al grimorio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1276"/>
+        <source>Shuffle bottom cards of library</source>
+        <translation>Mescola le carte in fondo al grimorio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <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.cpp" line="3188"/>
+        <source>(max. %1)</source>
+        <translation>(max %1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation>Pesca mano</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <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.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>Pesca carte</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>Numero:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>Metti le prime carte nel cimitero</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation>Rivela le &amp;prime carte a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation>&amp;In cima al grimorio...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation>&amp;In fondo al grimorio...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation>&amp;Vedi sempre la prima carta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <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/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation>&amp;Gioca la prima carta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation>&amp;Pesca l&apos;ultima carta dal fondo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation>P&amp;esca carte dal fondo...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation>&amp;Gioca l&apos;ultima carta dal fondo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation>Gioca l&apos;ultima carta dal fondo a &amp;faccia in giù</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation>Metti l&apos;ultima carta nel cimitero</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <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/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation>Metti le ultime carte nel cimitero...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation>Metti le ultime carte in esilio...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation>Metti l&apos;ultima carta in cima</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation>Carte selezionate</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>Esilia le prime carte</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation>Metti le ultime care nel cimitero</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation>Metti le ultime carte in esilio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation>Pesca le ultime carte</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <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.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation>Crea pedine</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <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.cpp" line="3534"/>
+        <source>Change power/toughness</source>
+        <translation>Cambia forza/costituzione</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change stats to:</source>
+        <translation>Cambia valori a:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3653"/>
+        <source>Set annotation</source>
+        <translation>Imposta nota</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3654"/>
+        <source>Please enter the new annotation:</source>
+        <translation>Inserisci le nuove note:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Set counters</source>
+        <translation>Imposta i segnalini</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation>Ri&amp;vela a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation>Guarda carte correlate</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>Pedina: </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>Tutte le pedine</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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 type="unfinished"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</source>
+        <translation>&lt;b&gt;Attenzione:&lt;/b&gt; Stai utilizzando la cartella delle immagini personalizzate, che causa dei bug se usato insieme al selettore di stampa in questa versione di Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation>Mostra carte correlate</translation>
     </message>
@@ -6880,7 +6057,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation>Cerca per codice o nome del set</translation>
     </message>
@@ -6888,17 +6065,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation>Carta precedente nel mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation>Selezione massiva</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation>Carta successiva nel mazzo</translation>
     </message>
@@ -6906,132 +6083,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation>Alfabetico</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation>Preferenza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <translation>Data di rilascio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="36"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation>Ascendente</translation>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation>Forza / costituzione</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation>&amp;Aumenta forza</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation>&amp;Diminuisci forza</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation>A&amp;umenta costituzione</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <translation>D&amp;iminuisci costituzione</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
-        <source>In&amp;crease power and toughness</source>
-        <translation>Au&amp;menta forza e costituzione</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation>Dimi&amp;nuisci forza e costituzione</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation>Aumenta forza e diminuisci costituzione</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation>Diminuisci forza e aumenta costituzione</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <translation>Imposta &amp;forza e costituzione...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
-        <source>Reset p&amp;ower and toughness</source>
-        <translation>Resetta f&amp;orza e costituzione</translation>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>Servizi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>Nascondi %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>Nascondi altre</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>Mostra tutte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>Preferenze...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>Esci da %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>Informazioni su %1</translation>
     </message>
@@ -7039,162 +6150,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Database delle carte di Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>Tutti i file (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Replay di Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation>Maindeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation>Sovrascrivere il file esistente?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation>Conferma</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation>Salva tutto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation>&amp;Sì</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation>Sì a &amp;tutto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation>N&amp;o a tutto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation>Interrompi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation>Riprova</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation>Ignora</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation>Abbandona</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation>Applica</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation>Resetta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation>Ripristina predefiniti</translation>
     </message>
@@ -7202,17 +6286,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Tempo di upload</translation>
     </message>
@@ -7220,149 +6304,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>Giocatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>Tieni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>Inizio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>Durata (sec)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Esilio</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Mano</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Cimitero</translation>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Stanze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>E&amp;ntra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Stanza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>Permessi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Giocatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</source>
         <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SequenceEdit</name>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation>Scegli un&apos;azione dalla tabella</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation>Premi il tasto/combinazione di tasti che vuoi impostare per questa azione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation>Tasto non valido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation>Scorciatoia già utilizzata da:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation>Pulisci</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation>Ripristina predefinito</translation>
     </message>
@@ -7370,27 +6408,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>Abilitato</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>Tipo set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>Codice set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Nome esteso</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>Data di rilascio</translation>
     </message>
@@ -7398,53 +6436,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation>Sezione:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation>Azione:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation>Scorciatoia:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <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/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation>Cerca per nome della scorciatoia</translation>
     </message>
@@ -7452,12 +6490,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Azione</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Scorciatoia</translation>
     </message>
@@ -7465,14 +6503,14 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Il file di configurazione conteneva scorciatoie non valide.
 Controlla le impostazioni!</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Le seguenti scorciatoie sono state reimpostate al valore predefinito:
@@ -7482,58 +6520,45 @@ Controlla le impostazioni!</translation>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>&amp;Ragione dello spegnimento:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;Tempo allo spegnimento (minuti):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>Spegni il server</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation>&amp;Sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation>&amp;Guarda la sideboard</translation>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <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/dialogs/dlg_settings.cpp" line="1544"/>
         <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/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation>Impostazioni suoni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>Volume</translation>
     </message>
@@ -7541,48 +6566,48 @@ Controlla le impostazioni!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation>La stagione degli spoiler è finita</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Cancellando spoiler.xml. Per favore avviare Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation>Download degli spoiler fallito</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation>Connessione internet assente</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation>Gli spoiler sono aggiornati</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation>Nessun nuovo spoiler aggiunto</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation>Gli spoiler sono stati aggiornati!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation>Ultima modifica:</translation>
     </message>
@@ -7590,27 +6615,27 @@ Controlla le impostazioni!</translation>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation>Predefinito</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>Nessuna risposta ricevuta dal server degli aggiornamenti di versione.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Risposta non valida ricevuta dal server degli aggiornamenti di versione.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>Nessuna risposta ricevuta dal server dei tag di aggiornamento.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Risposta non valida ricevuta dal server dei tag di aggiornamento.</translation>
     </message>
@@ -7618,17 +6643,17 @@ Controlla le impostazioni!</translation>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation>Aggiungi a Lista amici</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation>Aggiungi a Lista ignorati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
@@ -7636,289 +6661,166 @@ Controlla le impostazioni!</translation>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>Amministrazione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>Aggiorna &amp;messaggio del server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;Spegni il server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>&amp;Ricarica configurazione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Funzioni da amministratore del server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation>Funzioni da moderatore del server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation>Riproduci ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation>Concedi accesso alla riproduzione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation>Nome utente da attivare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation>Forza attivazione utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>&amp;Sblocca funzioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>&amp;Blocca funzioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation>Successo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation>Accesso replay concesso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation>Impossibile concedere accesso alla riproduzione. ID riproduzione non valido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation>Impossibile concedere accesso alla riproduzione. Errore interno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation>Utente attivato con successo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation>Impossibile attivare utente. Nome utente non valido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation>Impossibile attivare utente. L&apos;utente è già attivo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation>Impossibile attivare utente. Errore interno</translation>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation>Decrescente</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"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation>Crescente</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation>Cerca</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"/>
-        <source>Formats</source>
-        <translation>Formati</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation>Archidekt: </translation>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <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/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>Mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>Filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation>Database carte</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation>Stampa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>Separata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <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/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Mazzo: %1</translation>
     </message>
@@ -7926,55 +6828,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation>Analisi mazzo</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation>Reimposta disposizione</translation>
     </message>
@@ -7982,22 +6897,22 @@ Controlla le impostazioni!</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <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"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <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"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation>Analisi mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation>Mano di esempio</translation>
     </message>
@@ -8005,138 +6920,138 @@ Controlla le impostazioni!</translation>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>File locali</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Mazzi su server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Apri nell&apos;editor dei mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation>Rinomina mazzo o cartella</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Upload mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Scarica mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>Nuova cartella</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation>Apri cartella mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation>Rinomina cartella locale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation>Rinomina file locale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation>Nuovo nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation>Rinomina non riuscita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation>File mazzo non valido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Inserisci il nome del mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>Questo mazzo non ha un nome. Per favore inserisci un nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Mazzo senza nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation>Impossibile caricare il mazzo sul server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>Elimina file locali</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Vuoi davvero eliminare i file selezionati?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>Nome della nuova cartella:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation>Archivio mazzi</translation>
     </message>
@@ -8144,17 +7059,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation>Galleria mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation>Impossibile aprire il mazzo a %1</translation>
     </message>
@@ -8162,7 +7077,7 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation>EDHREC: </translation>
     </message>
@@ -8170,391 +7085,407 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation>&amp;Carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation>Comandanti più popolari</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation>Etichette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation>Cerca carta...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation>Cerca</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <translation>EDHREC: </translation>
     </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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation>Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>&amp;Fasi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>&amp;Partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <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/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <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/client/tabs/tab_game.cpp" line="236"/>
         <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/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <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/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation>&amp;Concedi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <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/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <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/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>&amp;Parla:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation>Carte selezionate</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>Separata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation>Reimposta disposizione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>Concedi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation>Annulla concedi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <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/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>espulso da proprietario del gioco o moderatore</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>il giocatore ha lasciato la partita</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>il giocatore si è disconnesso dal server</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation>ragione sconosciuta</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>Sei stato kickato fuori dalla partita.</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation>Home</translation>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>Registri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>Ora;NomeMittente;IPMittente;Messaggio;IDDestinatario;NomeDestinatario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>Registri stanze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>Registri partite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>Registri chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>Seleziona almeno un filtro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>Seleziona un numero di giorni valido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>Nome utente: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>Indirizzo IP: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>Nome partita: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>ID Partita: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>Messaggio: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>Stanza principale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>Stanza partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>Chat privata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>Ultimi X giorni: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>Ultima ora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>Massimo numero di risultati:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>E&apos; richiesto perlomeno un filtro.
 Più informazioni inserisci, più specifici saranno i risultati.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>Ottieni log utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>Elimina filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>Filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>Posizioni registro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>Periodo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>Massimo numero di risultati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>Storico messaggi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>Impossibile recuperare la storia dei ban.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Nessun messaggio corrisponde ai filtri selezionati.</translation>
     </message>
@@ -8562,37 +7493,37 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>&amp;Chat privata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;Lascia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Chat privata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>Questo utente ti sta ignorando, non può vedere i tuoi messaggi nella chat principale e tu non puoi entrare nelle sue partite.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>Messaggio privato da</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 è uscito dal server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 è entrato nel server.</translation>
     </message>
@@ -8600,186 +7531,105 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>File locali</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>Replay sul server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>Guarda replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation>Rinomina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation>Nuova cartella</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation>Apri cartella replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>Scarica replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>Metti/togli blocco scadenza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation>Ottieni codice di condivisione replay</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation>Cerca replay dal codice di condivisione</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation>Rinomina cartella locale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation>Rinomina file locale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation>Nuovo nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation>Rinomina non riuscita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation>Nome della nuova cartella:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>Elimina il file locale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Vuoi davvero eliminare i file selezionati?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Vuoi davvero eliminare i replay selezionati?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <translation>Impossibile ottenere il codice</translation>
-    </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>O questo server non supporta la condivisione dei replay, o non consente la condivisione dei replay per te.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="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>Fallito</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation>Impossibile ottenere il codice replay</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <translation>Codice di condivisione replay</translation>
-    </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>Altre persone possono usare questo codice per aggiungere il replay alla loro lista di replay remoti:
-%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation>Copia negli appunti</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation>Codice di condivisione replay</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation>Codice replay trovato</translation>
-    </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>Il replay è stato aggiunto oppure ne avevi già accesso.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation>Codice replay non trovato</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation>Impossibile inviare il codice</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation>Errore inatteso</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>Elimina replay remoto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation>Replay partite</translation>
     </message>
@@ -8787,47 +7637,47 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;Parla:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;Stanza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Lascia stanza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>Pulisci &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>Impostazioni chat...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation> ti ha menzionato.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>Clicca per visualizzare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>Stai spammando la chat. Attendi un paio di secondi.</translation>
     </message>
@@ -8835,35 +7685,35 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation>Impossibile unirsi alla stanza: non esiste sul server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation>Il server pensa che tu sia nella stanza ma il tuo client non è in grado di mostrarlo. Prova a riavviare il client.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation>Non hai i requisiti necessari per unirti a questa stanza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation>Impossibile unirsi alla stanza a causa di un errore sconosciuto: %1.</translation>
     </message>
@@ -8871,97 +7721,87 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation>&amp;Editor dei mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation>Editor visuale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation>EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation>Archidekt</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation>Home</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation>&amp;Galleria mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation>Galleria database</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation>&amp;Archivio mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation>&amp;Replay partite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation>Amministrazione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation>Registri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>Sei sicuro?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>Ci sono ancora delle partite aperte. Sei sicuro di voler uscire?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation>Clicca per visualizzare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Il tuo amico %1 si è collegato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>Evento sconosciuto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8972,39 +7812,39 @@ Questo messaggio può significare che è disponibile una nuove versione di Cocka
 Per aggiornare il tuo client, vai su Aiuto -&gt; Controlla aggiornamenti client</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation>Timeout inattività</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Stai per essere disconnesso per inattività.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>Promozione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation>Sei stato promosso. Esci e rientra per dare effetto alle modifiche.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>Hai ricevuto un avviso a causa di %1.
 Se pregato di evitare di continuare questa attività o potrebbero venire presi ulteriori provvedimenti nel tuoi confronti. Per qualsiasi domanda, manda un messaggio ad un moderatore.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>Hai ricevuto il seguente messaggio dal server.
@@ -9014,12 +7854,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation>Visualizzazione Database</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation>Galleria database</translation>
     </message>
@@ -9027,13 +7862,13 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>Impossibile analizzare il mazzo.</translation>
     </message>
@@ -9041,14 +7876,14 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>Il file non esiste.
 </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>Impossibile aprire il file.
@@ -9058,42 +7893,42 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Vita</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Bianco</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Blu</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Nero</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Rosso</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Verde</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Incolore</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Altro</translation>
     </message>
@@ -9101,7 +7936,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>Impossibile aprire il file in lettura.</translation>
     </message>
@@ -9109,206 +7944,184 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>&amp;Dettagli utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>&amp;Chat privata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Visualizza le &amp;partite dell&apos;utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>Aggiungi alla lista &amp;amici</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Rimuovi dalla lista &amp;amici</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>Aggiungi alla lista &amp;ignorati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Rimuovi dalla lista &amp;ignorati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>Caccia dalla &amp;partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>Avvisa utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Mostra storia avvisi ute&amp;nte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>Banna dal &amp;server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Mostra storia &amp;ban utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promuovi utente a moderatore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Degrada il m&amp;oderatore ad utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation>Promuovi utente a &amp;giudice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation>Degrada utente da giudice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation>Visualizza le note degli amministratori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <source>This user does not exist.</source>
-        <translation>L&apos;utente non esiste.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation>Stai venendo ignorato da %1 e non puoi vedere le sue partite.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation>Impossibile ottenere le partite di %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>Partite di %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>Storico ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>Ora Ban;Moderatore;Durata Ban;Ragione Ban;Ragione Visibile</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>L&apos;utente non è mai stato bannato.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation>Impossibile recuperare le informazioni sui ban.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>Storico avvisi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>Ora Avviso;Moderatore;Nome Utente;Ragione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>L&apos;utente non ha mai ricevuto avvisi.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation>Impossibile recuperare le informazioni sugli avvisi.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation>Impossibile ottenere le note degli amministratori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>Successo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>Utente promosso.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>Utente degradato.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>Fallito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>Promozione fallita.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>Degradazione fallita.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation>Copia hash negli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Rimuovi i messaggi di questo utente</translation>
     </message>
@@ -9316,173 +8129,173 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Posizione:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>Età account:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>Cambia password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>Cambia avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Amministratore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>Moderatore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Utente registrato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Utente non registrato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation>Arbitro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>Sconosciuta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation>La password inserita non corrisponde al tuo accound.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>Informazione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>Informazioni utente aggiornate.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation>Informazioni Utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation>Nome Reale:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation>Livello dell&apos;Utente:</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation><numerusform>1 Anno.</numerusform><numerusform>%n Anni.</numerusform><numerusform>%n Anno(i).</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation><numerusform>%10%n Giorno %20</numerusform><numerusform>%10%n Giorni %20</numerusform><numerusform>%10%n Giorno(i) %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>Inserisci Password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation>La verifica della password è necessaria per cambiare il tuo indirizzo email</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation>E&apos; stato riscontrato un errore durante l&apos;aggiornamento delle tue informazioni utente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>Questo server non ti permette di aggiornare le tue informazioni utente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>Password modificata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>Questo server non ti permette di modificare la password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>La nuova password è troppo corta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>La vecchia password è sbagliata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>Avatar modificato.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Questo server non ti permette di aggiornare il tuo avatar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>Si è verificato un errore durante l&apos;aggiornamento del tuo avatar.</translation>
     </message>
@@ -9490,152 +8303,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <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/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <source>Do not delete &amp;arrows inside of subphases</source>
-        <translation>Non eliminare le &amp;freccie al cambio di sottofase</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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 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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation>Impostazioni notifiche</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <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/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <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/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <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/dialogs/dlg_settings.cpp" line="901"/>
         <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/dialogs/dlg_settings.cpp" line="902"/>
         <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/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Tempo di attesa per saltare indietro dopo aver premuto la scorciatoia</translation>
     </message>
@@ -9643,241 +8441,86 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation>Utenti connessi al server: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation>Utenti in questa stanza: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation>Amici online: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation>Utenti ignorati online: %1 / %2</translation>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation>Aumenta tutti i segnalini della carta</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation>&amp;STAPpa tutti i permanenti</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation>L&amp;ancia un dado...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation>&amp;Crea una pedina...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation>C&amp;rea un&apos;altra pedina</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation>Cr&amp;ea pedina predefinita</translation>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <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="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation>Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT)</translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation>Salva filtro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation>Salva su file i filtri correnti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <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 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>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 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>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 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> carte</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation>Non mostrare i formati con meno di questo ammontare di carte nel database</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <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_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation>Modalità: Corrispondenza esatta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation>Modalità: Include</translation>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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> 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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation>Modalità: Include</translation>
     </message>
@@ -9885,27 +8528,27 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
-        <translation>Filtra per nome... (Corrispondenza esatta)</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
+        <translation>Filtra per nome...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation>Carica da mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation>Usa i nomi delle carte nel mazzo caricato come insieme di filtri a corrispondenza esatta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation>Carica dagli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation>Usa i nomi delle carte negli appunti come insieme di filtri a corrispondenza esatta</translation>
     </message>
@@ -9913,7 +8556,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/client/ui/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>
@@ -9921,19 +8564,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation>Modalità: Include</translation>
     </message>
@@ -9941,37 +8584,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/client/ui/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 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> 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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation>Modalità: Include</translation>
     </message>
@@ -9979,93 +8612,45 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation>Cerca per nome della carta (o espressioni di ricerca)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation>Visuale</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <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/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation>Tabella</translation>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
-        <translation>Raggruppa per:</translation>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</source>
+        <translation>Salva e carica filtri</translation>
     </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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</source>
+        <translation>Filtra per nome della carta esatto</translation>
     </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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
+        <translation>Filtra per sottotipo</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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <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"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</source>
+        <translation>Filtra per set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation>Dimensione della mano</translation>
     </message>
@@ -10073,25 +8658,46 @@ 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"/>
-        <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>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <source>Click and drag to change the sort order within the groups</source>
+        <translation>Clicca e trascina per modificare i criteri di ordinamento all&apos;interno dei gruppi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation>Cerca per la corrispondenza più prossima nel database (con auto-completamento) e premendo Invio, aggiungi la stampa preferita della carta al mazzo.</translation>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation>Configura l&apos;ordinamento delle carte all&apos;interno dei gruppi</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation>Disposizione sovrapposta</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation>Imposta come le carte vengono mostrate all&apos;interno delle relative sezioni (sovrapposte o affiancate)</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation>Disposizione affiancata</translation>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation>Archivio mazzi</translation>
     </message>
@@ -10099,52 +8705,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/client/ui/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/client/ui/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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="132"/>
+        <location filename="src/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation>Percorso file</translation>
     </message>
@@ -10152,7 +8753,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation>Cerca per nome del file (o espressioni di ricerca)</translation>
     </message>
@@ -10160,22 +8761,22 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation>Ordina alfabeticamente (Nome del mazzo)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation>Ordina alfabeticamente (Nome del file)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation>Ordina per ultima modifica</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation>Ordina per ultimo caricato</translation>
     </message>
@@ -10183,17 +8784,17 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation>Caricamento database...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation>Aggiorna i file caricati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation>Impostazioni galleria mazzi</translation>
     </message>
@@ -10201,43 +8802,43 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>Che avviso vorresti inviare?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Ottieni tutti i messaggi di questo utente in tutte le stanze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annulla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>Avvisa l&apos;utente per cattivo comportamento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>Il nome utente a cui inviare l&apos;avviso non può essere vuoto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>L&apos;avviso da inviare non può essere vuoto.</translation>
     </message>
@@ -10245,133 +8846,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <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/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation>Suggerimenti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation>Organizza set</translation>
     </message>
@@ -10379,72 +8980,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>Raggruppa per tipo</translation>
     </message>
@@ -10452,7 +9053,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Italiano (Italian)</translation>
     </message>
@@ -10460,12 +9061,12 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation>Connetti all&apos;avvio</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation>Debug su file</translation>
     </message>
@@ -10473,1058 +9074,991 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>Finestra principale</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>Editor dei mazzi</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>Lobby della partita</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation>Segnalini della carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation>Contatori del giocatore</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Forza e costituzione</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Fasi di gioco</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>Area di gioco</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation>Muovi la carta selezionata</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>Guarda</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation>Muovi la prima carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation>Muovi l&apos;ultima carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Partita</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation>Pescare</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation>Chat Room</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation>Finestra di gioco</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation>Carica mazzo dagli appunti</translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation>Replay</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation>Schede</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation>Controlla Aggiornamenti Carte...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation>Connetti...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>Disconnetti</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>Schermo Intero</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation>Registrati...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation>Impostazioni...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation>Inizia una Partita in Locale...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation>Guarda Replay...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation>Analizza mazzo (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation>Analizza mazzo (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation>Elimina tutti i filtri</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation>Elimina il filtro selezionato</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation>Rimuovi carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation>Gestisci Espansioni...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation>Modifica pedine personalizzate</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation>Esporta mazzo (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation>Esporta mazzo (decklist.xyz)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation>Aggiungi Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation>Carica Mazzo...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Carica il Mazzo dagli Appunti...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation>Modifica Mazzo negli Appunti con Annotazioni</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation>Modifica Mazzo negli Appunti</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation>Nuovo Mazzo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Apri Cartella Immagini Personalizzate</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation>Stampa Mazzo...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation>Elimina carta</translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation>Reimposta Disposizione</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>Salva Mazzo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation>Salva Mazzo con Nome...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Salva Mazzo in Appunti, Annotato</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation>Salva Mazzo negli Appunti con Annotazioni (Senza Info Set)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation>Salva Mazzo in Appunti</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation>Salva Mazzo negli Appunti (Senza Info Set)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation>Carica Mazzo Locale...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation>Carica Mazzo da Remoto...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation>Imposta Pronto a Iniziare</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Attiva Blocco della Sideboard</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation>Aumenta Segnalino Verde</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation>Riduci Segnalino Verde</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation>Imposta Segnalino Verde...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation>Aumenta Segnalino Rosso</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation>Riduci Segnalino Rosso</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation>Imposta Segnalino Rosso...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation>Aumenta Contatore Vita</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation>Mostra barra di stato</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation>Deseleziona mazzo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation>Forza avvio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation>Aggiungi Segnalino (F)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation>Togli Segnalino (F)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation>Imposta Segnalini (F)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation>Aggiungi Segnalino (E)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation>Togli Segnalino (E)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation>Imposta Segnalini (E)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation>Aggiungi Segnalino(D)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation>Togli Segnalino (D)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation>Imposta Segnalini (D)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation>Aggiungi Segnalino (C)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation>Togli Segnalino (C)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation>Imposta Segnalini (C)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation>Aggiungi Segnalino (B)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation>Togli Segnalino (B)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation>Imposta Segnalini (B)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation>Aggiungi Segnalino (A)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation>Togli Segnalino (A)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation>Imposta Segnalini (A)...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation>Riduci Contatore Vita</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation>Imposta Contatore Vita...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation>Aumenta Contatore Bianco</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation>Riduci Contatore Bianco</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation>Imposta Contatore Bianco...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation>Aumenta Contatore Blu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation>Riduci Contatore Blu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation>Imposta Contatore Blu...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation>Aumenta Contatore Nero</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation>Riduci Contatore Nero</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation>Imposta Contatore Nero...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation>Aumenta Contatore Incolore</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation>Riduci Contatore Incolore</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation>Imposta Contatore Incolore...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation>Aumenta Contatore Altro</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation>Riduci Contatore Altro</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation>Imposta Contatore Altro...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation>Aumenta tutti i segnalini della carta</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation>Aumenta Forza (+1/+0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Diminuisci Forza (-1/-0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Sposta Costituzione a Forza (+1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Aumenta Costituzione (+0/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Riduci Costituzione (-0/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Sposta Forza a Costituzione (-1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Aumenta Forza e Costituzione (+1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Diminuisci Forza e Costituzione (-1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation>Imposta Forza e Costituzione...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation>Resetta Forza e Costituzione</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>STAP</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>Mantenimento</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>Acquisizione</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation>Prima Fase Principale</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation>Inizio Combattimento</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>Dichiarazione attaccanti</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>Dichiarazione bloccanti</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>Danno da combattimento</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation>Fine Combattimento</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation>Seconda Fase Principale</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>Finale</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation>Fase Successiva</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation>Azione della Fase Successiva</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation>Turno Successivo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation>Nascondi Carta nella Finestra di Visualizzazione</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation>TAPpa / STAPpa carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation>STAPpa Tutto</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
+        <translation>Abilita STAPpa</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation>Gira Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation>Sbircia Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation>Gioca Carta</translation>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation>Assegna Carta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation>Togli Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation>Clona Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation>Crea Pedina...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <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/settings/shortcuts_settings.h" line="518"/>
         <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/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation>Imposta Note...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <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"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation>Rivela Carta Selezionata a Tutti i Giocatori</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation>Cima al Grimorio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation>Campo di Battaglia, faccia in giù</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation>Campo di Battaglia</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Grimorio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation>Carte in Cima al Grimorio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation>Carte in Fondo al Grimorio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation>Chiudi Viste di Recente</translation>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <source>Graveyard (Multiple)</source>
         <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 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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <source>Exile (Multiple)</source>
         <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/settings/shortcuts_settings.h" line="590"/>
         <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/settings/shortcuts_settings.h" line="615"/>
         <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/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation>Disegna Freccia...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <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/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation>Abbandona Partita</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>Concedi</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation>Tira un Dado...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation>Mescola il Grimorio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation>Mulligan (Come la mano attuale)</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation>Mulligan (Dimensione della mano - 1)</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <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/settings/shortcuts_settings.h" line="650"/>
         <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/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation>Annulla Pescata</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <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/settings/shortcuts_settings.h" line="659"/>
         <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"/>
-        <source>Sort Hand by Name</source>
-        <translation>Ordina mano per Nome</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation>Ordina mano per Tipo</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation>Ordina mano per Valore di Mana</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation>Rivela Mano a Tutti i Giocatori</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation>Rivela Carta Casuale a Tutti i Giocatori</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <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/settings/shortcuts_settings.h" line="665"/>
         <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/settings/shortcuts_settings.h" line="668"/>
         <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/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation>Vai alla chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation>Cancella chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation>Aggiorna</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation>Salta Avanti</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation>Salta Indietro</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation>Riproduci/Pausa</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation>Attiva/Disattiva Avanzamento Rapido</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation>Home</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation>Galleria mazzi</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation>Archivio mazzi</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation>Amministrazione</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation>Registri</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_ja.ts b/cockatrice/translations/cockatrice_ja.ts
index a53588fc1..e9128400a 100644
--- a/cockatrice/translations/cockatrice_ja.ts
+++ b/cockatrice/translations/cockatrice_ja.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>(&amp;S)カウンターの数を決める...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>カウンターの設定</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>&apos;%1&apos;カウンターの新しい値:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>可能ならセット名と番号を解析する</translation>
     </message>
@@ -36,82 +36,80 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation>リリースノート</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -119,12 +117,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation>メインボード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation>サイドボード</translation>
     </message>
@@ -132,312 +130,251 @@ 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"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>テーマ設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>現在のテーマ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation>テーマフォルダを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation>メニュー設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>右クリックメニューにキーボードショートカットを表示する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <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/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation>カードの描画</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>横向きレイアウトのカードを自動回転</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
-        <translation type="unfinished"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
+        <translation>すべてのカード アートを個人設定の環境設定で上書きする (Pre-ProviderID 変更動作) [クライアントの再起動が必要]</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation>行</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
         <translation>手札のレイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <source>Enable left justification</source>
         <translation>左揃えを有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <source>Table grid layout</source>
         <translation>テーブルのレイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="692"/>
         <source>Invert vertical coordinate</source>
         <translation>カード配置の垂直反転</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>カードに表示する情報の最大のフォントサイズ:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>ユーザー名でBAN</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>IPアドレスでBAN</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>クライアントIDでBAN</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>BANタイプ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>永久BAN</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>一時BAN</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>分</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>BAN期間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>BANの理由を入力してください。
 これはモデレーターによって保存されBANされた人には見えません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>BANの理由を入力してください。これはBANされる人に通知されます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>すべてのルームでこのユーザーからのすべてのメッセージを編集します</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>サーバーからBANされたユーザーです</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>BANの理由を3 つの組み合わせを選択する必要があります:不適切な名前、不適切なIPアドレス、クライアントID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>名前BANチェックボックスを選択するときは、名前BANの値を持っている必要があります。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>IP BANチェックボックスを選択するときは、IP BANの値を持っている必要があります。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>クライアントID BANチェックボックスを選択するときは、クライアントID BANに値を持っている必要があります。</translation>
     </message>
@@ -445,22 +382,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation>Beta（開発中バージョン）</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>リリース更新サーバーから応答がありませんでした。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>リリース更新サーバーから無効な応答が受信されました。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>ファイル更新サーバーからの応答がありませんでした。</translation>
     </message>
@@ -468,32 +405,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>カード名</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>カードセット</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>マナ・コスト</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>カード・タイプ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>色</translation>
     </message>
@@ -501,101 +438,96 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>AND</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OR</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>AND NOT</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OR NOT</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>カード名</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>色</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>ルール文章</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>カードセット</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>マナ・コスト</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>マナ総量</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>稀少度</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>パワー</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>タフネス</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>忠誠度</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>フォーマット</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -603,22 +535,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation>カード画像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation>カード文章</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation>画像+文章</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation>別面を見る</translation>
     </message>
@@ -626,22 +558,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation>メインボード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation>サイドボード</translation>
     </message>
@@ -649,294 +581,172 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation>カード名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation>関連カード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation>謎のカード:</translation>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>領域の移動</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>パワー / タフネス</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation>カードの大きさ</translation>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>手札</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1の手札</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>ライブラリー</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1のライブラリー</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>ライブラリーの</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1のライブラリーの</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>ライブラリー</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1のライブラリー</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>ライブラリー</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>%1のライブラリー</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>ライブラリー</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1のライブラリー</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>墓地</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1の墓地</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>追放領域</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1の追放領域</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>サイドボード</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1のサイドボード</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>サイドボード</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1のサイドボード</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -945,7 +755,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -953,60 +763,15 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1014,47 +779,47 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1062,97 +827,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1160,17 +915,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1178,114 +933,109 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1293,7 +1043,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1301,227 +1051,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>完了</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation>URLを編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation>ネットワークキャッシュサイズ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation>リダイレクトキャッシュの有効期限:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation>画像キャッシュサイズ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
         <translation>新しいURLを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation>URLを削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation>日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>更新中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation>パスを選ぶ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <source>URL Download Priority</source>
         <translation>ダウンロードURL優先設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>スポイラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <source>Download Spoilers Automatically</source>
         <translation>スポイラーを自動的にダウンロード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation>スポイラーの保存場所:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>最新に更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <source>Delete Downloaded Images</source>
         <translation>ダウンロードした画像を削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Reset Download URLs</source>
         <translation>ダウンロードURLをデフォルトに戻す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>現在画面に表示されていない画像のメモリ内キャッシュ</translation>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation>枚数</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation>セット</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>枚数</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>カード名</translation>
     </message>
@@ -1529,12 +1246,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1542,17 +1259,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation>検索モード: 完全一致</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation>検索モード: 一部に含む</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1560,7 +1277,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation>タグを編集...</translation>
     </message>
@@ -1568,62 +1285,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation>デッキタグマネージャー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>デッキタグの管理ができます。新たなタグを追加することもできます:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>新しいタグを追加する(例: イニシアチブ)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation>タグを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation>タグをフィルタ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation>無効な入力</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation>タグ名を入力してください！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation>タグの重複</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation>このタグはすでに存在します。</translation>
     </message>
@@ -1631,166 +1348,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>サーバーからの応答が解析できませんでした。</translation>
     </message>
@@ -1814,58 +1473,54 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation>デッキを撤去</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Ready to start</source>
         <translation>準備完了！( ･`д･´)</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation>強制開始</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation>サイドボード使用可能</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1873,12 +1528,12 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation>デッキフォーマット変換</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
@@ -1887,7 +1542,7 @@ This will kick all non-ready players from the game.</source>
 デッキをcod形式に変換しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation>選択を記憶し、今後も自動的に適用する</translation>
     </message>
@@ -1895,148 +1550,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>ダウンロード中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>ホストを選択</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation>選択中のサーバーを削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>デフォルトの公開サーバーリストに更新します</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>新しいホスト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>サーバー名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>ホストアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>ポート:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>プレイヤーネーム:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>パスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>パスワードを保存</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>起動時に自動的に接続</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Cockatriceを開いた時に自動的に最後のログインに接続</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>接続や登録に問題がある場合は、サーバー管理者にお問い合わせください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>ウェブページ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>パスワードをリセット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation>パスワード忘れた</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>接続</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>サーバー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>ログイン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>サーバーの連絡先</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>サーバーに接続</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>サーバーURL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>通信ポート</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>ユニークサーバー名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>接続の警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>新しい接続プロファイルに名前を付ける必要があります。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>接続の警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>プレイヤー名を入力して下さい。</translation>
     </message>
@@ -2044,122 +1699,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>設定を保存する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>説明:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>プレイヤー人数:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>全般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>ゲームタイプ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>パスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>フレンドのみ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>登録プレイヤーのみ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>参加制限</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>観戦を許可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>観戦にパスワードが必要</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>観戦者はチャットに参加できる</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>観戦者に手札を見せる</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>観戦者としてゲームを作成</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>観戦者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation>開始時のライフ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation>ゲーム準備オプション</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>設定をクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>ゲームを作成</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>ゲーム情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>サーバーエラー。</translation>
     </message>
@@ -2167,97 +1812,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>トークン名:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>トークン</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>色:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>白</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>青</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>黒</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>赤</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>緑</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>注釈:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>戦場を離れる際に破棄</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>トークン設定</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>すべてのトークンを見る</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>このデッキのトークンを見る</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>一覧からトークンを作成</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>トークンを作成</translation>
     </message>
@@ -2265,53 +1910,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2319,40 +1964,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>画像がありません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>アバターを変更するには、新しい画像を選択してください。
 現在のアバターを削除するには、新しい画像を選ばずにOKを押してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>参照...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>アバター変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>アバター画像を開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>画像ファイル (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>この画像は使用できません。</translation>
     </message>
@@ -2360,17 +2005,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2378,38 +2023,38 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>前のパスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>新しいパスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>新しいパスワード（確認）:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>パスワード変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>パスワードが短すぎます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>新しいパスワードが一致しませんでした。</translation>
     </message>
@@ -2417,93 +2062,93 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>トークン名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>色:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>白</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>青</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>黒</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>赤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>緑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>注釈:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>トークンの設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>トークンを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>トークンを削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>カスタムトークンを編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>トークン名を入力:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>選択された名前は、既存のカードやトークンと競合しています。
@@ -2513,27 +2158,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>メールアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>国籍:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>指定なし</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>本名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>ユーザー情報編集</translation>
     </message>
@@ -2541,143 +2186,137 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>指定なし</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5分</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10分</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30分</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1時間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2時間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>「フレンドのみ」のゲームを非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation>満員のゲームを非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation>進行中のゲームを非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation>パスワードが必要なゲームを非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>無視ユーザーのゲームを非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation>部屋の経過時間:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>説明でフィルター:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>作成者でフィルター:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>全般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>ゲームタイプ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>最少:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>最大:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>プレイヤー人数:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>制限</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>観戦できるゲームのみを表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>観戦にパスワードが必要なゲームも表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>観戦者がチャットできるゲームのみを表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>手札が閲覧できるゲームのみを表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation>観戦</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>ゲームフィルタ</translation>
     </message>
@@ -2685,52 +2324,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation>パスワードリセットの警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>問題が発生しました。新しいパスワードのリクエストを再試行してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation>新しいパスワードをリクエストしたいサーバーの情報とアカウントを入力してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>ホストアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>ポート:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>プレイヤー名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>メールアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation>パスワードリセットチャレンジ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation>パスワードリセットエラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>メールアドレスを入力してください。</translation>
     </message>
@@ -2738,37 +2377,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation>新しいパスワードをリクエストするサーバーの情報を入力してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>ホストアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>ポート:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>プレイヤー名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation>パスワードリセット要求</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation>パスワードリセットエラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>プレイヤー名を入力して下さい。</translation>
     </message>
@@ -2776,86 +2415,86 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation>パスワードリセットの警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>問題が発生しました。新しいパスワードのリクエストを再試行してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation>新しいパスワードを設定するには、受け取ったトークンと新しいパスワードを入力します。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>ホストアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>ポート:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>プレイヤー名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>トークン:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>新しいパスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>パスワードリセット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>プレイヤー名を入力して下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation>パスワードリセットエラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>トークンを入力してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>新しいパスワードを入力してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation>パスワードが短すぎます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>パスワードが一致しませんでした。</translation>
     </message>
@@ -2863,7 +2502,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation>デッキを開く</translation>
     </message>
@@ -2871,146 +2510,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>無効なデッキリストです。</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>デッキを開く</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation>条件に一致するカードはデータベースに存在しません。続行しますか？</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation>悪魔からの助言</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation>不正な条件</translation>
     </message>
@@ -3018,92 +2574,92 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>あなたの情報と登録したいサーバーの情報を入力してください。
 あなたのメールアドレスはアカウントの確認に使用されます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>ホストアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>ポート:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>プレイヤー名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>パスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>パスワード (確認) :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>メールアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>メールアドレス (確認) :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>国籍:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>指定なし</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>本名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>サーバーに登録</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>登録に関する警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>パスワードが短すぎます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>パスワードが一致しませんでした。もう一度入力して下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>メールアドレスが一致しませんでした。もう一度入力して下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>プレイヤー名を入力して下さい。</translation>
     </message>
@@ -3111,17 +2667,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation>面の数:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation>ダイスの数</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation>賽は投げられそう</translation>
     </message>
@@ -3129,55 +2685,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation>セットを有効にするには、チェックを入れてください。ドラッグ＆ドロップで順序を変更し、優先順位を変更できます。カードは、最も優先度の高い有効なセットの印刷を使用します。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3194,7 +2735,7 @@ Oracle Importerでデータベースを更新する必要があります。
 データベースの場所の設定を変更してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1897"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3211,7 +2752,7 @@ Oracle Importerでデータベースを更新する必要があります。
 データベースの場所の設定を変更してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2765,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3233,7 +2774,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3242,7 +2783,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3255,59 +2796,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>全般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>外観</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>UI</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation>カードダウンロード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>チャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>サウンド</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>ショートカット</translation>
     </message>
@@ -3315,12 +2856,12 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/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>
@@ -3329,27 +2870,27 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 この動作は「一般」設定タブでいつでも変更できます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3357,17 +2898,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>次</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>前</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>今日のヒント</translation>
     </message>
@@ -3375,166 +2916,170 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>現在のリリースチャンネル:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>再インストール</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>ダウンロードをキャンセル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>ダウンロードページを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation>クライアントの更新チェック</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>CockatriceはSSLをサポートしていなかったため、更新を自動ダウンロード出来ません。
 ダウンロードページから手動で更新してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>更新のチェック中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>更新のチェックが完了しました</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>更新がありません</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatriceは最新版です。やったね！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>選択したリリースチャンネルで最新のバージョンを使用しています。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>現在のバージョン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>選択したリリースチャンネル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>更新できます！！！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>新しいバージョンのCockatriceが利用できます！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>新しいバージョン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>公開日時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>変更履歴</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>今すぐ更新しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation>残念ながら、自動アップデータは互換性のあるダウンロードを見つけることができませんでした。 
 You may have to manually download the new version.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>更新エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>更新のチェック中にエラーが発生しました:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>更新のダウンロード中にエラーが発生しました:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>インストール中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>インストーラーが開けませんでした。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Cockatriceを終了した後、インストーラーから手動で更新してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>ダウンロード場所</translation>
     </message>
@@ -3542,162 +3087,30 @@ You may have to manually download the new version.</translation>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>閉じるときにログをクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>デバッグログ</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3705,47 +3118,47 @@ You may have to manually download the new version.</translation>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3753,44 +3166,38 @@ You may have to manually download the new version.</translation>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3798,7 +3205,7 @@ You may have to manually download the new version.</translation>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>ここにフィルタを入力</translation>
     </message>
@@ -3806,325 +3213,244 @@ You may have to manually download the new version.</translation>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>適切な部屋に参加してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>パスワードが間違っています。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>このゲームは観戦出来ません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>このゲームはすでに満員です。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>このゲームはすでに存在しません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>このゲームは登録済みプレイヤーのみ参加できます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>このゲームは作成者のフレンドのみ参加できます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>あなたはゲームの作成者によって参加拒否されています。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation>参加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation>観戦</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation>ゲーム情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>参加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>パスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>最初にルームに参加してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>ゲームフィルタ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>フィルタ解除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>ゲームを作成</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>参加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>観戦</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation>表示されているゲーム: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>ゲーム</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 日</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 時</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation>できたて</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 分</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>パスワード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>フレンドのみ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>登録ユーザーのみ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>チャット可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>手札閲覧可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>手札閲覧可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>観戦不可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>ルーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>作成時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>説明</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>作成者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>制限</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>人数</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>観戦者</translation>
     </message>
@@ -4132,609 +3458,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>サーバーが満員です。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>あなたのアドレスからの同時接続が多すぎます。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>モデレーターによるBAN</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>予想終了時間: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>永久BANされています。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>サーバーシャットダウン予定時間。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>ユーザー名が無効です。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>別の場所でログインしているため、ログアウトしました。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>通信切断</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>サーバーはあなたの接続を切断しました。
 理由: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4743,575 +3665,585 @@ Reason for shutdown: %1</source>
 シャットダウンの理由: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>サーバーシャットダウン予定時刻</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>登録が完了しました。
 ログインします。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>アカウント有効化が完了しました。
 ログインします。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>プレイヤー人数</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>プレイヤーの人数を入れてください.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>プレイヤー %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>リプレイを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>Cockatriceについて</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>バージョン</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatriceウェブページ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>プロジェクトマネージャ:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>元プロジェクトマネージャ:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>デベロッパ:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>リンク先参照</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>開発者募集中！</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>翻訳者:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>翻訳者一覧</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>翻訳者募集中！</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>サポート:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>問題を報告</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>トラブルシューティング</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>サーバータイムアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>ログイン失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>あなたのクライアントは、サーバーが必要とする機能をサポートしていません。クライアントを更新して再度お試しください。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>クライアントをアップデートするには、メニューの「ヘルプ」から「クライアントの更新チェック」をクリックします。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>ユーザー名かパスワードが正しくありません。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>既にこのユーザー名を使用しているアクティブなセッションが存在します。
 アクティブなセッションを閉じて再ログインしてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>あなたは%1までBANされています。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>あなたは無期限BANされています。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>このサーバーはユーザー登録が必要です。
 今すぐ登録しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation>このサーバはクライアントのIDを必要とします。あなたのクライアントはIDの生成に失敗しているか、変更されたクライアントを実行しています。
 クライアントを再起動してもう一度お試し下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>内部エラーが発生しました。Cockatriceを再起動して再度お試しください。
 エラーが解決しない場合は、ソフトウェアの最新バージョンを実行していることを確認し、必要に応じてソフトウェア開発者にお問い合わせください。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>アカウント有効化</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>このアカウントはまだ有効化されていません。
 登録されたアドレスに送信されているアクティベーショントークンを入力して下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>サーバーが満員です。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>不明なログインエラー: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 これは通常、あなたのクライアントのバージョンが古くなっていて、サーバーがあなたのクライアントを認識できないと返答してきていることを意味しています。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>ユーザー名は、これらの規則を遵守する必要があります：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>文字数は%1～%2文字まで</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>小文字%1可</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>不</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>大文字％1可</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>数字％1可</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>次の記号が使用可：％1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>最初の文字を記号にすることは%1可能</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation>サーバールールで定められている不適切な言葉は使用できません:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>次の単語を含めることは不可能：%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>次の文字列を含めることは不可能：%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>ユーザー名には『半角英数字』、および半角の「_」「.」「-」のみが使えます。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>登録が拒否されました。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>現在このサーバーでは登録が無効になっています。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>既に同じユーザー名のアカウントが登録されています。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>登録時に有効な電子メールアドレスを指定する必要があります。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>このサーバーに新しいアカウントを登録しようとしていますが、提供されたメールアドレスに登録されているアカウントが既に存在しています。このサーバーは、ユーザーがアドレスごとに登録できるアカウントの数を制限しています。詳細なサポートや資格情報の入手については、サーバーのオペレーターにお問い合わせください。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>パスワードが短すぎます。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>ユーザー登録に失敗しました（サーバーの技術的問題）。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>不明な登録エラー: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>アカウントの有効化に失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>ソケットエラー: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>あなたは古いバージョンのサーバーに接続しようとしています。Cockatriceのバージョンをダウングレードするか適切なサーバーに接続してください。
 ローカルVer %1，サーバーVer %2</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>あなたのCockatriceのバージョンがサーバーのバージョンより古いです。Cockatriceをアップデートしてください。
 ローカルVer %1，サーバーVer %2</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>%1へ接続しています...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>%1に%2として登録中...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>切断されました</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>接続完了、%1にログイン中</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation>忘れたパスワードを %1 に %2 として要求しています...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>サーバーに接続...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>サーバーから切断</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>ローカルゲームを開始...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>リプレイを見る...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>フルスクリーン</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>サーバーに登録する</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation>パスワードリセット...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>設定...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>終了</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>アクション</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>カードデータベース</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation>セットを管理...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>カスタムトークンを編集...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>カスタム画像フォルダを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>カスタムセットフォルダを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>カスタムセット/カードを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation>カードデータベースを再読み込み</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation>タブ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>ヘルプ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>Cockatriceについて</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>今日のヒント</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>クライアントの更新チェック</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation>カードデータベース更新</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation>デバッグログを見る</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation>設定フォルダを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation>表示/非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>新しいバージョン</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation>Cockatriceがインストールされました</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>カードデータベース</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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 +4252,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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>いいえ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>設定を開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <source>New sets found</source>
         <translation>新しいセットが見つかりました</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5351,17 +4283,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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>セットを見る</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>ようこそ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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 +4302,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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>情報</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,863 +4369,669 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation>セット/カードを読み込む</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <source>Selected file cannot be found.</source>
         <translation>選択したファイルが見つかりませんでした。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation>パスワードリセット</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation>アクティベーションリクエストを受信しました。メールでアクティベーショントークンを確認してください。</translation>
     </message>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1が投了を撤回した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>カード</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation>下から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation>上から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation>◇◇ゲーム開始！◇◇</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation>逆転</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation>順転</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>表</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>裏</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 は最後に引いたカード ( %2 ) を戻した 。</translation>
     </message>
@@ -6301,206 +5039,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <source>Word1 Word2 Word3</source>
         <translation>ここに入力してください</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation>定型文を追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation>定型文を編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation>定型文を削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>定型文:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation>定型文を編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation>チャット設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <source>Custom alert words</source>
         <translation>反応するキーワード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1451"/>
         <source>Enable chat mentions</source>
         <translation>メンション機能を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1452"/>
         <source>Enable mention completer</source>
         <translation>メンション補完を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1453"/>
         <source>In-game message macros</source>
         <translation>定型文</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <source>Invert text color</source>
         <translation>反転テキストの色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <source>(Color is hexadecimal)</source>
         <translation>(色は16進数)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>英数字のみ使用可能。単語を半角スペースで区切って下さい。</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation>カード・タイプ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation>マナ総量</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation>色</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation>忠誠度</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation>メインのカード・タイプ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation>マナ・コスト</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation>表裏</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation>レイアウト</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation>固有色</translation>
     </message>
@@ -6508,17 +5203,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -6526,62 +5221,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation>謎のフェイズ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation>アンタップ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation>アップキープ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation>ドロー・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation>戦闘前メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation>戦闘開始ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation>攻撃クリーチャー指定ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation>ブロック・クリーチャー指定ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation>戦闘ダメージ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation>戦闘終了ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation>戦闘後メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation>最終フェイズ</translation>
     </message>
@@ -6589,57 +5284,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>最終フェイズ</translation>
     </message>
@@ -6647,213 +5342,703 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>ja</translation>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>ライブラリーの一番上のカードを公開する</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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
+        <translation>カード枚数:(最大%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>墓地を見る</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>追放領域を見る</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>プレイヤー: %1</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>墓地</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>追放領域</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>手札を移動させる...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>ライブラリーの一番上</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>ライブラリーの一番下</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>墓地を移動させる...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>手札</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>追放領域を移動させる...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>ライブラリーを見る</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation>手札を見る</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>上からX枚見る</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>ライブラリーを公開する...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>一番上のカードを公開したままプレイ</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>サイドボードを見る</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>カードを引く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>カードをX枚引く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>最後に引いたカードを戻す</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>マリガンを行う</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>一番上のカードを裏向きにプレイ</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation>一番上のカードを墓地に置く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation>一番上のカードを追放する</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>上からX枚墓地へ置く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>上からX枚追放する</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>一番上のカードを一番下に置く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation>下からX枚見る...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation>ライブラリーを貸す...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation>見つかるまで上からスタックに置く...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>手札を見せる...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>無作為に1枚選んで公開する</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation>無作為に1枚選んで公開する</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>サイドボード</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>ライブラリー</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>カウンター</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>全てアンタップする</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>X面ダイスをふる</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>トークンを作成する...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>同じトークンを作成する</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>定義済みのトークンを作成する</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>すべてのプレイヤー</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>定型文</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation>すべて選択</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation>行を選択</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation>列を選択</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>プレイ</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>隠す</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>裏向きにプレイ</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation>タップ / アンタップ</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>通常のアンタップの切り替え</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation>裏返す</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>表面を見る</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>複製する</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>カードにつける...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>はずす</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>対象を指定</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>パワーを上げる</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>パワーを下げる</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>タフネスを上げる</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>タフネスを下げる</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>P/Tを上げる</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>P/Tを下げる</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation>パワーを上げてタフネスを下げる</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation>パワーを下げてタフネスを上げる</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>P/Tを設定する...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation>P/Tをリセットする</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>注釈をつける...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>%1色のカウンターを置く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>%1色のカウンターを取り除く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>%1色のカウンターの数を設定</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation>一番上に無作為の順番で</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation>ライブラリーの一番上からX枚...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation>ライブラリーの一番下に無作為の順番で</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>上からX枚見る</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
         <source>View bottom cards of library</source>
-        <translation type="unfinished"/>
+        <translation>下からX枚見る...</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <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.cpp" line="3188"/>
         <source>(max. %1)</source>
-        <translation type="unfinished"/>
+        <translation>(最大%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation>手札を引く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation>0以下の数を指定すると現在の枚数から減らします</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>カードを引く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>数:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>上からX枚墓地へ置く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation>ライブラリーの一番上のカードを見せる...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation>ライブラリーの一番上を...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation>ライブラリーの一番下を...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation>一番上のカードを常に見る</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation>デッキエディターで開く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation>一番上のカードをプレイ</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation>一番下のカードを手札に</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation>一番下のカードをX枚手札に...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation>一番下のカードをプレイ</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation>一番下のカードを裏向きにプレイ</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation>一番下のカードを墓地に置く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation>一番下のカードを追放する</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation>一番下のカードをX枚墓地に置く...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation>一番下のカードをX枚追放する...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation>一番下のカードを一番上に置く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation>選択中のカード</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>上からX枚追放する</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation>一番下のカードを墓地に置く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation>一番下のカードを追放する</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation>一番下のカードを手札に</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation>別の %1 トークンを出す</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation>トークンを作成</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation>上からX枚目に置く</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change power/toughness</source>
-        <translation type="unfinished"/>
+        <translation>P/Tを変更</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change stats to:</source>
-        <translation type="unfinished"/>
+        <translation>P/Tを変更:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player.cpp" line="3653"/>
         <source>Set annotation</source>
-        <translation type="unfinished"/>
+        <translation>注釈をつける</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player.cpp" line="3654"/>
         <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
+        <translation>新しい注釈:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation>カウンターの設定</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <source>&amp;Counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingDisabledInfoWidget</name>
-    <message>
-        <location filename="src/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"/>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation>プレイヤーに見せる...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation>関連カードを見る</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>トークン:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>すべてのトークン</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</source>
+        <translation>&lt;b&gt;警告:&lt;/b&gt; あなたはカスタムカードアートを使用しているようですが、このバージョンのコカトリスで印刷セレクターを使用した場合、既知のバグがあります。</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation>関連カードを見る</translation>
     </message>
@@ -6861,7 +6046,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation>セット名、セット略号で検索</translation>
     </message>
@@ -6869,17 +6054,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation>デッキの前のカード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation>デッキの次のカード</translation>
     </message>
@@ -6887,132 +6072,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation>名前順</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation>昇順</translation>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>サービス</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>%1を隠す</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>他を隠す</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>すべて表示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>設定...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>%1から出る</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>%1について</translation>
     </message>
@@ -7020,162 +6139,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatriceカードデータベース(*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>全てのファイル (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatriceリプレイファイル (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation>メインデッキ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation>サイドボード</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation>トークン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation>全て保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation>開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation>はい</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation>すべてはい</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation>いいえ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation>すべていいえ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation>中止</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation>再試行</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation>無視</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation>カードを捨てる</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation>ヘルプ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation>適用</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation>リセット</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation>デフォルトを復元</translation>
     </message>
@@ -7183,17 +6275,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>デッキ名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>アップロード日</translation>
     </message>
@@ -7201,149 +6293,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>説明</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>参加プレイヤー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>ロック</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>開始日時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>期間 (秒)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>ルーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>参加する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>ルーム名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>説明</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>アクセス権限</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>人数</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation>表の中からアクションを選択</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation>このアクションに設定するキー（の組み合わせ）を押してください</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation>無効なキー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation>ショートカットは既に使われています:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation>クリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation>デフォルトを復元</translation>
     </message>
@@ -7351,27 +6397,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>可能</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>セットタイプ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>セット略称</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>正式名称</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>公開日時</translation>
     </message>
@@ -7379,53 +6425,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <source>Restore all default shortcuts</source>
         <translation>すべてのショートカットを元に戻す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <source>Clear all default shortcuts</source>
         <translation>すべてのショートカットをクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation>セクション:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation>アクション:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation>ショートカット:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation>すべてのショートカットをクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation>ショートカット名で検索</translation>
     </message>
@@ -7433,12 +6479,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>アクション</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>ショートカットキー</translation>
     </message>
@@ -7446,14 +6492,14 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>あなたの設定ファイルには無効なショートカットキーが含まれています。
 ショートカット設定を見直してください！</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>次のショートカットがデフォルトに設定されています:
@@ -7463,58 +6509,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>シャットダウンの理由:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>シャットダウンまでの時間（分）:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>サーバーシャットダウン</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <source>Enable &amp;sounds</source>
         <translation>サウンドを有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Current sounds theme:</source>
         <translation>現在のサウンドテーマ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Test system sound engine</source>
         <translation>サウンドテスト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation>サウンド設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>音量</translation>
     </message>
@@ -7522,48 +6555,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation>スポイラーシーズンが終了しました</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>spoiler.xmlを削除します。Oracleを起動してください。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation>スポイラーのダウンロードに失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation>インターネット接続がありません(´・ω・｀)</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation>スポイラーリストは最新です。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation>新たなスポイラーはありません。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation>スポイラーが更新されました！！</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation>最後の変更:</translation>
     </message>
@@ -7571,27 +6604,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation>デフォルト</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>リリース更新サーバーから応答がありませんでした。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>リリース更新サーバーから無効な応答が受信されました。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>タグ更新サーバーからの応答がありませんでした。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>タグ更新サーバーから無効な応答が受信されました。</translation>
     </message>
@@ -7599,17 +6632,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation>フレンドリストに追加する名前を入力</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation>無視リストに追加する名前を入力</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation>アカウント</translation>
     </message>
@@ -7617,289 +6650,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>管理</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>サーバー更新&amp;メッセージ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>サーバーシャットダウン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>設定を再読み込み</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>サーバー管理機能</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation>サーバーモデレーター機能</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation>リプレイID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation>リプレイへのアクセス権を付与</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation>有効にするユーザー名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation>強制的にユーザーを有効にする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>機能をアンロックする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>機能をロックする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation>リプレイへのアクセスを付与</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation>リプレイへのアクセス権を付与できません。リプレイIDが無効です</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation>リプレイアクセス権を付与できません。内部エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation>ユーザーの有効化に成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation>ユーザーを有効化できません。ユーザー名が無効です</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation>ユーザーを有効化できません。すでに有効です</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation>ユーザーを有効化できません。内部エラー</translation>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation>カード情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>デッキ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>フィルタ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>レイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>表示する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>別ウィンドウにする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
         <translation>レイアウトをリセット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>デッキ: %1</translation>
     </message>
@@ -7907,55 +6817,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7963,22 +6886,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7986,139 +6909,139 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>ローカルのデッキ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>サーバーに保存されているデッキ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>デッキエディターで開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>デッキをアップロード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>デッキをダウンロード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>新しいフォルダーを作成する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation>無効なデッキファイル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>デッキの名前を入力</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>このデッキリストには名前がありません。
 名前を入力してください:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>無名のデッキ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>ローカルファイルの削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>新しいフォルダの名前:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation>デッキストレージ</translation>
     </message>
@@ -8126,17 +7049,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation>ビジュアルデッキストレージ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8144,7 +7067,7 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation>EDHREC: </translation>
     </message>
@@ -8152,391 +7075,407 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation>リプレイタイムライン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>フェイズ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>ゲーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <source>Next &amp;phase</source>
         <translation>次のフェイズ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <source>Next &amp;turn</source>
         <translation>次のターン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="236"/>
         <source>Reverse turn order</source>
         <translation>ゲームのターン順を逆転する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <source>Game &amp;information</source>
         <translation>ゲーム情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation>投了する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <source>&amp;Leave game</source>
         <translation>ゲームから離脱する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="260"/>
         <source>C&amp;lose replay</source>
         <translation>リプレイを閉じる</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="263"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>発言欄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>レイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>表示する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>別ウィンドウにする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation>レイアウトをリセット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>投了する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation>投了を取り消す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation>ゲームから離脱する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation>あなたはゲームから弾かれました。少々お待ちください.</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>キック</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>離脱</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>切断</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation>原因不明</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>ゲームからキックされました。</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>ログ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>時間;送信者名;送信者IP;メッセージ;対象ID;対象名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>ルームログ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>ゲームログ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>チャットログ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>フィルターを選んで下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>検索するには、有効な日数を選択する必要があります。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>ユーザー名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>IPアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>ゲーム名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>ゲームID:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>メッセージ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>メインルーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>ゲームルーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>プライベートチャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>X日経過:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>今日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>今</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>少なくとも一つのフィルタが必要です。
 情報を入力すればするほど詳細な検索結果になります。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>ユーザーログを取得</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>フィルタ解除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>フィルタ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>ログの場所</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
-        <translation>日付指定</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>メッセージ履歴</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>メッセージ履歴情報の収集に失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>選択したフィルタのためのメッセージはありません。</translation>
     </message>
@@ -8544,37 +7483,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>個人チャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>退出する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - 個人チャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>このユーザーはあなたを無視しています。メインチャットのメッセージは表示されず、ゲームに参加することもできません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>個人チャット:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1はサーバーから退出しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1がサーバーに参加しました。</translation>
     </message>
@@ -8582,185 +7521,105 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>ローカルのリプレイ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>サーバーに保存されたリプレイ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>リプレイを再生</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation>名前変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation>新しいフォルダ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation>リプレイフォルダを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>リプレイをダウンロード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>有効期限ロックの切り替え</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation>ローカルフォルダの名前を変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation>ローカルファイルの名前を変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation>新しい名前:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation>変更失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation>新しいフォルダの名前:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>ローカルファイルの削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>選択したファイルを削除してもよろしいですか?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>選択したリプレイを削除してもよろしいですか?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>サーバーファイルの削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation>リプレイ</translation>
     </message>
@@ -8768,47 +7627,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>発言欄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>チャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>ルーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>ルームから出る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>チャットをクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>チャット設定...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation>あなたにメンションした。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>クリックで見る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>あなたはチャットルームから弾かれました。少々お待ちください。</translation>
     </message>
@@ -8816,35 +7675,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>サーバー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation>サーバールームに参加できませんでした: サーバーに存在しません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation>サーバーからサーバールームに入室中の応答がありましたが、クライアントが表示できませんでした。クライアントを再起動してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation>あなたはこのサーバールームに参加するための権限がありません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation>原因不明のエラーによってサーバールームに参加できませんでした: %1。</translation>
     </message>
@@ -8852,97 +7711,87 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation>デッキエディター</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation>ビジュアルデッキストレージ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation>サーバー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation>アカウント</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation>デッキストレージ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation>リプレイ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation>管理</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation>ログ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>よろしいですか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>ゲームがまだ開いています。本当に退出しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation>クリックで見る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>%1がオンライン！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>不明なイベント</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8953,39 +7802,39 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 クライアントを更新するには、ヘルプ→更新のチェックをクリックしてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation>放置タイムアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>非アクティブのためログアウトしています。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>昇格</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation>あなたは昇格されました。変更を有効にするためにログインしなおして下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>以下の理由によって警告を受けました:  %1。
 これらのような行動はご遠慮頂ますようお願い致します。質問がある場合は、モデレーターにプライベートメッセージを送信してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>サーバーから次のメッセージを受け取りました。
@@ -8995,12 +7844,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -9008,13 +7852,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>デッキを分析できませんでしたぁ……</translation>
     </message>
@@ -9022,14 +7866,14 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>ファイルが存在しません。
 </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>ファイルが開けません。
@@ -9039,42 +7883,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>ライフ</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>白</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>青</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>黒</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>赤</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>緑</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>その他</translation>
     </message>
@@ -9082,7 +7926,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>ファイルが開けませんでした。</translation>
     </message>
@@ -9090,206 +7934,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>ユーザー詳細</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>プライベートチャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>このユーザーのゲームを表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>フレンドリストに追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>フレンドリストから削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>無視リストに追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>無視リストから削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>ゲームからキックする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>ユーザーに警告する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>ユーザーの警告履歴を見る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>サーバーからBANする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>ユーザーのBAN履歴を見る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>ユーザーを昇格する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>ユーザーを降格する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation>ユーザーをジャッジに昇格する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation>ユーザーをジャッジから降格する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation>管理者ノートを見る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <source>This user does not exist.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>%1のゲーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>BAN履歴</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>BAN回数;モデレーター;BAN期間;BAN理由;可視理由</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>ユーザーはBANされていません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation>BAN情報の収集に失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>警告履歴</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>警告回数;モデレーター;ユーザー名;理由</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>ユーザーは警告されていません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation>警告情報の収集に失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation>管理者ノートの取得に失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>ユーザーを昇格しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>ユーザーを降格しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>昇格に失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>降格に失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation>クリップボードにハッシュをコピー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation>このユーザーのメッセージを削除</translation>
     </message>
@@ -9297,173 +8119,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>現在地:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>アカウント年齢:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>パスワード変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>アバター変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>管理者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>モデレーター</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>登録ユーザー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>未登録ユーザー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation>ジャッジ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>不明</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation>入力されたパスワードはアカウントと一致しません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>ユーザー情報が更新されました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation>ユーザー情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation>本名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation>ユーザー種別:</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation><numerusform>%n年</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation><numerusform>%10%n日%20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>パスワードを入力</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation>メールアドレスを変更するには、パスワード認証が必要です</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation>ユーザー情報の更新中にエラーが発生しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>このサーバーはユーザーの情報を更新することができません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>パスワードが変更されました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>このサーバーはパスワードを変更することができません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>新しいパスワードが短すぎます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>前のパスワードが一致しませんでした。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>アバターを更新しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>このサーバーはアバターを更新することができません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>アバターの更新中にエラーが発生しました。</translation>
     </message>
@@ -9471,152 +8293,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <source>General interface settings</source>
         <translation>インターフェース全般設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation>通知設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <source>Enable notifications in taskbar</source>
         <translation>タスクバーの通知を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation>アニメーション設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <source>&amp;Tap/untap animation</source>
         <translation>タップ/アンタップアニメーション</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="887"/>
         <source>Deck editor/storage settings</source>
         <translation>デッキエディタ/ストレージ設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation>リプレイ設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9624,241 +8431,86 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation>ユーザーがサーバーに接続: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation>ルームのユーザー数: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation>フレンドオンライン: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation>無視ユーザーオンライン: %1 / %2</translation>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9866,27 +8518,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9894,7 +8546,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/client/ui/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 +8554,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9922,37 +8574,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9960,93 +8602,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10054,25 +8648,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation>データベース内で最も近いものを検索し（自動提案付き）、Enter キーを押すと、優先印刷がデッキに追加されます。</translation>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation>デッキストレージ</translation>
     </message>
@@ -10080,52 +8695,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10133,7 +8743,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10141,22 +8751,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation>デッキ名順</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation>ファイル名順</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation>更新日順</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation>最近使った順</translation>
     </message>
@@ -10164,17 +8774,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation>データベースをロード中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10182,43 +8792,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>どの警告を送信しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>すべてのルームでこのユーザーからのすべてのメッセージを編集します</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>不正行為をユーザーに警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>ユーザー名は空欄に出来ません。有効なユーザー名を選択して下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>警告は空欄に出来ません。有効な警告を選択して下さい。</translation>
     </message>
@@ -10226,133 +8836,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation>初期順に戻す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Enable all sets</source>
         <translation>すべてのセットを有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="113"/>
         <source>Disable all sets</source>
         <translation>すべてのセットを無効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation>デッキエディター</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation>カードアート</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation>ヒント</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation>注意</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation>セットを管理</translation>
     </message>
@@ -10360,72 +8970,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>タイプ別に重ねて表示</translation>
     </message>
@@ -10433,7 +9043,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>日本語 (Japanese)</translation>
     </message>
@@ -10441,12 +9051,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation>起動時に接続</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -10454,1058 +9064,991 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>メインウィンドウ</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>デッキエディター</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>ゲームロビー</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>パワーとタフネス</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>フェイズ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>プレイエリア</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation>選択中のカードを移動</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>場を見る</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation>一番上のカードを移動</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation>一番下のカードを移動</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>ゲームプレイ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation>ドロー</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation>チャットルーム</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation>ゲームウィンドウ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation>クリップボードからデッキを開く</translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation>リプレイ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation>タブ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation>カードデータベース更新...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation>接続...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>切断</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>終了</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>フルスクリーン</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation>ユーザー登録...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation>設定...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation>ローカルゲームを開始...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation>リプレイを見る...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation>デッキを分析 (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation>デッキを分析 (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation>全フィルタ解除</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation>選択したフィルタを解除</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation>カードを取り除く</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation>セットを管理...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation>カスタムトークンを編集...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation>カードを追加</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation>デッキを開く...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation>クリップボードからデッキを開く...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation>新しいデッキ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation>カスタム画像フォルダを開く</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation>デッキを印刷...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation>カードを削除</translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation>レイアウトをリセット</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>デッキを保存</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation>名前を付けて保存...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation>クリップボードにデッキをコピー</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation>クリップボードにデッキをコピー（セット情報なし）</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation>デッキ読み込み...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation>サーバーのデッキを開く...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation>準備完了する</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation>サイドボードロックの切り替え</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation>緑カウンターを置く</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation>緑カウンターを取り除く</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation>緑カウンターの数を決める...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation>赤カウンターを置く</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation>赤カウンターを取り除く</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation>赤カウンターの数を決める...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation>ライフを得る</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation>ライフを失う</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation>ライフ総量を決める...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation>白カウンターを置く</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation>白カウンターを取り除く</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>アンタップ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>アップキープ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>ドロー</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation>戦闘前メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>攻撃</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>ブロック</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>ダメージ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation>戦闘後メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>エンド</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation>次のフェイズ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation>処理しながら次のフェイズ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
-        <translation>次のターン</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation>タップ / アンタップ</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
-        <translation>カードをプレイ</translation>
-    </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
-        <translation>カードをコピー</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
-        <translation>トークンを生成する...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
+        <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
-        <source>Bottom of Library</source>
-        <translation>ライブラリーの一番下</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
-        <translation>ライブラリーの一番上</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
-        <translation>戦場</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>自分のライブラリー</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>サイドボード</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <source>Stack</source>
-        <translation>スタック</translation>
+        <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
-        <translation>ゲームから退出</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>投了</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>マリガン</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
-        <translation>更新</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_ko.ts b/cockatrice/translations/cockatrice_ko.ts
index 5ec1dac77..f4c054464 100644
--- a/cockatrice/translations/cockatrice_ko.ts
+++ b/cockatrice/translations/cockatrice_ko.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>카운터 설정...</translation>
     </message>
@@ -10,25 +10,25 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
-        <translation>카운터 설정</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
-        <translation>카운터 &apos;%1&apos;의 값을 지정해 주세요:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,81 +36,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -118,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -131,312 +129,251 @@ 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"/>
-        <source> seconds</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
+        <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
-        <source>Error</source>
-        <translation>오류</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>테마 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>현재 테마:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>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/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation>카드 렌더링</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
         <translation>손 레이아웃</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <source>Enable left justification</source>
         <translation>손의 카드를 좌측으로 정렬</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <source>Table grid layout</source>
         <translation>테이블 격자 레이아웃</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="692"/>
         <source>Invert vertical coordinate</source>
         <translation>전장의 상하배치를 전환 (대지를 앞에 배치)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>카드 정보에 표시할 폰트의 최대 크기:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>사용자 계정 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>IP 주소 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>클라이언트 ID 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>추방 유형</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>영구 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>기간제 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>일:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>시간:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>분:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>추방 기간</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>추방 사유를 적어주세요.
 해당 사유는 관리자들만 볼 수 있고 추방 당한 사용자는 볼 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>추방된 사용자가 보게 될 추방 사유를 적어주세요.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>확인</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>사용자를 서버에서 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>추방의 유형을 선택해 주세요.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>사용자명 추방을 하기 위해선 사용자명을 입력하셔야 합니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>아이피 추방을 하기 위해선 아이피 주소를 입력하셔야 합니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>클라이언트 ID 추방을 하기 위해선 클라이언트 ID를 입력하셔야 합니다.</translation>
     </message>
@@ -444,22 +381,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -467,32 +404,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>카드 이름</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>확장판</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>마나 비용</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>카드 유형</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>공/방</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>색(들)</translation>
     </message>
@@ -500,101 +437,96 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
-        <translation>카드 이름</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
-        <translation>색</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
-        <translation>마나 비용</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
-        <translation>마나 값이</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
-        <translation>공격력</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
-        <translation>방어력</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
-        <translation>충성도</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -602,22 +534,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +557,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -648,294 +580,172 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>다른 영역으로 이동:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>공격력 / 방어력 설정</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>자신의 손</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1의 손</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>자신의 서고</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1의 서고</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>자신의 서고에서</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1의 서고에서</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>자신의 서고</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1의 서고</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>자신의 서고</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>%1의 서고</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>자신의 서고</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1의 서고</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>자신의 무덤</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1의 무덤</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>자신의 추방 영역</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1의 추방 영역</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>자신의 사이드보드</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1의 사이드보드</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>자신의 사이드보드</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1의 사이드보드</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -944,7 +754,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -952,60 +762,15 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1013,47 +778,47 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,97 +826,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +914,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1177,114 +932,109 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1042,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,227 +1050,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
-        <translation>성공</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
-        <translation>오류</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <source>Add URL</source>
-        <translation>URL 추가</translation>
+        <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <source>URL:</source>
-        <translation>URL:</translation>
+        <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
-        <translation>URL 수정</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
-        <translation>새 URL 추가</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
-        <translation>URL 제거</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>카드 장수</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>카드 이름</translation>
     </message>
@@ -1528,12 +1245,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,17 +1258,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,7 +1276,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,62 +1284,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,166 +1347,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>서버로부터 받은 응답을 해석할 수 없었습니다.</translation>
     </message>
@@ -1813,58 +1472,54 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
+        <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
-        <source>Ready to start</source>
-        <translation>시작 준비</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
-        <translation>사이드보드 카드 교체 가능</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
-        <translation>사이드보드 카드 교체 불가능</translation>
+        <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1872,19 +1527,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1892,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
-        <translation>다운로드중...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>기록한 호스트</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>새로운 서버</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>호스트명:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>호스트 IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>포트:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>사용자명:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>비밀번호:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>비밀번호 저장</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>자동연결</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>코카트리스를 실행할 때 최근에 로그인한 서버로 연결합니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>서버</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>로그인</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>사용자명은 비어있을 수 없습니다.</translation>
     </message>
@@ -2041,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>설정 기억하기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>게임 이름:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>게임 참가 인원:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>게임 종류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>비밀번호:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>친구만 입장 가능</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>서버에 가입한 사용자만 입장 가능</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>입장 제한</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>관전자 허용</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>관전자 입장 시 비밀번호 필요</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>관전자 대화 가능</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>관전자에게 플레이어의 손 공개</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>관전자</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>설정 초기화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>게임 만들기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>게임 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>서버 오류.</translation>
     </message>
@@ -2164,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>토큰 이름:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>토큰</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>토큰 색:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>백색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>청색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>흑색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>적색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>녹색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>다색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>무색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>공/방</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>주석:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>토큰이 전장을 떠나면 게임에서 제거됨</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>토큰 정보</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>모든 토큰 보기</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>이 덱에서 사용하는 토큰 보기</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>목록에서 토큰 선택</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>토큰 생성</translation>
     </message>
@@ -2262,53 +1907,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2316,40 +1961,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>이미지 없음</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>아바타를 변경하려면 새로운 이미지 파일을 선택하여 주십시오.
 현재 아바타를 삭제하시려면 이미지를 선택하지 않고 확인을 하시면 됩니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>찾아보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>아바타 변경</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>이미지 불러오기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>이미지 파일 (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>잘못된 이미지를 선택하셨습니다.</translation>
     </message>
@@ -2357,17 +2002,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2375,38 +2020,38 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>예전 비밀번호:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>새로운 비밀번호:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>새로운 비밀번호 확인:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>비밀번호 변경</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>새로운 비밀번호가 일치하지 않습니다.</translation>
     </message>
@@ -2414,93 +2059,93 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>토큰 이름:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>토큰 색:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>백색</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>청색</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>흑색</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>적색</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>녹색</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>다색</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>무색</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>공/방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>주석:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>토큰 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>토큰 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>토큰 삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>토큰의 이름을 입력해 주세요.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation type="unfinished"/>
@@ -2509,27 +2154,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>이메일:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>국가:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>미지정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>본명:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>사용자 프로필 변경</translation>
     </message>
@@ -2537,143 +2182,137 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
-        <translation>5 분</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
-        <translation>10 분</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
-        <translation>30 분</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
-        <translation>1 시간</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
-        <translation>2 시간</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>게임 이름:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>방장 이름:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
-        <translation>일반</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>게임 종류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>최소 참가 인원:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>최대 참가 인원:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>최대 플레이어 인원</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
-        <translation>관전자</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>게임 필터</translation>
     </message>
@@ -2681,52 +2320,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
-        <translation>호스트:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
-        <translation>포트:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
-        <translation>사용자명:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
-        <translation>이메일:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2734,37 +2373,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
-        <translation>호스트:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
-        <translation>포트:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
-        <translation>사용자명:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2772,94 +2411,94 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
-        <translation>호스트:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
-        <translation>포트:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
-        <translation>사용자명:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
-        <translation>토큰:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
-        <translation>새로운 비밀번호:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
-        <translation>사용자명은 비어있을 수 없습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
-        <translation>오류</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
-        <translation>비밀번호가 일치하지 않습니다.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -2867,146 +2506,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>클립보드의 덱 리스트를 읽어올 수 없습니다.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>덱 불러오기</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3014,91 +2570,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>호스트 IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>포트:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>사용자명:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>비밀번호:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>비밀번호 확인:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>이메일:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>이메일 확인:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>국가:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>미지정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>실명:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>서버에 가입</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>가입 실패</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>입력된 비밀번호가 서로 다릅니다. 다시 시도하여 주십시오.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>입력된 이메일이 서로 다릅니다. 다시 시도하여 주십시오.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>사용자명은 비어있을 수 없습니다.</translation>
     </message>
@@ -3106,17 +2662,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -3124,55 +2680,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3189,7 +2730,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3206,7 +2747,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2756,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3224,7 +2765,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3233,7 +2774,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3242,61 +2783,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>환경설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>일반</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>외형</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>인터페이스</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>소리</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>단축키</translation>
     </message>
@@ -3304,39 +2845,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3344,17 +2885,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
-        <translation>다음</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
-        <translation>이전</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
@@ -3362,165 +2903,168 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>재설치</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>다운로드 취소</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>다운로드 페이지 열기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
-        <translation>코카트리스가 SSL 지원 없이 컴파일되어 자동 업데이트를 할 수 없습니다.
-공식 홈페이지에서 수동으로 다운 받아주세요.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
-        <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
+        <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>업데이트 확인중...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice는 최신 버젼입니다!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>현재 버젼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>새로운 버젼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>변경점</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>업데이트 하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>업데이트 오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>설치중...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>다운로드 위치</translation>
     </message>
@@ -3528,162 +3072,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>디버그 로그</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3691,47 +3103,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3739,44 +3151,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3784,7 +3190,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation type="unfinished"/>
     </message>
@@ -3792,325 +3198,244 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>해당 게임이 열려있는 채널에 먼저 들어가시기 바랍니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>잘못된 비밀번호를 입력하셨습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>관전이 허용되지 않은 게임입니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>게임 인원이 전부 찼습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>게임이 더 이상 존재하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>서버에 가입한 사용자만 참가 할 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>방장의 친구 목록에 등록된 사용자만 참가 할 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>방장이 당신을 차단하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>게임 참가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>비밀번호:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>해당 게임이 열려있는 채널에 먼저 들어가시기 바랍니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>게임 필터</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>필터 해제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>게임 생성</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>게임 참가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>관전자로 참가하기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>게임 목록</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
-        <translation>&gt;1 일</translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>비밀번호 필요</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>친구만</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>가입한 사용자 전용</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>관전자 대화 가능</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>손 공개</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>관전자에게 손 공개</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>허용 안됨</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>게임</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>게임 이름</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>방장</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>입장 제한</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>플레이어</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>관전자</translation>
     </message>
@@ -4118,609 +3443,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>서버가 꽉 찼습니다. 나중에 다시 접속하여 주십시오.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>해당 IP주소에서 동시에 연결된 회선이 너무 많습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>관리자에 의해 서버에서 추방 당하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>예상 추방 종료 시간: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>영구적 추방입니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>정기 점검 중입니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>잘못된 사용자명입니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>다른 장소에서 로그인하여 접속이 해제되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>서버와의 연결이 끊어졌습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>서버에서 연결을 끊었습니다.
 사유: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4729,359 +3650,368 @@ Reason for shutdown: %1</source>
 서버 재시작 사유: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>정기 점검</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>성공</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>가입이 승인되었습니다.
 로그인합니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>계정이 활성화 되었습니다.
 로그인합니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>플레이어 인원</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>최대 플레이어 인원을 입력해 주세요.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>플레이어 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>리플레이 불러오기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>코카트리스에 관하여</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>코카트리스 홈페이지</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>현 프로젝트 매니저:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>전 프로젝트 매니저:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>개발진:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>기여자 목록</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>개발을 도와주세요!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>번역진:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
-        <translation>번역진:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>번역을 도와주세요!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation> 기술 지원:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>문제점 보고</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>문제 해결</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>자주 묻는 질문</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>서버 응답시간 초과</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>로그인 실패</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>잘못된 사용자명이나 비밀번호입니다.
 확인 후 다시 시도해 주세요.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>해당 사용자명으로 연결된 다른 세션이 있습니다.
 해당 세션을 종료 한 후에 다시 시도해 주세요.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>%1까지 추방 당하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>당신은 무기한 추방 당하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>본 서버는 가입이 필요합니다.
 지금 가입하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>계정 활성화</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
-        <translation>계정이 아직 활성화 되지 않았습니다.
-가입 시 기입한 메일 주소에서 계정 활성화 토큰을 확인하여 주십시오.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>알 수 없는 로그인 오류: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 대부분 클라이언트가 오래되어서 서버와 클라이언트가 말이 제대로 통하지 않을때 발생하는 문제입니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>사용자명은 다음 조건을 만족해야 합니다:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>%1에서 %2자 사이</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>소문자 사용 %1가능</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>불</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>대문자 사용 %1가능</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>숫자 사용 %1가능</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>다음 문장 부호를 사용 가능 :</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>첫 글자를 문장 부호로 입력 %1가능</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>사용자명에는 영어 대소문자, 숫자, _(밑줄), .(마침표)나 -(대쉬)만 사용하실 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>가입 실패</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>본 서버는 현재 가입을 받지 않습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>이미 존재하는 사용자명 입니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>사용 가능한 이메일 주소를 작성하셔야 합니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>비밀번호가 너무 짧습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>서버의 기술적 문제로 가입에 실패하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>가입 중 알 수 없는 오류 발생: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>계정 활성화 실패</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>소켓 오류: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>서버 버전이 클라이언트보다 오래되었습니다.
@@ -5089,7 +4019,7 @@ Local version is %1, remote version is %2.</source>
 클라이언트 버전 %1, 서버 버전 %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>코카트리스 클라이언트 버전이 오래되었습니다.
@@ -5097,316 +4027,316 @@ Local version is %1, remote version is %2.</source>
 클라이언트 버전 %1, 서버 버전 %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>%1로 연결 시도 중...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>서버 %1에 %2(으)로 가입 중...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>연결 안됨</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>연결됨, %1로 로그인 시도 중</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>서버로 연결</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>서버와의 연결 해제</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>오프라인 게임 시작</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>리플레이 재생</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>전체 화면</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>서버에 가입</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>환경설정</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>끝내기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>액션</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>코카트리스</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>커스텀 이미지 폴더 열기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>커스텀 셋 폴더 열기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>커스텀 셋/카드 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>도움말</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>코카트리스에 관하여</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>클라이언트 업데이트 확인</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>카드 데이터베이스</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>아니오</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>설정 열기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
         <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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>셋 보기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
-        <translation>환영합니다</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>알림</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,862 +4344,668 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/server/message_log_widget.cpp" line="160"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/server/message_log_widget.cpp" line="176"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="179"/>
+        <location filename="src/server/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="184"/>
+        <location filename="src/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>카드 한 장</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="305"/>
         <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation>게임이 시작되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>앞면</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>뒷면</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -6277,206 +5013,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>메세지:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation>대화 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <source>Custom alert words</source>
         <translation>키워드 알림</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1451"/>
         <source>Enable chat mentions</source>
         <translation>대화 중 본인의 사용자명 멘션 시 해당 문장을 강조</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1452"/>
         <source>Enable mention completer</source>
         <translation>멘션 자동완성 기능</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1453"/>
         <source>In-game message macros</source>
         <translation>게임 내 대화 매크로</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <source>Invert text color</source>
         <translation>문장 색 반전</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <source>(Color is hexadecimal)</source>
         <translation>(16진수 색상 코드)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>각 단어마다 스페이스바로 띄어써주세요. 문자 및 숫자만 가능합니다.</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -6484,17 +5177,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -6502,62 +5195,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -6565,57 +5258,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>종료단</translation>
     </message>
@@ -6623,213 +5316,703 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>ko</translation>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>서고 맨 위 카드 공개</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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
+        <translation>카드 장수 (최대 %1장):</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>무덤 보기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>추방 영역 보기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>플레이어 &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>무덤</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>추방 영역</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>손의 카드 전부 이동:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>서고 맨 위</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>서고 맨 아래</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>무덤의 카드 전부 이동:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>손</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>추방 영역의 카드 전부 이동:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>서고 보기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>서고 맨 위 X장 보기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>서고 공개:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>서고 맨 위 카드 항상 공개</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>사이드보드 보기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>카드 뽑기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>카드 X장 뽑기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>마지막으로 뽑은 카드 서고에 돌려놓기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>멀리건</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>서고 맨 위 카드를 뒷면으로 발동</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>맨 위 X장의 카드를 무덤으로 이동</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>서고 맨 위 X장의 카드를 추방</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>서고 맨 위 카드를 맨 아래로 내리기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>손의 카드 전부 공개:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>손에서 무작위 카드 공개:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>사이드보드</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>서고</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>카운터</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>모든 지속물 언탭</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>주사위 굴리기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>토큰 생성</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>같은 종류의 토큰 추가 생성</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>미리 지정된 토큰 생성</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>모든 플레이어</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>말하기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>발동</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>숨기기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>뒷면으로 발동</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>언탭단에서의 언탭 여부 변경</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>카드 앞면 보기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>카드 복제</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>다른 카드에 부착</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>카드에서 떼어냄</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>화살표 그리기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>공격력 증가</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>공격력 감소</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>방어력 증가</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>방어력 감소</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>공격력 및 방어력 증가</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>공격력 및 방어력 감소</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>공격력 및 방어력 설정</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>카드 주석 설정</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>&amp;카운터 추가 (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;카운터 제거 (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>&amp;카운터 설정 (%1)...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>서고 맨 위 X장 보기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
         <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.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <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.cpp" line="3188"/>
         <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.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>카드 X장 뽑기</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>원하는 숫자:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>맨 위 카드 X장을 무덤으로 이동</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>맨 위 카드 X장을 추방</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation>토큰 생성</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <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.cpp" line="3534"/>
         <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.cpp" line="3653"/>
         <source>Set annotation</source>
-        <translation type="unfinished"/>
+        <translation>주석 설정</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player.cpp" line="3654"/>
         <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
+        <translation>새로운 주석을 입력해 주세요:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <source>Set counters</source>
-        <translation type="unfinished"/>
+        <translation>카운터 설정</translation>
     </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <source>&amp;Counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingDisabledInfoWidget</name>
-    <message>
-        <location filename="src/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>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</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/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>토큰:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>모든 토큰</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6837,7 +6020,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"/>
     </message>
@@ -6845,17 +6028,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6863,132 +6046,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>서비스</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>%1 가리기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>기타 가리기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>모두 보기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>환경설정...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>%1 종료</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>%1에 관하여</translation>
     </message>
@@ -6996,162 +6113,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>코카트리스 카드 데이터베이스 파일 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>모든 파일 (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>코카트리스 리플레이 파일 (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
-        <translation>메인 덱</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
-        <translation>사이드보드</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
-        <translation>토큰</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -7159,17 +6249,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>덱 이름</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>업로드 시간</translation>
     </message>
@@ -7177,149 +6267,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>게임 이름</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>플레이어</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>보존</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>게임 시작 시간</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>게임 길이</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>채널 목록</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>채널에 참가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>게임</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>설명</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>권한</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>플레이어</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation type="unfinished"/>
     </message>
@@ -7327,27 +6371,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>활성화</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>확장판 종류</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>확장판 약자</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>확장판 이름</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>발매 일자</translation>
     </message>
@@ -7355,53 +6399,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7409,12 +6453,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -7422,13 +6466,13 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -7437,58 +6481,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>서버 종료 사유:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>서버 종료까지 남은 시간(분):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>서버 종료</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <source>Enable &amp;sounds</source>
         <translation>음향 효과 켜기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Current sounds theme:</source>
         <translation>현재 소리 테마:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Test system sound engine</source>
         <translation>시스템 사운드 엔진 테스트</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation>음향 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>주 음량</translation>
     </message>
@@ -7496,48 +6527,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -7545,27 +6576,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -7573,17 +6604,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -7591,289 +6622,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>관리자 메뉴</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>서버 공지사항 작성</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>서버 종료</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>설정 새로고침</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>서버 관리 기능</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>기능 잠금 해제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>기능 잠금</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation>카드 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>덱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>카드 필터</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>&amp;보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>표시</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>띄우기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
         <translation>화면 레이아웃 초기화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>덱 편집기: %1</translation>
     </message>
@@ -7881,55 +6789,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7937,22 +6858,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7960,139 +6881,139 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>로컬 파일 시스템</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>서버 덱 보관함</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>덱 편집기로 열기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>덱 업로드</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>덱 다운로드</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>새 폴더</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>덱 이름 작성</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>이 덱리스트는 이름이 없습니다.
 이름을 입력해 주세요:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>이름 없는 덱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>로컬 파일 삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>새 폴더의 이름:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8100,17 +7021,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8118,7 +7039,7 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8126,391 +7047,407 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation>리플레이 타임라인</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>단계</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>게임</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <source>Next &amp;phase</source>
         <translation>다음 단계로 진행</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <source>Next &amp;turn</source>
         <translation>턴 넘기기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="236"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <source>Game &amp;information</source>
         <translation>게임 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation>항복</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <source>&amp;Leave game</source>
         <translation>게임 나가기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="260"/>
         <source>C&amp;lose replay</source>
         <translation>리플레이 닫기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="263"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>말하기:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>&amp;보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>표시</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>띄우기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation>레이아웃 초기화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>항복</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation>게임 나가기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation>너무 빨리 말하고 있습니다. 조금만 기다려 주십시오.</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>게임 호스트 또는 조정자에 의해 퇴장당했습니다</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>플레이어가 게임을 나갔습니다</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>플레이어가 서버와의 연결을 끊었습니다.</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>게임에서 강제 퇴장 당하였습니다.</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>기록</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>게임 기록</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>대화 기록</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>최소한 한 개 이상의 필터를 선택해주세요.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>사용자명:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>IP 주소:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>게임 이름:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>게임 ID:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>메세지:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>대화 채널</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>게임 방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>1:1 대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>~일 전:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>오늘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>1시간 이내</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>최소한 한개 이상의 필터를 지정해주세요.
 자세히 지정하시면 좀 더 세분화된 결과를 보실 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>필터</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -8518,37 +7455,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>1:1 대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>나가기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - 1:1 대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1이(가) 서버와의 연결을 끊었습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1이(가) 서버에 연결하였습니다.</translation>
     </message>
@@ -8556,185 +7493,105 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>로컬 파일 시스템</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>서버 리플레이 보관함</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>리플레이 보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>리플레이 다운로드</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>자동 삭제 여부 토글</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>로컬 파일 삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>서버에 저장된 리플레이 삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -8742,47 +7599,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>말하기:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>채널</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>채널에서 나가기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>대화 내용 삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>대화 설정...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation>이(가) 당신에게 멘션을 보냈습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>여기를 눌러 확인</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>너무 빨리 말하고 있습니다. 조금만 기다려 주세요.</translation>
     </message>
@@ -8790,35 +7647,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>서버</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -8826,98 +7683,88 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>확실하십니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>참가 중인 게임이 있습니다. 
 정말로 코카트리스를 종료하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8925,32 +7772,32 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>승급</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>경고</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>운영진으로부터 %1의 사유로 경고를 받았습니다.
@@ -8958,7 +7805,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 문의사항은 관리자에게 1:1대화로 물어보시기 바랍니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"/>
@@ -8967,12 +7814,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -8980,13 +7822,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>에러</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation type="unfinished"/>
     </message>
@@ -8994,13 +7836,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"/>
@@ -9009,42 +7851,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -9052,7 +7894,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
@@ -9060,206 +7902,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>사용자 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>1:1 대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>이 사용자의 게임 보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>친구 목록에 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>친구 목록에서 삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>차단 목록에 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>차단 목록에서 제거</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>게임에서 강제 퇴장</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>서버에서 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>사용자를 관리자로 승급</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>사용자를 관리자로부터 강등</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <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 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 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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>%1의 게임</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>경고를 받은 적이 없는 사용자입니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>성공</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>해당 사용자 승급에 성공하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>해당 사용자 강등에 성공하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>실패</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>해당 사용자 승급에 실패하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>해당 사용자 강등에 실패하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -9267,173 +8087,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>거주지:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>계정 나이:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>프로필 수정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>비밀번호 변경</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>아바타 변경</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>운영자</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>관리자</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>서버에 가입한 사용자</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>서버에 가입하지 않은 사용자</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>미상</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>사용자 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>사용자 정보가 갱신되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>본 서버는 당신의 사용자 정보를 수정 할 수 없게 설정되어 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>비밀번호가 변경되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>본 서버는 당신의 비밀번호를 수정 할 수 없게 설정되어 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>새로운 비밀번호가 너무 짧습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>예전 비밀번호가 잘못되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>아바타를 변경하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>본 서버는 당신의 아바타를 변경 할 수 없게 설정되어 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>아바타 변경 중 오류가 발생하였습니다.</translation>
     </message>
@@ -9441,152 +8261,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <source>General interface settings</source>
         <translation>일반 인터페이스 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <source>Enable notifications in taskbar</source>
         <translation>상태 표시줄 알림 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation>애니메이션 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <source>&amp;Tap/untap animation</source>
         <translation>탭/언탭 애니메이션</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9594,241 +8399,86 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9836,27 +8486,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9864,7 +8514,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/client/ui/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 +8522,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9892,37 +8542,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9930,93 +8570,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10024,25 +8616,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10050,52 +8663,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10103,7 +8711,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10111,22 +8719,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10134,17 +8742,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10152,43 +8760,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>어떤 종류의 경고를 보내시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>확인</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>사용자의 부적절한 행동에 경고</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"/>
     </message>
@@ -10196,133 +8804,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Enable all sets</source>
         <translation>모든 확장판 활성화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="113"/>
         <source>Disable all sets</source>
         <translation>모든 확장판 비활성화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation>덱 편집기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation>카드 이미지</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10330,72 +8938,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>카드 유형별 행 정렬</translation>
     </message>
@@ -10403,7 +9011,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>한국어 (Korean)</translation>
     </message>
@@ -10411,12 +9019,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -10424,1058 +9032,991 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>메인 화면</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>덱 편집기</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>게임 로비</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>공격력 및 방어력</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>턴 단계</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>전장</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>보기</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>게임플레이</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>서버와의 연결 해제</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>끝내기</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>전체 화면</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>덱 닫기</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>언탭단</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>유지단</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>뽑기단</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>공격자 선언단</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>방어자 선언단</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>전투 피해단</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>종료단</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>서고</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>사이드보드</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>항복</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>멀리건</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_nb.ts b/cockatrice/translations/cockatrice_nb.ts
index 5c6103c6e..9466c26f3 100644
--- a/cockatrice/translations/cockatrice_nb.ts
+++ b/cockatrice/translations/cockatrice_nb.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Sett teller …</translation>
     </message>
@@ -10,435 +10,208 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="199"/>
         <source>Set counter</source>
         <translation>Sett teller</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Ny verdi for teller &apos;%1&apos;:</translation>
     </message>
 </context>
-<context>
-    <name>AbstractDlgDeckTextEdit</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
-        <source>&amp;Refresh</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
-        <source>Parse Set Name and Number (if available)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AbstractTabDeckEditor</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="247"/>
-        <source>Open in new tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
-        <source>Are you sure?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
-        <source>The decklist has been modified.
-Do you want to save the changes?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <source>Could not open deck at %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <source>Could not save remote deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
-        <source>The deck could not be saved.
-Please check that the directory is writable and try again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
-        <source>Save deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <source>The deck could not be saved.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <source>There are no cards in your deck to be exported</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdminNotesDialog</name>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
-        <source>Update Notes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
-        <source>Admin Notes for %1</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AllZonesCardAmountWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
-        <source>Mainboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
-        <source>Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="408"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="408"/>
         <source>Could not create themes directory at &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="414"/>
         <source>Theme settings</source>
         <translation>Temainnstillinger</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="415"/>
         <source>Current theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="416"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Menu settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <source>Show keyboard shortcuts in right-click menus</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="418"/>
         <source>Card rendering</source>
         <translation>Korttegning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="419"/>
         <source>Display card names on cards having a picture</source>
         <translation>Vis navn på kort med bilde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>Auto-Rotate cards with sideways layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
-        <source>Bump sets that the deck contains cards from to the top in the printing selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="420"/>
         <source>Scale cards on mouse over</source>
         <translation>Forstørr kort når muspekeren er over</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Use rounded card corners</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="422"/>
         <source>Minimum overlap percentage of cards on the stack and in vertical hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
-        <source>Maximum initial height for card view window:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
-        <source> rows</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
-        <source>Maximum expanded height for card view window:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
-        <source>Card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
-        <source>Counter %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="424"/>
         <source>Hand layout</source>
         <translation>Håndlayout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="425"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Vis hånden horisontalt (bruker unødig mye plass)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="426"/>
         <source>Enable left justification</source>
         <translation>Venstrejuster tekst</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="428"/>
         <source>Table grid layout</source>
         <translation>Ruteoppsett for bord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="429"/>
         <source>Invert vertical coordinate</source>
         <translation>Snu vertikale koordinater opp-ned</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="430"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Minste antall spillere for fler-kolonne-visning:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="431"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/server/user/user_list.cpp" line="37"/>
         <source>ban &amp;user name</source>
         <translation>sperr &amp;brukernavn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/server/user/user_list.cpp" line="41"/>
         <source>ban &amp;IP address</source>
         <translation>sperr &amp;IP-adresse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/server/user/user_list.cpp" line="45"/>
         <source>ban client I&amp;D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list.cpp" line="59"/>
         <source>Ban type</source>
         <translation>Sperretype</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/server/user/user_list.cpp" line="62"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;permanent sperre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/server/user/user_list.cpp" line="63"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;midlertidig sperre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/server/user/user_list.cpp" line="66"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dager:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/server/user/user_list.cpp" line="72"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Timer:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/server/user/user_list.cpp" line="78"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutter:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/server/user/user_list.cpp" line="93"/>
         <source>Duration of the ban</source>
         <translation>Lengde på sperre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <location filename="src/server/user/user_list.cpp" line="96"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Fyll inn grunn for sperre.
 Dette vises kun til moderatorer, og er ikke synlig for brukeren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <location filename="src/server/user/user_list.cpp" line="101"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Fyll inn grunn for sperre som vises til den sperrede brukeren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <location filename="src/server/user/user_list.cpp" line="104"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/server/user/user_list.cpp" line="106"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/server/user/user_list.cpp" line="109"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Avbryt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/server/user/user_list.cpp" line="128"/>
         <source>Ban user from server</source>
         <translation>Sperr bruker fra tjener</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <location filename="src/server/user/user_list.cpp" line="210"/>
+        <location filename="src/server/user/user_list.cpp" line="218"/>
+        <location filename="src/server/user/user_list.cpp" line="225"/>
+        <location filename="src/server/user/user_list.cpp" line="233"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <location filename="src/server/user/user_list.cpp" line="211"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list.cpp" line="219"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list.cpp" line="226"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <location filename="src/server/user/user_list.cpp" line="234"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
@@ -446,22 +219,22 @@ Dette vises kun til moderatorer, og er ikke synlig for brukeren.</translation>
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
-        <source>Beta</source>
+        <location filename="src/client/network/release_channel.cpp" line="206"/>
+        <source>Beta Releases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="232"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="241"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="274"/>
         <source>No reply received from the file update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -469,32 +242,32 @@ Dette vises kun til moderatorer, og er ikke synlig for brukeren.</translation>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="70"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="72"/>
         <source>Sets</source>
         <translation>Sett</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="74"/>
         <source>Mana cost</source>
         <translation>Mannakost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="76"/>
         <source>Card type</source>
         <translation>Korttype</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="78"/>
         <source>P/T</source>
         <translation>K/L</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="80"/>
         <source>Color(s)</source>
         <translation>Farge(r)</translation>
     </message>
@@ -502,910 +275,410 @@ Dette vises kun til moderatorer, og er ikke synlig for brukeren.</translation>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="7"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="9"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="11"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="13"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="23"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="src/game/filters/filter_card.cpp" line="25"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="27"/>
         <source>Color</source>
         <translation>Farge</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="29"/>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="31"/>
         <source>Set</source>
         <translation>Sett</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="33"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="35"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="37"/>
         <source>Rarity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="39"/>
         <source>Power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="41"/>
         <source>Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="43"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="45"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
-    <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
-    <name>CardInfoFrameWidget</name>
+    <name>CardFrame</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/game/cards/card_frame.cpp" line="65"/>
         <source>Image</source>
-        <translation type="unfinished"/>
+        <translation>Bilde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/game/cards/card_frame.cpp" line="66"/>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="71"/>
+        <location filename="src/game/cards/card_frame.cpp" line="67"/>
         <source>Both</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="74"/>
-        <source>View transformation</source>
-        <translation type="unfinished"/>
+        <translation>Begge</translation>
     </message>
 </context>
 <context>
-    <name>CardInfoPictureWidget</name>
+    <name>CardInfoText</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
-        <source>Add card to deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
-        <source>Mainboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
-        <source>Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CardInfoTextWidget</name>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/game/cards/card_info_text.cpp" line="40"/>
         <source>Name:</source>
-        <translation type="unfinished"/>
+        <translation>Navn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="76"/>
+        <location filename="src/game/cards/card_info_text.cpp" line="53"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/game/cards/card_info_text.cpp" line="70"/>
         <source>Unknown card:</source>
-        <translation type="unfinished"/>
+        <translation>Ukjent kort:</translation>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/cards/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Flytt til</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
-        <source>&amp;Tap / Untap</source>
-        <extracomment>Turn sideways or back again</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
-        <source>T&amp;urn Over</source>
-        <extracomment>Turn face up/face down</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/cards/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Kraft / liv</translation>
     </message>
 </context>
 <context>
-    <name>CardSizeWidget</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
-        <source>Card Size</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CardZoneLogic</name>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone.cpp" line="64"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone.cpp" line="64"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone.cpp" line="69"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone.cpp" line="72"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone.cpp" line="75"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="77"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="77"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone.cpp" line="79"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone.cpp" line="79"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone.cpp" line="82"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone.cpp" line="82"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="84"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="84"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone.cpp" line="89"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone.cpp" line="92"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
-        <source>their custom zone &apos;%1&apos;</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
-        <source>%1&apos;s custom zone &apos;%2&apos;</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CockatriceXml3Parser</name>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
-        <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CockatriceXml4Parser</name>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
-        <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardInfoDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
-        <source>Card Info</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorDatabaseDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
-        <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
-        <source>Add card to &amp;maindeck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
-        <source>Add card to &amp;sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorDeckDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
-        <source>Banner Card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
-        <source>Mana Cost</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
-        <source>Colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
-        <source>Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
-        <source>Deck &amp;name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
-        <source>Banner Card/Tags Visibility Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
-        <source>Show banner card selection menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
-        <source>Show tags selection menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
-        <source>&amp;Comments:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
-        <source>Group by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
-        <source>Hash:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
-        <source>&amp;Increment number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
-        <source>&amp;Decrement number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
-        <source>&amp;Remove row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
-        <source>Swap card to/from sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorFilterDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
-        <source>&amp;Clear all filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
-        <source>Delete selected</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorMenu</name>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
-        <source>&amp;Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
-        <source>&amp;New deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
-        <source>&amp;Load deck...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
-        <source>Load recent deck...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
-        <source>Clear</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
-        <source>&amp;Save deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
-        <source>Save deck &amp;as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="159"/>
-        <source>Load deck from cl&amp;ipboard...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="161"/>
-        <source>Edit deck in clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
-        <source>Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
-        <source>Not Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
-        <source>Save deck to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
-        <source>Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
-        <source>Not Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="171"/>
-        <source>&amp;Print deck...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="173"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>&amp;Send deck to online service</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
-        <source>Create decklist (decklist.org)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
-        <source>Create decklist (decklist.xyz)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
-        <source>Analyze deck (deckstats.net)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
-        <source>Analyze deck (tappedout.net)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorPrintingSelectorDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
-        <source>Printing Selector</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="548"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="762"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="694"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="694"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="697"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="697"/>
         <source>One or more downloaded card pictures could not be cleared.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="704"/>
         <source>Add URL</source>
         <translation>Legg til URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="704"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="724"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="572"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="724"/>
         <source>Edit URL</source>
         <translation>Endre URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="568"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="576"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="751"/>
         <source>Updating...</source>
         <translation>Oppdaterer...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="781"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="807"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="808"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="809"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="810"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="811"/>
         <source>Last Change</source>
         <translation>Siste endring</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="812"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="813"/>
         <source>Press the button to manually update without relaunching</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="814"/>
         <source>Do not close settings until manual update is complete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="815"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="816"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="817"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="818"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="819"/>
+        <source>Downloaded images directory size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="820"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="821"/>
+        <source>Picture cache size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="822"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1413,238 +686,26 @@ Dette vises kun til moderatorer, og er ikke synlig for brukeren.</translation>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
-        <source>Count</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
-        <source>Set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="src/deck/deck_list_model.cpp" line="167"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
-        <source>Provider ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="src/deck/deck_list_model.cpp" line="169"/>
         <source>Card</source>
         <translation>Kort</translation>
     </message>
 </context>
-<context>
-    <name>DeckLoader</name>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
-        <source>Common deck formats (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
-        <source>All files (*.*)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewColorIdentityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
-        <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewDeckTagsDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
-        <source>Edit tags ...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewTagDialog</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
-        <source>Deck Tags Manager</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
-        <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
-        <source>Add a new tag (e.g., Aggro️)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
-        <source>Add Tag</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
-        <source>Filter tags...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
-        <source>Edit default tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
-        <source>Invalid Input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
-        <source>Tag name cannot be empty!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
-        <source>Duplicate Tag</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
-        <source>This tag already exists.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewWidget</name>
-    <message>
-        <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="320"/>
-        <source>Open in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
-        <source>Edit Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
-        <source>Rename Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
-        <source>Save Deck to Clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
-        <source>Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
-        <source>Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
-        <source>Not Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
-        <source>Not Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
-        <source>Rename File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
-        <source>Delete File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
-        <source>Set Banner Card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
-        <source>New name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <source>Rename failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
-        <source>Delete file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
-        <source>Are you sure you want to delete the selected file?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
-        <source>Delete failed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>Svaret fra tjeneren gir ikke mening.</translation>
     </message>
@@ -1652,243 +713,181 @@ Dette vises kun til moderatorer, og er ikke synlig for brukeren.</translation>
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="146"/>
         <source>Load deck...</source>
         <translation>Last inn kortstokk...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="147"/>
         <source>Load remote deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
-        <source>Load from clipboard...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
-        <source>Load from website...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="148"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
-        <source>Force start</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="163"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="165"/>
         <source>Sideboard locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
+        <source>Load deck</source>
+        <translation>Last inn kortstokk</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="287"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="287"/>
         <source>The selected file could not be loaded.</source>
         <translation>Den filen kan ikke lastes inn.</translation>
     </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
-        <source>Deck is greater than maximum file size.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
-        <source>Are you sure you want to force start?
-This will kick all non-ready players from the game.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
-        <source>Cockatrice</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DialogConvertDeckToCodFormat</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
-        <source>Deck Format Conversion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
-        <source>You tried to add a tag to a .txt format deck.
- Tags can only be added to .cod format decks.
- Do you want to convert the deck to the .cod format?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
-        <source>Remember and automatically apply choice in the future</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="79"/>
         <source>Downloading...</source>
         <translation>Laster ned...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="22"/>
         <source>Known Hosts</source>
         <translation>Kjente verter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
-        <source>Delete the currently selected saved server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="29"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="39"/>
         <source>New Host</source>
         <translation>Ny vert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="41"/>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="46"/>
         <source>&amp;Host:</source>
         <translation>&amp;Vert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="51"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="56"/>
         <source>Player &amp;name:</source>
         <translation>Spiller&amp;navn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="61"/>
         <source>P&amp;assword:</source>
         <translation>&amp;Passord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>&amp;Save password</source>
         <translation>&amp;Lagre passord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="69"/>
         <source>A&amp;uto connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="70"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Koble til den nyeste innloggingen automatisk når du åpner Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="85"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="264"/>
         <source>Webpage</source>
         <translation>Nettside</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="97"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
-        <source>Forgot password?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="101"/>
         <source>&amp;Connect</source>
         <translation>&amp;Koble til</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="124"/>
         <source>Server</source>
         <translation>Tjener</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="140"/>
         <source>Login</source>
         <translation>Logg inn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="143"/>
         <source>Server Contact</source>
         <translation>Kontakt med tjener</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="156"/>
         <source>Connect to Server</source>
         <translation>Koble til tjener</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="278"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="281"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="286"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="312"/>
         <source>Connection Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="312"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="328"/>
         <source>Connect Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="328"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Spillernavn kan ikke stå tomt</translation>
     </message>
@@ -1896,117 +895,102 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Beskrivelse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>Sp&amp;illere</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Spilleregler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Passord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Bare &amp;venner slipper inn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Bare &amp;registrerte brukere slipper inn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="79"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Begrens deltakere</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="82"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>Tillat &amp;tilskuere</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Tilskuere på ha &amp;passord for å se på</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Tilskuere kan p&amp;rate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Tilskuere kan se %begge spilleres hender</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Tilskuere</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="98"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="105"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="143"/>
         <source>&amp;Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="149"/>
         <source>Create game</source>
         <translation>Lag nytt spill</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="193"/>
         <source>Game information</source>
         <translation>Spilloppsett</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="275"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="275"/>
         <source>Server error.</source>
         <translation>Tjenerfeil</translation>
     </message>
@@ -2014,248 +998,171 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="30"/>
         <source>&amp;Name:</source>
         <translation>&amp;Navn</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>Token</source>
         <translation>Plassholder</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="37"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Farge</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="39"/>
         <source>white</source>
         <translation>hvit</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="40"/>
         <source>blue</source>
         <translation>blå</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="41"/>
         <source>black</source>
         <translation>sort</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>red</source>
         <translation>rød</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="43"/>
         <source>green</source>
         <translation>grønn</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>multicolor</source>
         <translation>flerfarget</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>colorless</source>
         <translation>fargeløs</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>&amp;P/T:</source>
         <translation>&amp;K/L:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;Annotation:</source>
         <translation>M&amp;erknad</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Slett plassholder når den forlater bordet</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
-        <source>Create face-down (Only hides name)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="72"/>
         <source>Token data</source>
         <translation>Plassholderinfo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="79"/>
         <source>Show &amp;all tokens</source>
         <translation>Vis alle plassholdere</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Vis alle plassoldere fra denne &amp;kortstokken</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="123"/>
         <source>Choose token from list</source>
         <translation>Velg plassholder fra liste</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="141"/>
         <source>Create token</source>
         <translation>Lag ny plassholder</translation>
     </message>
 </context>
-<context>
-    <name>DlgDefaultTagsEditor</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="45"/>
-        <source>Edit Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
-        <source>Add</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
-        <source>Confirm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
-        <source>Enter a tag and press Enter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
-        <source>✖</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
-        <source>Invalid Input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
-        <source>Tag name cannot be empty!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
-        <source>Duplicate Tag</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
-        <source>This tag already exists.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgEditDeckInClipboard</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
-        <source>Edit deck in clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
-        <source>Invalid deck list.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation type="unfinished"/>
     </message>
@@ -2263,93 +1170,93 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Navn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Farge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="34"/>
         <source>white</source>
         <translation>hvit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>blue</source>
         <translation>blå</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>black</source>
         <translation>sort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>red</source>
         <translation>rød</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>green</source>
         <translation>grønn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>multicolor</source>
         <translation>flerfarget</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>fargeløs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;K/L:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Merknad:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Plassholderinfo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="92"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Add token</source>
         <translation>Legg til plassholder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Fjern plassholder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Fyll inn navnet på plassholderen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="157"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="155"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="158"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation type="unfinished"/>
@@ -2358,27 +1265,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation type="unfinished"/>
     </message>
@@ -2386,142 +1293,132 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>no limit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>5 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>30 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="24"/>
         <source>1 hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>2 hours</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
-        <source>Hide &apos;buddies only&apos; games</source>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="27"/>
+        <source>Show &apos;&amp;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
-        <source>Hide full games</source>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="30"/>
+        <source>Show &amp;full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
-        <source>Hide games that have started</source>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="33"/>
+        <source>Show games &amp;that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
-        <source>Hide password protected games</source>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="36"/>
+        <source>Show &amp;password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
-        <source>Hide &apos;ignored user&apos; games</source>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="39"/>
+        <source>Hide &apos;&amp;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="47"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="52"/>
         <source>Game &amp;description:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="56"/>
         <source>&amp;Creator name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="66"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="82"/>
         <source>&amp;Game types</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="87"/>
         <source>at &amp;least:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;most:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="107"/>
         <source>Maximum player count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="117"/>
         <source>Restrictions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="120"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="124"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="128"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="171"/>
         <source>Filter games</source>
         <translation type="unfinished"/>
     </message>
@@ -2529,52 +1426,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2582,37 +1479,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2620,300 +1517,211 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="58"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="103"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="111"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="121"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="116"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="121"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="127"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="127"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeck</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
-        <source>Load Deck</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="19"/>
+        <source>&amp;Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Load deck from clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="70"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="70"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="26"/>
         <source>Load deck</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgMoveTopCardsUntil</name>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
-        <source>Card name (or search expressions):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
-        <source>Number of hits:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
-        <source>Auto play hits</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
-        <source>Put top cards on stack until...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
-        <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
-        <source>Cockatrice</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
-        <source>Invalid filter</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="318"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="353"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="373"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="373"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2921,58 +1729,30 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgSelectSetForCards</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
-        <source>Unmodified Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
-        <source>Modified Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
-        <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
-        <source>Clear all set information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
-        <source>Set all to preferred</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1414"/>
         <source>Unknown Error loading card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1422"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -2983,7 +1763,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1428"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -2994,7 +1774,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1434"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3003,21 +1783,21 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1440"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1444"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1448"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3026,117 +1806,77 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1456"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1466"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1476"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>The path to your deck directory is invalid. Would you like to go back and set the correct path?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1477"/>
         <source>The path to your card pictures directory is invalid. Would you like to go back and set the correct path?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1489"/>
         <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1491"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1492"/>
         <source>Appearance</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1493"/>
         <source>User Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1494"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1495"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1496"/>
         <source>Sound</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Shortcuts</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgStartupCardCheck</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
-        <source>Card Update Check</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
-        <source>It has been more than %2 days since you last checked your card database for updates.
-Choose how you would like to run the card database updater.
-You can always change this behavior in the &apos;General&apos; settings tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
-        <source>Run in foreground</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
-        <source>Run in background</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
-        <source>Run in background and always from now on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
-        <source>Don&apos;t prompt again and don&apos;t run</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
-        <source>Don&apos;t run this time</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
@@ -3144,164 +1884,164 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="26"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="35"/>
         <source>Reinstall</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Cancel Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Open Download Page</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="204"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="211"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="226"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="64"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
-        <source>Downloading update: %1</source>
+        <location filename="src/dialogs/dlg_update.cpp" line="95"/>
+        <source>Downloading update...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="112"/>
         <source>Checking for updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="123"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="138"/>
         <source>No Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>Cockatrice is up to date!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>Current version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="162"/>
         <source>Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>A new version of Cockatrice is available!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>New version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>Released</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Changelog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
         <source>Do you want to update now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
-        <source>Unfortunately, the automatic updater failed to find a compatible download. 
-You may have to manually download the new version.</source>
+        <location filename="src/dialogs/dlg_update.cpp" line="167"/>
+        <source>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
-        <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>
+        <location filename="src/dialogs/dlg_update.cpp" line="170"/>
+        <source>Please check the download page manually and visit the wiki for instructions on compiling.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="205"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="213"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="227"/>
         <source>Update Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="206"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="219"/>
         <source>Installing...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="228"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3309,292 +2049,126 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="19"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Debug Log</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
-        <source>In %1 decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
-        <source>%1% of %2 decks</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecApiResponseCardPricesDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
-        <source>Card Hoarder</source>
-        <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="58"/>
-        <source>Card Kingdom</source>
-        <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="59"/>
-        <source>Card Market</source>
-        <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"/>
-        <source>Face 2-Face</source>
-        <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="61"/>
-        <source>Mana Pool</source>
-        <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="62"/>
-        <source>MTG Stocks</source>
-        <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="63"/>
-        <source>Scg</source>
-        <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="64"/>
-        <source>Tcgl</source>
-        <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="65"/>
-        <source>Tcgplayer</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
-        <source>%1% Synergy</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
-        <source>Combos</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
-        <source>Average Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
-        <source>Salt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>FilterDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
-        <source>Confirm Delete</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
-        <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
-        <source>Delete Failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
-        <source>Failed to delete filter &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/game/game_selector.cpp" line="217"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="272"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/game/game_selector.cpp" line="217"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Wrong password.</source>
         <translation>Feil passord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Spectators are not allowed in this game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>The game is already full.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game does not exist any more.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>This game is only open to registered users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
-        <source>Join Game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
-        <source>Spectate Game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
-        <source>Game Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/game/game_selector.cpp" line="258"/>
         <source>Join game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/game/game_selector.cpp" line="258"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/game/game_selector.cpp" line="272"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/game/game_selector.cpp" line="315"/>
         <source>&amp;Filter games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/game/game_selector.cpp" line="316"/>
         <source>C&amp;lear filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="318"/>
         <source>C&amp;reate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>&amp;Join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/game/game_selector.cpp" line="320"/>
         <source>J&amp;oin as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/game/game_selector.cpp" line="341"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/game/game_selector.cpp" line="343"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
@@ -3602,105 +2176,100 @@ You may have to manually download the new version.</source>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/game/games_model.cpp" line="48"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/game/games_model.cpp" line="57"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="59"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/game/games_model.cpp" line="62"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/game/games_model.cpp" line="154"/>
         <source>password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/game/games_model.cpp" line="156"/>
         <source>buddies only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="155"/>
+        <location filename="src/game/games_model.cpp" line="158"/>
         <source>reg. users only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <location filename="src/game/games_model.cpp" line="190"/>
+        <location filename="src/game/games_model.cpp" line="195"/>
         <source>can chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>see hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/game/games_model.cpp" line="197"/>
         <source>can see hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/game/games_model.cpp" line="202"/>
         <source>not allowed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/game/games_model.cpp" line="220"/>
         <source>Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/game/games_model.cpp" line="224"/>
         <source>Age</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/game/games_model.cpp" line="232"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/game/games_model.cpp" line="234"/>
         <source>Creator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/game/games_model.cpp" line="236"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/game/games_model.cpp" line="238"/>
         <source>Restrictions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/game/games_model.cpp" line="242"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/game/games_model.cpp" line="250"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
@@ -3708,1241 +2277,804 @@ 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/dialogs/dlg_settings.cpp" line="138"/>
         <source>Reset all paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="140"/>
         <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/dialogs/dlg_settings.cpp" line="201"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="211"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="221"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="241"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="251"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="279"/>
         <source>Personal settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="280"/>
         <source>Language:</source>
         <translation>Språk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
         <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/dialogs/dlg_settings.cpp" line="285"/>
         <source>Paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
-        <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/dialogs/dlg_settings.cpp" line="288"/>
         <source>Decks directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
-        <source>Filters directory:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="289"/>
         <source>Replays directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="290"/>
         <source>Pictures directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="291"/>
         <source>Card database:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="292"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
         <source>Token database:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="294"/>
         <source>Update channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
-        <source>Check for client 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
-        <source>Don&apos;t check</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
-        <source>Prompt for update</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
-        <source>Check for card database updates every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
-        <source> days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="295"/>
         <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/dialogs/dlg_settings.cpp" line="296"/>
         <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/dialogs/dlg_settings.cpp" line="297"/>
         <source>Show tips on startup</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
-        <source>Last update check on %1 (%2 days ago)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <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="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>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="214"/>
-        <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>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="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="218"/>
-        <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>Move top cards to &amp;exile...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="221"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="224"/>
-        <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;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>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>Move bottom cards to &amp;graveyard...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="231"/>
-        <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>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="310"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
+        <location filename="src/client/ui/window_main.cpp" line="97"/>
+        <location filename="src/client/ui/window_main.cpp" line="444"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
+        <location filename="src/client/ui/window_main.cpp" line="100"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
+        <location filename="src/client/ui/window_main.cpp" line="103"/>
         <source>Banned by moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
+        <location filename="src/client/ui/window_main.cpp" line="106"/>
         <source>Expected end time: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
+        <location filename="src/client/ui/window_main.cpp" line="108"/>
         <source>This ban lasts indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
+        <location filename="src/client/ui/window_main.cpp" line="114"/>
         <source>Scheduled server shutdown.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
+        <location filename="src/client/ui/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="459"/>
         <source>Invalid username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="125"/>
         <source>Connection closed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
+        <location filename="src/client/ui/window_main.cpp" line="131"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
+        <location filename="src/client/ui/window_main.cpp" line="136"/>
         <source>Scheduled server shutdown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
+        <location filename="src/client/ui/window_main.cpp" line="175"/>
+        <location filename="src/client/ui/window_main.cpp" line="185"/>
         <source>Success</source>
         <translation>Suksess</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="175"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
+        <location filename="src/client/ui/window_main.cpp" line="185"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
+        <location filename="src/client/ui/window_main.cpp" line="219"/>
         <source>Number of players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
+        <location filename="src/client/ui/window_main.cpp" line="219"/>
         <source>Please enter the number of players.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <location filename="src/client/ui/window_main.cpp" line="238"/>
         <source>Player %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/client/ui/window_main.cpp" line="250"/>
         <source>Load replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/client/ui/window_main.cpp" line="307"/>
         <source>About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="309"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="310"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="310"/>
         <source>Project Manager:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="311"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="312"/>
         <source>Developers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="313"/>
         <source>Our Developers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="314"/>
         <source>Help Develop!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="315"/>
         <source>Translators:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="316"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="317"/>
         <source>Help Translate!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="317"/>
         <source>Support:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="318"/>
         <source>Report an Issue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/client/ui/window_main.cpp" line="320"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/client/ui/window_main.cpp" line="358"/>
+        <location filename="src/client/ui/window_main.cpp" line="386"/>
+        <location filename="src/client/ui/window_main.cpp" line="390"/>
+        <location filename="src/client/ui/window_main.cpp" line="403"/>
+        <location filename="src/client/ui/window_main.cpp" line="407"/>
+        <location filename="src/client/ui/window_main.cpp" line="411"/>
+        <location filename="src/client/ui/window_main.cpp" line="419"/>
+        <location filename="src/client/ui/window_main.cpp" line="424"/>
+        <location filename="src/client/ui/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="557"/>
+        <location filename="src/client/ui/window_main.cpp" line="561"/>
+        <location filename="src/client/ui/window_main.cpp" line="564"/>
+        <location filename="src/client/ui/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="588"/>
+        <location filename="src/client/ui/window_main.cpp" line="594"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
+        <location filename="src/client/ui/window_main.cpp" line="1199"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="358"/>
         <source>Server timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="377"/>
         <source>Failed Login</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="378"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
+        <location filename="src/client/ui/window_main.cpp" line="379"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
+        <location filename="src/client/ui/window_main.cpp" line="387"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
+        <location filename="src/client/ui/window_main.cpp" line="391"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
+        <location filename="src/client/ui/window_main.cpp" line="547"/>
         <source>You are banned until %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
+        <location filename="src/client/ui/window_main.cpp" line="399"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
         <source>You are banned indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
+        <location filename="src/client/ui/window_main.cpp" line="412"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
+        <location filename="src/client/ui/window_main.cpp" line="420"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="431"/>
         <source>Account activation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
+        <location filename="src/client/ui/window_main.cpp" line="432"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>Server Full</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Unknown login error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
+        <location filename="src/client/ui/window_main.cpp" line="566"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>Your username must respect these rules:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="464"/>
         <source>is %1 - %2 characters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="465"/>
         <source>can %1 contain lowercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
+        <location filename="src/client/ui/window_main.cpp" line="465"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
+        <location filename="src/client/ui/window_main.cpp" line="470"/>
+        <location filename="src/client/ui/window_main.cpp" line="476"/>
         <source>NOT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>can %1 contain uppercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="470"/>
         <source>can %1 contain numeric characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
+        <location filename="src/client/ui/window_main.cpp" line="473"/>
         <source>can contain the following punctuation: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
+        <location filename="src/client/ui/window_main.cpp" line="476"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
+        <location filename="src/client/ui/window_main.cpp" line="493"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
+        <location filename="src/client/ui/window_main.cpp" line="499"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
+        <location filename="src/client/ui/window_main.cpp" line="505"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="515"/>
+        <location filename="src/client/ui/window_main.cpp" line="519"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
+        <location filename="src/client/ui/window_main.cpp" line="531"/>
+        <location filename="src/client/ui/window_main.cpp" line="535"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>Registration denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
+        <location filename="src/client/ui/window_main.cpp" line="516"/>
         <source>Registration is currently disabled on this server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
+        <location filename="src/client/ui/window_main.cpp" line="520"/>
         <source>There is already an existing account with the same user name.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
+        <location filename="src/client/ui/window_main.cpp" line="524"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
+        <location filename="src/client/ui/window_main.cpp" line="536"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>Password too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="561"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>Unknown registration error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="574"/>
         <source>Account activation failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="581"/>
         <source>Socket error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
+        <location filename="src/client/ui/window_main.cpp" line="589"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
+        <location filename="src/client/ui/window_main.cpp" line="605"/>
         <source>Connecting to %1...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
         <source>Registering to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
+        <location filename="src/client/ui/window_main.cpp" line="612"/>
         <source>Disconnected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
         <source>Connected, logging in at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
+        <location filename="src/client/ui/window_main.cpp" line="623"/>
+        <location filename="src/client/ui/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
         <source>&amp;Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="645"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="646"/>
         <source>Start &amp;local game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/client/ui/window_main.cpp" line="647"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="648"/>
+        <source>&amp;Deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/client/ui/window_main.cpp" line="650"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/client/ui/window_main.cpp" line="651"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="652"/>
         <source>&amp;Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>&amp;Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="657"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="659"/>
         <source>&amp;Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="662"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="663"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/client/ui/window_main.cpp" line="664"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
-        <source>Reload card database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
-        <source>Tabs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/client/ui/window_main.cpp" line="673"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
-        <source>Check for Card Updates (Automatic)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
-        <source>Show Status Bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
-        <source>Open Settings Folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/client/ui/window_main.cpp" line="676"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/client/ui/window_main.cpp" line="907"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <location filename="src/client/ui/window_main.cpp" line="908"/>
         <source>Congratulations on updating to Cockatrice %1!
 Oracle will now launch to update your card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/client/ui/window_main.cpp" line="912"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <location filename="src/client/ui/window_main.cpp" line="913"/>
         <source>Congratulations on installing Cockatrice %1!
 Oracle will now launch to install the initial card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1039"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <location filename="src/client/ui/window_main.cpp" line="1041"/>
         <source>Cockatrice is unable to load the card database.
 Do you want to update your card database now?
 If unsure or first time user, choose &quot;Yes&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/client/ui/window_main.cpp" line="1045"/>
+        <location filename="src/client/ui/window_main.cpp" line="1070"/>
         <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/client/ui/window_main.cpp" line="1046"/>
+        <location filename="src/client/ui/window_main.cpp" line="1071"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/client/ui/window_main.cpp" line="1047"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/client/ui/window_main.cpp" line="1062"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <location filename="src/client/ui/window_main.cpp" line="1064"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/client/ui/window_main.cpp" line="1072"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/client/ui/window_main.cpp" line="1091"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/client/ui/window_main.cpp" line="1092"/>
         <source>Hi! It seems like you're running this version of Cockatrice for the first time.
 All the sets in the card database have been enabled.
 Read more about changing the set order or disabling specific sets and consequent effects in the &quot;Manage Sets&quot; dialog.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/client/ui/window_main.cpp" line="1102"/>
+        <location filename="src/client/ui/window_main.cpp" line="1235"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/client/ui/window_main.cpp" line="1102"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/client/ui/window_main.cpp" line="1157"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
-        <source>Card database update running.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1178"/>
+        <source>failed to start.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
-        <source>Failed to start. The file might be missing, or permissions might be incorrect.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1181"/>
+        <source>crashed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
-        <source>The process crashed some time after starting successfully.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
+        <source>timed out.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
-        <source>Timed out. The process took too long to respond. The last waitFor...() function timed out.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1187"/>
+        <source>write error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
-        <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>
+        <location filename="src/client/ui/window_main.cpp" line="1190"/>
+        <source>read error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
-        <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1194"/>
+        <source>unknown error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
-        <source>Unknown error occurred.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1199"/>
+        <source>The card database updater exited with an error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
-        <source>The card database updater exited with an error:
-%1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
+        <location filename="src/client/ui/window_main.cpp" line="1236"/>
         <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.
 
@@ -4950,672 +3082,630 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/client/ui/window_main.cpp" line="1255"/>
+        <location filename="src/client/ui/window_main.cpp" line="1264"/>
+        <location filename="src/client/ui/window_main.cpp" line="1270"/>
+        <location filename="src/client/ui/window_main.cpp" line="1298"/>
+        <location filename="src/client/ui/window_main.cpp" line="1302"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/client/ui/window_main.cpp" line="1264"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/client/ui/window_main.cpp" line="1270"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <location filename="src/client/ui/window_main.cpp" line="1299"/>
         <source>The new sets/cards have been added successfully.
 Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/client/ui/window_main.cpp" line="1302"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
+        <location filename="src/client/ui/window_main.cpp" line="1345"/>
+        <location filename="src/client/ui/window_main.cpp" line="1355"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
+        <location filename="src/client/ui/window_main.cpp" line="1346"/>
         <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/client/ui/window_main.cpp" line="1356"/>
         <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
+        <location filename="src/client/ui/window_main.cpp" line="1365"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaBaseWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
-        <source>Mana Base</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaCurveWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
-        <source>Mana Curve</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDevotionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
-        <source>Mana Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/server/message_log_widget.cpp" line="75"/>
         <source> from play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/server/message_log_widget.cpp" line="77"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/server/message_log_widget.cpp" line="79"/>
         <source> from exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/server/message_log_widget.cpp" line="81"/>
         <source> from their hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/server/message_log_widget.cpp" line="86"/>
         <source>the top card of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/server/message_log_widget.cpp" line="88"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/server/message_log_widget.cpp" line="93"/>
         <source> from the top of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/server/message_log_widget.cpp" line="95"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/server/message_log_widget.cpp" line="101"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/server/message_log_widget.cpp" line="103"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/server/message_log_widget.cpp" line="108"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/server/message_log_widget.cpp" line="110"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/server/message_log_widget.cpp" line="115"/>
         <source> from %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/server/message_log_widget.cpp" line="117"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/server/message_log_widget.cpp" line="121"/>
         <source> from sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/server/message_log_widget.cpp" line="123"/>
         <source> from the stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
-        <source> from custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/server/message_log_widget.cpp" line="149"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <location filename="src/server/message_log_widget.cpp" line="150"/>
         <source>%1 is not revealing the top card %2 any longer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <location filename="src/server/message_log_widget.cpp" line="157"/>
         <source>%1 can now look at top card %2 at any time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <location filename="src/server/message_log_widget.cpp" line="158"/>
         <source>%1 no longer can look at top card %2 at any time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/server/message_log_widget.cpp" line="165"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/server/message_log_widget.cpp" line="175"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/server/message_log_widget.cpp" line="181"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/server/message_log_widget.cpp" line="188"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/server/message_log_widget.cpp" line="192"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/server/message_log_widget.cpp" line="208"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/server/message_log_widget.cpp" line="211"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/server/message_log_widget.cpp" line="215"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/server/message_log_widget.cpp" line="219"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/server/message_log_widget.cpp" line="227"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <location filename="src/server/message_log_widget.cpp" line="230"/>
         <source>%1 points from their %2 to %3&apos;s %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <location filename="src/server/message_log_widget.cpp" line="236"/>
         <source>%1 points from %2&apos;s %3 to their own %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <location filename="src/server/message_log_widget.cpp" line="242"/>
         <source>%1 points from %2&apos;s %3 to %4&apos;s %5.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
-        <source>%1 creates a face down token.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/server/message_log_widget.cpp" line="254"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/server/message_log_widget.cpp" line="263"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <location filename="src/server/message_log_widget.cpp" line="265"/>
         <source>%1 has loaded a deck with %2 sideboard cards (%3).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/server/message_log_widget.cpp" line="275"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/server/message_log_widget.cpp" line="310"/>
         <source>a card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/server/message_log_widget.cpp" line="316"/>
         <source>%1 gives %2 control over %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/server/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/server/message_log_widget.cpp" line="330"/>
         <source>%1 puts %2 into play%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/server/message_log_widget.cpp" line="333"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/server/message_log_widget.cpp" line="335"/>
         <source>%1 exiles %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/server/message_log_widget.cpp" line="337"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/server/message_log_widget.cpp" line="340"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <location filename="src/server/message_log_widget.cpp" line="342"/>
         <source>%1 puts %2%3 onto the bottom of their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/server/message_log_widget.cpp" line="344"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <location filename="src/server/message_log_widget.cpp" line="348"/>
         <source>%1 puts %2%3 into their library %4 cards from the top.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/server/message_log_widget.cpp" line="351"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/server/message_log_widget.cpp" line="354"/>
         <source>%1 plays %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
-        <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/server/message_log_widget.cpp" line="372"/>
         <source>%1 tries to draw from an empty library</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/server/message_log_widget.cpp" line="374"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/server/message_log_widget.cpp" line="384"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
-        <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <location filename="src/server/message_log_widget.cpp" line="389"/>
+        <source>%1 is looking at the top %3 card(s) %2.</source>
         <comment>top card for singular, top %3 cards for plural</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
-        <source>bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
-        <source>top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/server/message_log_widget.cpp" line="400"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/server/message_log_widget.cpp" line="403"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/server/message_log_widget.cpp" line="409"/>
         <source>The game has been closed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/server/message_log_widget.cpp" line="414"/>
         <source>The game has started.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/server/message_log_widget.cpp" line="420"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/server/message_log_widget.cpp" line="426"/>
         <source>%1 is now watching the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/server/message_log_widget.cpp" line="431"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/server/message_log_widget.cpp" line="438"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/server/message_log_widget.cpp" line="444"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <location filename="src/server/message_log_widget.cpp" line="450"/>
         <source>%1 is not ready to start the game any more.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <location filename="src/server/message_log_widget.cpp" line="459"/>
         <source>%1 shuffles their deck and draws a new hand of %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/server/message_log_widget.cpp" line="464"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/server/message_log_widget.cpp" line="470"/>
         <source>You are watching a replay of game #%1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/server/message_log_widget.cpp" line="475"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/server/message_log_widget.cpp" line="501"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <location filename="src/server/message_log_widget.cpp" line="503"/>
         <source>%1 card(s)</source>
         <comment>a card for singular, %1 cards for plural</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/server/message_log_widget.cpp" line="512"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/server/message_log_widget.cpp" line="517"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/server/message_log_widget.cpp" line="523"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/server/message_log_widget.cpp" line="529"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/server/message_log_widget.cpp" line="536"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/server/message_log_widget.cpp" line="542"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/server/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="552"/>
+        <location filename="src/server/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="559"/>
+        <location filename="src/server/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="566"/>
+        <location filename="src/server/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="568"/>
+        <location filename="src/server/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/server/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/server/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/server/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/server/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="581"/>
+        <location filename="src/server/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="588"/>
+        <location filename="src/server/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="598"/>
+        <location filename="src/server/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="626"/>
+        <location filename="src/server/message_log_widget.cpp" line="625"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/server/message_log_widget.cpp" line="631"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/server/message_log_widget.cpp" line="642"/>
+        <source>%1 places %2 %3 on %4 (now %5).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/server/message_log_widget.cpp" line="644"/>
+        <source>%1 removes %2 %3 from %4 (now %5).</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <location filename="src/server/message_log_widget.cpp" line="650"/>
+        <source>red counter(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <location filename="src/server/message_log_widget.cpp" line="653"/>
+        <source>yellow counter(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="src/server/message_log_widget.cpp" line="656"/>
+        <source>green counter(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/server/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/server/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/server/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/server/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <location filename="src/server/message_log_widget.cpp" line="713"/>
         <source>%1 changes the PT of %2 from nothing to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <location filename="src/server/message_log_widget.cpp" line="716"/>
         <source>%1 changes the PT of %2 from %3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/server/message_log_widget.cpp" line="724"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/server/message_log_widget.cpp" line="726"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/server/message_log_widget.cpp" line="744"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/server/message_log_widget.cpp" line="744"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/server/message_log_widget.cpp" line="747"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/server/message_log_widget.cpp" line="747"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/server/message_log_widget.cpp" line="763"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/server/message_log_widget.cpp" line="767"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/server/message_log_widget.cpp" line="772"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/server/message_log_widget.cpp" line="777"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/server/message_log_widget.cpp" line="796"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/server/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/server/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -5623,282 +3713,226 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="865"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="906"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="910"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="914"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1011"/>
         <source>Add message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1011"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1024"/>
         <source>Message:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1024"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1042"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1043"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1044"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1045"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1046"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1048"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1049"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1050"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1051"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1052"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1053"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1055"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1056"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1057"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1058"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="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="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="60"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="62"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>OverlapControlWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
-        <source>Cards to overlap:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
-        <source>Overlap percentage:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
-        <source>Overlap direction:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="17"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="19"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="20"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="21"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="22"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="23"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="24"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="26"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -5906,57 +3940,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="152"/>
         <source>Untap step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="154"/>
         <source>Upkeep step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="156"/>
         <source>Draw step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="158"/>
         <source>First main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="160"/>
         <source>Beginning of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="162"/>
         <source>Declare attackers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="164"/>
         <source>Declare blockers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="166"/>
         <source>Combat damage step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="168"/>
         <source>End of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="170"/>
         <source>Second main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="172"/>
         <source>End of turn step</source>
         <translation type="unfinished"/>
     </message>
@@ -5964,343 +3998,656 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/client/ui/picture_loader.cpp" line="359"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
-        <source>View top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="652"/>
+        <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game/player/player.cpp" line="653"/>
+        <location filename="src/game/player/player.cpp" line="1100"/>
+        <location filename="src/game/player/player.cpp" line="1178"/>
+        <location filename="src/game/player/player.cpp" line="1203"/>
+        <location filename="src/game/player/player.cpp" line="1275"/>
+        <location filename="src/game/player/player.cpp" line="1307"/>
+        <location filename="src/game/player/player.cpp" line="1459"/>
+        <location filename="src/game/player/player.cpp" line="1491"/>
+        <location filename="src/game/player/player.cpp" line="1552"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
-        <source>View bottom cards of library</source>
+        <location filename="src/game/player/player.cpp" line="744"/>
+        <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
-        <source>Shuffle top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="745"/>
+        <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
-        <source>Shuffle bottom cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
-        <source>Draw cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <source>Create tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
-        <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
-        <source>(max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
-        <source>Change power/toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
-        <source>Change stats to:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
-        <source>Set annotation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
-        <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game/player/player.cpp" line="747"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game/player/player.cpp" line="748"/>
+        <location filename="src/game/player/player.cpp" line="755"/>
+        <location filename="src/game/player/player.cpp" line="768"/>
+        <location filename="src/game/player/player.cpp" line="883"/>
+        <source>&amp;Graveyard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="749"/>
+        <location filename="src/game/player/player.cpp" line="756"/>
+        <location filename="src/game/player/player.cpp" line="762"/>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="752"/>
+        <source>&amp;Move hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="753"/>
+        <location filename="src/game/player/player.cpp" line="759"/>
+        <location filename="src/game/player/player.cpp" line="765"/>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="754"/>
+        <location filename="src/game/player/player.cpp" line="760"/>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="758"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="761"/>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <location filename="src/game/player/player.cpp" line="882"/>
+        <source>&amp;Hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="764"/>
+        <source>&amp;Move exile to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <source>&amp;View library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <source>&amp;View hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="772"/>
+        <source>View &amp;top cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="773"/>
+        <source>Reveal &amp;library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <source>&amp;Always reveal top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <source>&amp;View sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <source>&amp;Draw card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <source>D&amp;raw cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <source>&amp;Undo last draw</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="785"/>
+        <source>Take &amp;mulligan</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <source>Play top card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="791"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="809"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="811"/>
+        <source>&amp;Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>&amp;Untap all permanents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>R&amp;oll die...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>&amp;Create token...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>C&amp;reate another token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <location filename="src/game/player/player.cpp" line="1051"/>
+        <source>&amp;All players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
         <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="91"/>
-        <source>Display Navigation Buttons</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardOverlayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
-        <source>Preference</source>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
-        <source>Pin Printing</source>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
-        <source>Unpin Printing</source>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardSearchWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
-        <source>Search by set name or set code</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardSelectionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
-        <source>Previous Card in Deck</source>
+        <location filename="src/game/player/player.cpp" line="841"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
-        <source>Bulk Selection</source>
+        <location filename="src/game/player/player.cpp" line="842"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
-        <source>Next Card in Deck</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardSortingWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
-        <source>Alphabetical</source>
+        <location filename="src/game/player/player.cpp" line="844"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
-        <source>Preference</source>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
-        <source>Release Date</source>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
-        <source>Descending</source>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
-        <source>Ascending</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game/player/player.cpp" line="851"/>
+        <source>&amp;Draw arrow...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game/player/player.cpp" line="853"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game/player/player.cpp" line="854"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game/player/player.cpp" line="855"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game/player/player.cpp" line="856"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game/player/player.cpp" line="857"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game/player/player.cpp" line="858"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game/player/player.cpp" line="859"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game/player/player.cpp" line="860"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game/player/player.cpp" line="861"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="862"/>
+        <source>&amp;Set annotation...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="865"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="866"/>
+        <source>Yellow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="873"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="880"/>
+        <source>X cards from the top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1100"/>
+        <source>View top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2855"/>
+        <source>Which position should this card be placed:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2855"/>
+        <source>(max. %1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1177"/>
+        <source>Draw hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1179"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1203"/>
+        <source>Draw cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1804"/>
+        <location filename="src/game/player/player.cpp" line="3402"/>
+        <source>Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1275"/>
+        <source>Move top cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="779"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1307"/>
+        <source>Move top cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1459"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1491"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1552"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1657"/>
+        <location filename="src/game/player/player.cpp" line="3811"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1804"/>
+        <source>Create tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2854"/>
+        <source>Place card X cards from top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3189"/>
+        <source>Change power/toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3189"/>
+        <source>Change stats to:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3309"/>
+        <source>Set annotation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3310"/>
+        <source>Please enter the new annotation:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3402"/>
+        <source>Set counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3600"/>
+        <source>Re&amp;veal to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3647"/>
+        <source>View related cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3686"/>
+        <source>Token: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3703"/>
+        <source>All tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="736"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="737"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/client/ui/window_main.cpp" line="738"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/client/ui/window_main.cpp" line="739"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="740"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="741"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="742"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6308,135 +4655,131 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="79"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/client/ui/window_main.cpp" line="80"/>
+        <location filename="src/deck/deck_loader.cpp" line="14"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/client/ui/window_main.cpp" line="252"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="src/deck/deck_loader.cpp" line="13"/>
+        <source>Common deck formats (*.cod *.dec *.dek *.txt *.mwDeck)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../common/decklist.cpp" line="111"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="113"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="115"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
-        <source>Overwrite Existing File?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
-        <source>A .cod version of this deck already exists. Overwrite it?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="745"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="746"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="747"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="748"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="749"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="750"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="751"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="752"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="753"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="754"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="755"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="756"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="757"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/client/ui/window_main.cpp" line="758"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/client/ui/window_main.cpp" line="759"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/client/ui/window_main.cpp" line="760"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/client/ui/window_main.cpp" line="761"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/client/ui/window_main.cpp" line="762"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -6444,17 +4787,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="174"/>
         <source>Upload time</source>
         <translation type="unfinished"/>
     </message>
@@ -6462,108 +4805,70 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Keep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Time started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="161"/>
         <source>Duration (sec)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <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="60"/>
-        <source>&amp;View exile</source>
-        <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;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="67"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="56"/>
         <source>Joi&amp;n</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="63"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
@@ -6571,32 +4876,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SequenceEdit</name>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="43"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="49"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="172"/>
+        <source>Shortcut already in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/utility/sequence_edit.cpp" line="175"/>
         <source>Invalid key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
-        <source>Shortcut already in use by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="192"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="193"/>
         <source>Restore default</source>
         <translation type="unfinished"/>
     </message>
@@ -6604,27 +4909,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -6632,80 +4937,72 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1215"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Do you really want to restore all default shortcuts?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1276"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1277"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
-        <source>Section:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
-        <source>Action:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
-        <source>Shortcut:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <source>How to set custom shortcuts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
-        <source>Clear all shortcuts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
-        <source>Search by shortcut name</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ShortcutTreeView</name>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1284"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1284"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1287"/>
+        <source>Section:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1288"/>
+        <source>Action:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1289"/>
+        <source>Shortcut:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1291"/>
+        <source>How to set custom shortcuts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1293"/>
+        <source>Clear all shortcuts</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="46"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="48"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -6714,58 +5011,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="20"/>
         <source>&amp;Reason for shutdown:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="24"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="43"/>
         <source>Shut down server</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1127"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1128"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1129"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1130"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1131"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -6773,48 +5057,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="100"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="100"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="110"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="117"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="110"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="117"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="138"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="138"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="179"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="179"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -6822,859 +5106,793 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
-        <source>Default</source>
+        <location filename="src/client/network/release_channel.cpp" line="92"/>
+        <source>Stable Releases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="108"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="116"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="172"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="179"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabAccount</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
-        <source>Add to Buddy List</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
-        <source>Add to Ignore List</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="53"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="98"/>
         <source>Update server &amp;message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="99"/>
         <source>&amp;Shut down server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="100"/>
         <source>&amp;Reload configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="101"/>
         <source>Server administration functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
-        <source>Server moderator functions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
-        <source>Replay ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
-        <source>Grant Replay Access</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
-        <source>Username to Activate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
-        <source>Force Activate User</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="103"/>
         <source>&amp;Unlock functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="104"/>
         <source>&amp;Lock functions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
-        <source>Success</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <source>Replay access granted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <source>Unable to grant replay access. Replay ID invalid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <source>Unable to grant replay access. Internal error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
-        <source>User successfully activated</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
-        <source>Unable to activate user. Internal error</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="388"/>
+        <source>Search by card name (or search expressions)</source>
+        <oldsource>Search by card name</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="478"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="479"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="484"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="637"/>
+        <source>&amp;Clear all filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="638"/>
+        <source>Delete selected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="640"/>
+        <source>Deck &amp;name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="641"/>
+        <source>&amp;Comments:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="642"/>
+        <source>Hash:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="644"/>
+        <source>&amp;New deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="645"/>
+        <source>&amp;Load deck...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="646"/>
+        <source>&amp;Save deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="647"/>
+        <source>Save deck &amp;as...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="648"/>
+        <source>Load deck from cl&amp;ipboard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="650"/>
+        <source>Save deck to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="651"/>
+        <source>Annotated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="652"/>
+        <source>Not Annotated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="654"/>
+        <source>&amp;Print deck...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="656"/>
+        <source>&amp;Send deck to online service</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="657"/>
+        <source>Create decklist (decklist.org)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="658"/>
+        <source>Analyze deck (deckstats.net)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="659"/>
+        <source>Analyze deck (tappedout.net)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="661"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="663"/>
+        <source>Add card to &amp;maindeck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="664"/>
+        <source>Add card to &amp;sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="666"/>
+        <source>&amp;Remove row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="668"/>
+        <source>&amp;Increment number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="670"/>
+        <source>&amp;Decrement number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="672"/>
+        <source>&amp;Deck Editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="674"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="679"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="675"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="680"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="676"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="681"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="678"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
-        <source>Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="683"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="686"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="689"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="684"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="687"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="690"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="692"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="116"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="697"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
-        <source>Visual Deck: %1</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="749"/>
+        <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
-        <source>&amp;Visual Deck Editor</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="749"/>
+        <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/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
-        <source>Card Info</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="783"/>
+        <source>Load deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
-        <source>Deck</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="804"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="815"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="836"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="857"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="918"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="930"/>
+        <source>Error</source>
+        <translation>Feil</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="804"/>
+        <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="815"/>
+        <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
-        <source>&amp;View</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="837"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="858"/>
+        <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/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
-        <source>Printing</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="843"/>
+        <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
-        <source>Visible</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="918"/>
+        <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
-        <source>Floating</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
-        <source>Reset layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabDeckEditorVisualTabWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
-        <source>Visual Deck View</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
-        <source>Visual Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
-        <source>Deck Analytics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
-        <source>Sample Hand</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="930"/>
+        <source>No deck was selected to be saved.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="57"/>
+        <source>Deck storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="120"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="121"/>
         <source>Server deck storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="123"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="125"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
-        <source>Rename deck or folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="124"/>
         <source>Upload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="126"/>
         <source>Download deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="175"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="127"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="324"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="128"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="129"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="179"/>
-        <source>Open decks folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
-        <source>Rename local folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
-        <source>Rename local file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
-        <source>New name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="187"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="219"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <source>Rename failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="187"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="194"/>
         <source>Enter deck name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="194"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="199"/>
         <source>Unnamed deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="219"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="235"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
-        <source>Are you sure you want to delete the selected files?</source>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="236"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="369"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="380"/>
+        <source>Are you sure you want to delete &quot;%1&quot;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
-        <source>Delete remote decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
-        <source>Are you sure you want to delete the selected decks?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="324"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabDeckStorageVisual</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
-        <source>Visual Deck Storage</source>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="368"/>
+        <source>Delete remote folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
-        <source>Could not open deck at %1</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabEdhRec</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
-        <source>EDHREC: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabEdhRecMain</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
-        <source>&amp;Cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
-        <source>Top Commanders</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
-        <source>Tags</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="379"/>
+        <source>Delete remote deck</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="509"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1385"/>
         <source>Replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="509"/>
         <source>Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="503"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="566"/>
         <source>Player List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="512"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="564"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="513"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="565"/>
         <source>Messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="515"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="578"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="520"/>
         <source>&amp;Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="523"/>
         <source>&amp;Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="525"/>
         <source>Next &amp;phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="528"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="531"/>
         <source>Next &amp;turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="534"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="537"/>
         <source>&amp;Remove all local arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="540"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="543"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="546"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
-        <source>Un&amp;concede</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="548"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="551"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="554"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="557"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="560"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="563"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="568"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="571"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="574"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="579"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="569"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="572"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="575"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="580"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="583"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="663"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="663"/>
         <source>Are you sure you want to concede this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="669"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="670"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="682"/>
         <source>Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="682"/>
         <source>Are you sure you want to leave this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="960"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1204"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1205"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
-        <source>You have been kicked out of the game.</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1216"/>
+        <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
-        <source>Home</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1219"/>
+        <source>player left the game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1222"/>
+        <source>player disconnected from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1226"/>
+        <source>reason unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1263"/>
+        <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="67"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="31"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="37"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="43"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="48"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="79"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="69"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="79"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="185"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="271"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="277"/>
         <source>Message History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -7682,37 +5900,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="113"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="151"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="168"/>
         <source>%1 has left the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="174"/>
         <source>%1 has joined the server.</source>
         <translation type="unfinished"/>
     </message>
@@ -7720,233 +5938,117 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.h" line="55"/>
+        <source>Game replays</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_replays.cpp" line="116"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="117"/>
         <source>Server replay storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="119"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="121"/>
         <source>Watch replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <source>Rename</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
-        <source>New folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="120"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="124"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
-        <source>Open replays folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="122"/>
         <source>Download replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="123"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
-        <source>Rename local folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
-        <source>Rename local file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
-        <source>New name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
-        <source>Rename failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
-        <source>Name of new folder:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="152"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
-        <source>Are you sure you want to delete the selected files?</source>
+        <location filename="src/client/tabs/tab_replays.cpp" line="153"/>
+        <source>Are you sure you want to delete &quot;%1&quot;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
-        <source>Are you sure you want to delete the selected replays?</source>
+        <location filename="src/client/tabs/tab_replays.cpp" line="202"/>
+        <source>Downloading Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
-        <source>Failed to get code</source>
+        <location filename="src/client/tabs/tab_replays.cpp" line="203"/>
+        <source>Folder download is not yet supported. Please download replays individually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Either this server does not support replay sharing, or does not permit replay sharing for you.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
-        <source>Failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
-        <source>Replay Share Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Others can use this code to add the replay to their list of remote replays:
-%1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="271"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
-        <source>Game Replays</source>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
+        <source>Are you sure you want to delete the replay of game %1?</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>&amp;Leave room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="152"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="153"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="165"/>
         <source> mentioned you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="173"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="216"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation type="unfinished"/>
     </message>
@@ -7954,35 +6056,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="224"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="225"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -7990,92 +6092,32 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
-        <source>Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
-        <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
-        <source>EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
-        <source>&amp;Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
-        <source>Visual Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
-        <source>Game Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
-        <source>Administration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
-        <source>Logs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="174"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="175"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="577"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="605"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="646"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="647"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8083,61 +6125,71 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="652"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="652"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="656"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="657"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="661"/>
         <source>Warned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="662"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="676"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>TabVisualDatabaseDisplay</name>
+    <name>TabUserLists</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
-        <source>Visual Database Display</source>
+        <location filename="src/client/tabs/tab_account.h" line="56"/>
+        <source>Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_account.cpp" line="65"/>
+        <source>Add to Buddy List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_account.cpp" line="75"/>
+        <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation type="unfinished"/>
     </message>
@@ -8145,13 +6197,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"/>
@@ -8160,42 +6212,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -8203,7 +6255,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
@@ -8211,206 +6263,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="56"/>
         <source>User &amp;details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="57"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="58"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="59"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="60"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="76"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="77"/>
-        <source>View admin notes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <source>This user does not exist.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="93"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="101"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="157"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="180"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="184"/>
         <source>Ban History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="163"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="181"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="213"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="234"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="238"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="195"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="220"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="218"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="235"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="217"/>
         <source>User has never been warned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="247"/>
-        <source>Failed to get admin notes.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="231"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Success</source>
         <translation>Suksess</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="232"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="247"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="241"/>
         <source>Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="239"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="241"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="316"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="336"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8418,173 +6437,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>Account Age:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="82"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="113"/>
         <source>Administrator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="115"/>
         <source>Moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="117"/>
         <source>Registered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="119"/>
+        <location filename="src/server/user/user_info_box.cpp" line="130"/>
         <source>Unregistered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="122"/>
         <source>Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="140"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="313"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="306"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="306"/>
         <source>User information updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="256"/>
+        <location filename="src/server/user/user_info_box.cpp" line="309"/>
+        <location filename="src/server/user/user_info_box.cpp" line="313"/>
+        <location filename="src/server/user/user_info_box.cpp" line="317"/>
+        <location filename="src/server/user/user_info_box.cpp" line="330"/>
+        <location filename="src/server/user/user_info_box.cpp" line="333"/>
+        <location filename="src/server/user/user_info_box.cpp" line="336"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="354"/>
+        <location filename="src/server/user/user_info_box.cpp" line="358"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="70"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="77"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="157"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="215"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="216"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="257"/>
+        <location filename="src/server/user/user_info_box.cpp" line="318"/>
+        <location filename="src/server/user/user_info_box.cpp" line="341"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="310"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
         <source>Password changed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="330"/>
         <source>This server does not permit you to change your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="333"/>
         <source>The new password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="336"/>
         <source>The old password is incorrect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>Avatar updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="354"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="358"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation type="unfinished"/>
     </message>
@@ -8592,580 +6611,124 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="514"/>
         <source>General interface settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="515"/>
         <source>&amp;Double-click cards to play them (instead of single-click)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
-        <source>&amp;Clicking plays all selected cards (instead of just the clicked card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="516"/>
         <source>&amp;Play all nonlands onto the stack (not the battlefield) by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
-        <source>Close card view window when last card is removed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
-        <source>Auto focus search bar when card view window is opened</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="517"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="518"/>
         <source>Use tear-off menus, allowing right click menus to persist on screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="519"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="520"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="521"/>
         <source>Notify in the taskbar for game events while you are spectating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="522"/>
         <source>Notify in the taskbar when users in your buddy list connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="523"/>
         <source>Animation settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="524"/>
         <source>&amp;Tap/untap animation</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
-        <source>Deck editor/storage settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
-        <source>Open deck in new tab by default</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
-        <source>Use visual deck storage in game lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
-        <source>Use selection animation for Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
-        <source>When adding a tag in the visual deck storage to a .txt deck:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
-        <source>do nothing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
-        <source>ask to convert to .cod</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
-        <source>always convert to .cod</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
-        <source>Default deck editor type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <source>Classic Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
-        <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
-        <source>Replay settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
-        <source>Buffer time for backwards skip via shortcut:</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
-    <name>UserListWidget</name>
+    <name>UserList</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/server/user/user_list.cpp" line="377"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/server/user/user_list.cpp" line="380"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/server/user/user_list.cpp" line="383"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/server/user/user_list.cpp" line="386"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayColorFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
-        <source>Save Filter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
-        <source>Save all currently applied filters to a file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
-        <source>Enter filename...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
-        <source>Do not display card main-types with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
-        <source>Apply all card names in clipboard as exact match name filters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
-    <message>
-        <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>
-</context>
-<context>
-    <name>VisualDatabaseDisplaySetFilterWidget</name>
-    <message>
-        <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="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="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>
-</context>
-<context>
-    <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
-    <message>
-        <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="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="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="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="172"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
-        <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
-        <source>Clear all filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorSampleHandWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
-        <source>Draw a new sample hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
-        <source>Sample hand size</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
-        <source>Quick search and add card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
-        <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageFolderDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageQuickSettingsWidget</name>
-    <message>
-        <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="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="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="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="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="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="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="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="130"/>
-        <source>Filepath</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageSearchWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
-        <source>Search by filename (or search expression)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageSortWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
-        <source>Sort Alphabetically (Deck Name)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
-        <source>Sort Alphabetically (Filename)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
-        <source>Sort by Last Modified</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
-        <source>Sort by Last Loaded</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
-        <source>Refresh loaded files</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
-        <source>Visual Deck Storage Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/server/user/user_list.cpp" line="134"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <location filename="src/server/user/user_list.cpp" line="142"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/server/user/user_list.cpp" line="144"/>
         <source>&amp;OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/server/user/user_list.cpp" line="147"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list.cpp" line="162"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <location filename="src/server/user/user_list.cpp" line="168"/>
+        <location filename="src/server/user/user_list.cpp" line="174"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <location filename="src/server/user/user_list.cpp" line="169"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <location filename="src/server/user/user_list.cpp" line="175"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"/>
     </message>
@@ -9173,133 +6736,128 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WndSets</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="38"/>
         <source>Move selected set to the top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="45"/>
         <source>Move selected set up</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="52"/>
         <source>Move selected set down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="59"/>
         <source>Move selected set to the bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="67"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="75"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="73"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
+        <location filename="src/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="113"/>
+        <location filename="src/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="114"/>
+        <location filename="src/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="115"/>
+        <location filename="src/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="131"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="134"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="135"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="136"/>
         <source>first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom)</source>
         <comment>%1 is a link to the wiki</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
-        <source>Include cards rebalanced for Alchemy [requires restart]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="135"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="144"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="147"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="151"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="152"/>
         <source>To enable ordering again, click the column header until this message disappears.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="155"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="156"/>
         <source>Sorts the set priority using the same column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9307,72 +6865,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
-        <source>Search by card name (or search expressions)</source>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="140"/>
+        <source>sort by name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
-        <source>Ungrouped</source>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="141"/>
+        <source>sort by type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
-        <source>Group by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
-        <source>Group by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
-        <source>Group by Color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
-        <source>Unsorted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
-        <source>Sort by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
-        <source>Sort by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
-        <source>Sort by Mana Cost</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
-        <source>Sort by Colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
-        <source>Sort by P/T</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
-        <source>Sort by Set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="142"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="143"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -9380,7 +6888,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/settings/cache_settings.cpp" line="170"/>
         <source>English</source>
         <translation>Norsk Bokmål (Norwegian Bokmål)</translation>
     </message>
@@ -9388,12 +6896,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="142"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="143"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -9401,1007 +6909,786 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/settings/shortcuts_settings.h" line="39"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
+        <location filename="src/settings/shortcuts_settings.h" line="149"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/settings/shortcuts_settings.h" line="43"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Game Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Playing Area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Gameplay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
-        <source>Tabs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/settings/shortcuts_settings.h" line="143"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="146"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="152"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/settings/shortcuts_settings.h" line="157"/>
         <source>Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="163"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="166"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="169"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
-        <source>Analyze Deck (deckstats.net)</source>
+        <location filename="src/settings/shortcuts_settings.h" line="172"/>
+        <source>Analyze Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
-        <source>Analyze Deck (tappedout.net)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="175"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="178"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/settings/shortcuts_settings.h" line="182"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
-        <source>Export Deck (decklist.org)</source>
+        <location filename="src/settings/shortcuts_settings.h" line="192"/>
+        <source>Export Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
-        <source>Export Deck (decklist.xyz)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="195"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="198"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/settings/shortcuts_settings.h" line="202"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
-        <source>Edit Deck in Clipboard, Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
-        <source>Edit Deck in Clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="205"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/settings/shortcuts_settings.h" line="209"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="212"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="215"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="587"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/settings/shortcuts_settings.h" line="221"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="224"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/settings/shortcuts_settings.h" line="228"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
-        <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/settings/shortcuts_settings.h" line="232"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
-        <source>Save Deck to Clipboard (No Set Info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="235"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="238"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="241"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="257"/>
+        <source>Add Yellow Counter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
+        <source>Remove Yellow Counter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="263"/>
+        <source>Set Yellow Counters...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="272"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="275"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
-        <source>Show Status Bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
-        <source>Unload Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
-        <source>Force Start</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
-        <source>Add Card Counter (F)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
-        <source>Remove Card Counter (F)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
-        <source>Set Card Counters (F)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
-        <source>Add Card Counter (E)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
-        <source>Remove Card Counter (E)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
-        <source>Set Card Counters (E)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
-        <source>Add Card Counter(D)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
-        <source>Remove Card Counter (D)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
-        <source>Set Card Counters (D)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
-        <source>Add Card Counter (C)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
-        <source>Remove Card Counter (C)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
-        <source>Set Card Counters (C)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
-        <source>Add Card Counter (B)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
-        <source>Remove Card Counter (B)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
-        <source>Set Card Counters (B)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
-        <source>Add Card Counter (A)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
-        <source>Remove Card Counter (A)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
-        <source>Set Card Counters (A)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="278"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="281"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/settings/shortcuts_settings.h" line="381"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="384"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="387"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/settings/shortcuts_settings.h" line="391"/>
         <source>Attack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/settings/shortcuts_settings.h" line="393"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="396"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="399"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/settings/shortcuts_settings.h" line="403"/>
         <source>End</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
-        <source>Hide Card in Reveal Window</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="449"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
-        <source>Select All Cards in Zone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
-        <source>Select All Cards in Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
-        <source>Select All Cards in Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/settings/shortcuts_settings.h" line="455"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
+        <location filename="src/settings/shortcuts_settings.h" line="502"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <source>Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/settings/shortcuts_settings.h" line="458"/>
+        <location filename="src/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="517"/>
         <source>Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="528"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="514"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="469"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/settings/shortcuts_settings.h" line="477"/>
         <source>Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="480"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="483"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
-        <source>Bottom Cards of Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="486"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="513"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="520"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
+        <location filename="src/settings/shortcuts_settings.h" line="525"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/settings/shortcuts_settings.h" line="531"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/settings/shortcuts_settings.h" line="534"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/settings/shortcuts_settings.h" line="537"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/settings/shortcuts_settings.h" line="540"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/settings/shortcuts_settings.h" line="548"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/settings/shortcuts_settings.h" line="551"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
-        <source>Shuffle Top Cards of Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
-        <source>Shuffle Bottom Cards of Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/settings/shortcuts_settings.h" line="557"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/settings/shortcuts_settings.h" line="563"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/settings/shortcuts_settings.h" line="566"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/settings/shortcuts_settings.h" line="569"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/settings/shortcuts_settings.h" line="572"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/settings/shortcuts_settings.h" line="575"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/settings/shortcuts_settings.h" line="578"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/settings/shortcuts_settings.h" line="581"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/settings/shortcuts_settings.h" line="584"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/settings/shortcuts_settings.h" line="590"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
-        <source>Skip Forward</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
-        <source>Skip Backward</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
-        <source>Skip Forward by a lot</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
-        <source>Skip Backward by a lot</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/settings/shortcuts_settings.h" line="596"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
-        <source>Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
-        <source>Server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
-        <source>Administration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
-        <source>Logs</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/cockatrice/translations/cockatrice_nl.ts b/cockatrice/translations/cockatrice_nl.ts
index 773b042d2..fddd8ebef 100644
--- a/cockatrice/translations/cockatrice_nl.ts
+++ b/cockatrice/translations/cockatrice_nl.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Teller instellen...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Teller instellen</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nieuwe waarde voor teller &apos;%1&apos;:</translation>
     </message>
@@ -23,96 +23,92 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <source>&amp;Refresh</source>
-        <translation>&amp;Verversen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
-        <translation>Interpreteer Setnaam en Nummer (indien beschikbaar)</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/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <source>Open in new tab</source>
-        <translation>Open in nieuw tabblad</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <source>Are you sure?</source>
-        <translation>Weet je het zeker?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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>
+        <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
-        <translation>Foutmelding</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <source>Could not open deck at %1</source>
-        <translation>Kon het deckbestand niet openen: %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
-        <translation>Kon remote deck niet opslaan</translation>
+        <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/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="374"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <source>Save deck</source>
-        <translation>Deck opslaan</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="409"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <source>The deck could not be saved.</source>
-        <translation>Het deck kon niet opslagen worden.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="532"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
-        <translation>Er zijn geen kaarten in je deck om te exporteren.</translation>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
-        <translation>Analyse Paneel Toevoegen</translation>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation>Update Notities</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation>Admin Notities voor %1</translation>
     </message>
@@ -120,12 +116,12 @@ Kijk na of je schrijfrechten tot de folder hebt, en probeer opnieuw.</translatio
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -133,312 +129,251 @@ 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"/>
-        <source> seconds</source>
-        <translation>secondes</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>Thema opties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Huidige thema:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <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"/>
-        <source>Home tab background source:</source>
-        <translation>Starttabblad achtergrond bron:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <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"/>
-        <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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation>Menu instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <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"/>
-        <source>Show game filter toolbar above list in room tab</source>
-        <translation>Spelfilter werkbalk weergeven boven lijst in kamertab</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation>Kaartweergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <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"/>
-        <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>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
+        <translation>Overschrijf alle kaart beelden met eigen set voorkeuren (Gedrag van voor implementatie van ProviderID) [Vereist herstart applicatie]</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <source>Use rounded card corners</source>
-        <translation>Ronde kaarthoekjes</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation>rijen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <source>Maximum expanded height for card view window:</source>
-        <translation>Grootste uitgebreide grootte voor kaartbekijkvenster</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
-        <translation>Kaart-counters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
-        <translation>Counter %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
         <translation>Handweergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <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/dialogs/dlg_settings.cpp" line="691"/>
         <source>Table grid layout</source>
         <translation>Tafelindeling</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="692"/>
         <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/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximale lettergrootte voor informatie die op kaarten wordt weergegeven:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="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"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation>Open Deck in Deckbewerker</translation>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation>Thema</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation>Beelduitsnijding van willekeurige kaart</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation>Beelduitsnijding van background.cod deck bestand</translation>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>ban &amp;gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>ban &amp;IP-adres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>ban gebruiker I&amp;D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Ban type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;definitieve ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;tijdelijke ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dagen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Uur:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minuten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Duur van de ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Voer een reden voor de ban in.
 Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de verbannen persoon.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Voer een reden in die zichtbaar zal zijn voor de verbannen persoon.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Verwijder alle berichten van deze gebruiker in alle kamers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuleren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Ban gebruiker van server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>U moet een ban gebaseerd op IP, naam, gebruikers ID of een combinatie van de drie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>U moet een naam meegeven als u een naam gebaseerde ban wilt uitvoeren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>U moet een IP meegeven als u een IP gebaseerde ban wilt uitvoeren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>U moet een gebruikers ID meegeven als u een gebruikers ID gebaseerde ban wilt uitvoeren.</translation>
     </message>
@@ -446,22 +381,22 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>Geen antwoord ontvangen van de release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Ongeldig antwoord ontvangen van de release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>Geen antwoord ontvangen van de bestandsupdateserver.</translation>
     </message>
@@ -469,32 +404,32 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Sets</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Manakosten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Kaarttype</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Kleur(en)</translation>
     </message>
@@ -502,1027 +437,807 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>EN</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OF</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>EN NIET</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OF NIET</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation>Naam (Exact)</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Kleur</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Mana Kosten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>Mana Waarde</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Zeldzaamheid</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Kracht</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Hardheid</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Loyaliteit</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
-        <translation>Hoofdtype</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
-        <translation>Subtype</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation>Plaatje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation>Beide</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
-        <translation>Bekijk gedaanteverandering</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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <source>Add card to deck</source>
-        <translation>Voeg kaart aan deck toe</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
-        <translation>Mainboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
-        <translation>Sideboard</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation>Set:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation>Verzamelnummer:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation>Gerelateerde kaarten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation>Onbekende kaart:</translation>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation>&amp;Onthul aan....</translation>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Verplaatsen naar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation>&amp;Alle spelers</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation>Bekijk gerelateerde kaarten</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation>Token: </translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation>Alle tokens</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation>&amp;Selecteer Alle</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Play</source>
-        <translation>&amp;Speel</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation>&amp;Verberg</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <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"/>
-        <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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
-        <source>T&amp;urn Over</source>
-        <extracomment>Turn face up/face down</extracomment>
-        <translation>&amp;Draai om</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="460"/>
-        <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"/>
-        <source>&amp;Clone</source>
-        <translation>&amp;Kloneer</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <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"/>
-        <source>Unattac&amp;h</source>
-        <translation>&amp;Losmaken</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation>&amp;Teken pijl....</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation>Aantekeningen &amp;zetten....</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation>Kaart-&amp;counters</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation>Counters &amp;instellen (%1)...</translation>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Power / toughness</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation>Kaartgrootte</translation>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation>hun hand</translation>
+        <translation>zijn hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <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/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation>hun library</translation>
+        <translation>zijn bibliotheek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <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/card_zone.cpp" line="70"/>
         <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/card_zone.cpp" line="71"/>
         <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="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation>hun library</translation>
+        <translation>zijn bibliotheek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation>hun library</translation>
+        <translation>zijn bibliotheek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation>hun library</translation>
+        <translation>zijn bibliotheek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation>hun kerkhof</translation>
+        <translation>aijn begraafplaats</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation>%1s kerkhof</translation>
+        <translation>%1s graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation>hun verbannen</translation>
+        <translation>hun exile</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation>%1s verbannen</translation>
+        <translation>%1s exile</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <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="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <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/card_zone.cpp" line="96"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
-        <translation>hun aangepaste zone &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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
-        <translation>%1s aangepaste zone &apos;%2&apos;</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation>Parseerfout op regel %1 kolom %2:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation>Parseerfout op regel %1 kolom %2:</translation>
-    </message>
-</context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation>&amp;Aangepaste Zone</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation>Aangepaste zone &apos;%1&apos; bekijken</translation>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation>Paneel Toevoegen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation>Paneel Verwijderen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation>Indeling Opslaan</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation>Indeling Laden</translation>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation>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/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
-        <translation>Kaartinfo</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
-        <translation>Zoek op kaartnaam (of zoekexpressies)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
-        <translation>Toevoegen aan deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
-        <translation>Toevoegen aan sideboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
-        <translation>Selecteer Druk</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation>Bekijk op EDHRec (Commander)</translation>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation>Bekijk op EDHRec (Kaart)</translation>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <source>Show Related cards</source>
-        <translation>Gerelateerde kaarten tonen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <source>Add card to &amp;maindeck</source>
-        <translation>Kaart aan deck &amp;toevoegen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="242"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
-        <translation>Kaart aan &amp;sideboard toevoegen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
-        <source>Loading Database...</source>
-        <translation>Database Laden...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <source>Banner Card</source>
-        <translation>Vaandelkaart</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <source>Main Type</source>
-        <translation>Hoofdtype</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <source>Mana Cost</source>
-        <translation>Mana Kosten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <source>Colors</source>
-        <translation>Kleuren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
-        <translation>Selecteer Druk</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
-        <translation>Deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
-        <translation>Deck&amp;naam:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
-        <translation>Vaandelkaart/Tags zichtbaarheidsinstellingen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
-        <translation>Selectiemenu van vaandelkaarten weergeven</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
-        <translation>Selectiemenu van tags weergeven</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
-        <translation>&amp;Opmerkingen:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
-        <translation>Groepeer op:</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>Format:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
-        <translation>Hash:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
-        <translation>Ver&amp;hoog getal</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
-        <translation>Ver&amp;laag getal</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
-        <translation>Ver&amp;wijder rij</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
-        <translation>Wissel kaart van/naar sideboard</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <source>Filters</source>
-        <translation>Filters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>&amp;Clear all filters</source>
-        <translation>&amp;Wis alle filters</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
-        <translation>Selectie verwijderen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
-        <translation>&amp;Deckbewerker</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
-        <translation>&amp;Nieuw deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
-        <translation>&amp;Laad deck...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
-        <translation>Laad recent deck...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
-        <translation>Wis</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
-        <translation>&amp;Bewaar deck</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
-        <translation>Bewaar deck &amp;als...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
-        <translation>Laad deck van &amp;klembord....</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
-        <translation>Deck in klembord aanpassen...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
-        <translation>Geannoteerd</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
-        <translation>Niet Geannoteerd</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
-        <translation>Deck opslaan op klembord</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
-        <translation>Geannoteerd (Geen set info)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
-        <translation>Niet Geannoteerd (Geen set info)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
-        <translation>&amp;Print deck...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation>Deck van online service laden...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
-        <translation>Deck naar online service &amp;sturen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
-        <translation>Maak decklist aan (decklist.org)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
-        <translation>Maak decklist aan (decklist.xyz)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
-        <translation>Analyseer deck (deckstats.net)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
-        <translation>Analyseer deck (tappedout.net)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
-        <translation>&amp;Sluiten</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
-        <translation>Drukselector</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>Succes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation>URL bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <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/dialogs/dlg_settings.cpp" line="1219"/>
         <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/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <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/dialogs/dlg_settings.cpp" line="1224"/>
         <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/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation>URL verwijderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation>Dag(en)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>Bijwerken...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation>Kies locatie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <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/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <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/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Locatie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>Laatste Wijziging</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <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/dialogs/dlg_settings.cpp" line="1216"/>
         <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/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <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>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation>Ontdoen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation>Herdoen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation>Ontdoe/Herdoe geschiedenis</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation>Klik een regel om terug te gaan naar dat punt in de geschiedenis.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation>[herdoen]</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation>[ontdoen]</translation>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation>Hoeveelheid</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Kaart</translation>
     </message>
@@ -1530,268 +1245,210 @@ 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/deck/deck_loader.cpp" line="22"/>
         <source>Common deck formats (%1)</source>
-        <translation>Algemene deckformaten (%1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
-        <translation>Alle bestanden (*.*)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
-        <translation>Modus: Exacte Overeenkomst</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
-        <translation>Modus: Bevat</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation>Kleur-identiteit filtermodus (AND/OR/NOT samenvoegingen van filters)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
-        <translation>Bewerk tags ...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
-        <translation>Deck Tags Beheren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
-        <translation>Beheer je deck-tags. Vink tags aan of uit naar behoefte, of voeg nieuwe toe:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
-        <translation>Nieuwe tag toevoegen (e.g., Aggro)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
-        <translation>Tag Toevoegen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
-        <translation>Tags filteren...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
-        <translation>Standaardtags bewerken</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
-        <translation>Annuleren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
-        <translation>Ongeldige Invoer</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
-        <translation>Naam van tag mog niet leeg zijn!</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
-        <translation>Tag Dupliceren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
-        <translation>Deze tag bestaat al.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
-        <translation>Vaandelkaart</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <source>Open in deck editor</source>
-        <translation>In deckbewerker openen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <source>Edit Tags</source>
-        <translation>Tags Aanpassen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <source>Rename Deck</source>
-        <translation>Deck Hernoemen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <source>Save Deck to Clipboard</source>
-        <translation>Bewaar Deck op Klembord</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <source>Annotated</source>
-        <translation>Geannoteerd</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <source>Annotated (No set info)</source>
-        <translation>Geannoteerd (Geen set info)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <source>Not Annotated</source>
-        <translation>Niet Geannoteerd</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <source>Not Annotated (No set info)</source>
-        <translation>Niet Geannoteerd (Geen set info)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <source>Rename File</source>
-        <translation>Bestand Hernoemen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <source>Delete File</source>
-        <translation>Bestand Verwijderen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <source>Set Banner Card</source>
-        <translation>Vaandelkaart Instellen</translation>
+        <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <source>New name:</source>
-        <translation>Nieuwe naam:</translation>
+        <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Error</source>
-        <translation>Foutmelding</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <source>Rename failed</source>
-        <translation>Hernoemen mislukt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Delete file</source>
-        <translation>Bestand Verwijderen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Are you sure you want to delete the selected file?</source>
-        <translation>Weet je zeker dat je het opgeslagen bestand wilt verwijderen?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
-        <translation>Verwijderen mislukt</translation>
-    </message>
-</context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation>Hernoem deck naar &quot;%1&quot; van &quot;%2&quot;</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation>Opmerkingen bijgewerkt (van %1 karakters naar %2 karakters)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation>Vaandelkaart veranderd naar %1 (%2)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation>Tags veranderd</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation>Format veranderd naar %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation>Toegevoegd (%1): %2 (%3) %4</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation>Verplaatst naar %1 1 × &quot;%2&quot; (%3)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation>Verwijderd &quot;%1&quot; (alle exemplaren)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <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"/>
-        <source>Added</source>
-        <translation>Toegevoegd</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation>Verwijderd</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>Het antwoord van de server kon niet geparsed worden.</translation>
     </message>
@@ -1811,234 +1468,227 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
-        <translation>Van klembord laden....</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
-        <translation>Van website laden...</translation>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation>Deck uitladen</translation>
+        <source>Ready to start</source>
+        <translation>Gereed voor start</translation>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
-        <source>Ready to start</source>
-        <translation>Gereed voor begin</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>Geforceerd starten</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation>Sideboard ontgrendeld</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <source>Deck is greater than maximum file size.</source>
-        <translation>Deck is groter dan maximum bestandsgrootte.</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="329"/>
         <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>
+        <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="331"/>
         <source>Cockatrice</source>
-        <translation>Cockatrice</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
-        <translation>Deckformaat Omzetten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
-        <translation>Je hebt geprobeerd een tag toe te voegen aan een deck in .txt-formaat.
-Tags kunnen alleen worden toegevoegd aan decks in .cod-formaat.
-Wil je het deck omzetten naar het .cod-formaat?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
-        <translation>Onthouden en automatisch keuze toepassen in de toekomst</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Downloaden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Bekende Hosts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation>Verwijder de geselecteerde opgeslagen server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Hernieuw de serverlijst met bekende publieke servers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Nieuwe Eigenaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Gastheer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Poort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>Spelers&amp;naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>W&amp;achtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>Wachtwoord &amp;Opslaan</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>A&amp;utomatisch verbinden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Maak automatisch verbinding met de meest recente login wanneer Cockatrice wordt geopend.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>Als u problemen ondervindt bij het aansluiten of registreren, neem dan contact op met het serverteam voor hulp!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Website</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Wachtwoord veranderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation>Wachtwoord vergeten?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Verbinden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>Servercontact</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Verbinding maken met server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>Server URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>Communicatiepoort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>Unieke Servernaam</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Verbindingswaarschuwing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>U moet het nieuwe verbindingsprofiel een naam geven.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Verbindingswaarschuwing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>De naam van de speler mag niet leeg zijn.</translation>
     </message>
@@ -2046,122 +1696,112 @@ Wil je het deck omzetten naar het .cod-formaat?</translation>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Instellingen &amp;Onthouden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Omschrijving:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>Spe&amp;lers:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Spel type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Wachtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <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"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <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"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <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"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>Toe&amp;schouwers kunnen meekijken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Toeschouwers hebben een wachtwoord &amp;nodig om mee te kijken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Toeschouwers kunnen &amp;chatten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Toeschouwers kunnen &amp;handen zien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>Maak spel aan als toeschouwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Toeschouwers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation>Beginnend levenstotaal:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation>Open decklijsten in lobby</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation>Maak spel aan als judge</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation>Spel opzet opties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;Opschonen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Spel aanmaken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Spelgegevens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Server Fout</translation>
     </message>
@@ -2169,97 +1809,97 @@ Wil je het deck omzetten naar het .cod-formaat?</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Naam:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>Kle&amp;ur:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>wit</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>blauw</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>zwart</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>rood</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>groen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>veelkleurig</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>kleurloos</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotatie:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Vernietig token als het de tafel verlaat</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
-        <translation>Verdekt aanmaken (Verbergt alleen naam)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Token data</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Laat &amp;alle tokens zien</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Laat tokens van dit &amp;dek zien</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Kies token uit lijst</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Maak token</translation>
     </message>
@@ -2267,94 +1907,94 @@ Wil je het deck omzetten naar het .cod-formaat?</translation>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
-        <translation>Tags Aanpassen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
-        <translation>Toevoegen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
-        <translation>Bevestig</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
-        <translation>Annuleren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
-        <translation>Vul tag in en druk 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"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
-        <translation>✖</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
-        <translation>Ongeldige Invoer</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
-        <translation>Naam van tag mog niet leeg zijn!</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
-        <translation>Tag Dupliceren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
-        <translation>Deze tag bestaat al.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Geen afbeelding gekozen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Om je avatar te veranderen, kies een nieuwe afbeelding.
 Om je avatar te verwijderen, accepteer zonder een nieuwe afbeelding te kiezen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Zoeken...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Verander Icoon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Afbeeldingen (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Geen geldige afbeelding gekozen</translation>
     </message>
@@ -2362,56 +2002,56 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <source>Edit deck in clipboard</source>
-        <translation>Deck in klembord aanpassen...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Error</source>
-        <translation>Foutmelding</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
-        <translation>Niet geldige deck lijst.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Oud wachtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nieuw wachtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Herhaal nieuw wachtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Verander wachtwoord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Je wachtwoord is te kort.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Nieuwe wachtwoorden komen niet overeen.</translation>
     </message>
@@ -2419,93 +2059,93 @@ Om je avatar te verwijderen, accepteer zonder een nieuwe afbeelding te kiezen.</
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>Kle&amp;ur:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>wit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>blauw</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>zwart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>rood</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>groen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>veelkleurig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>kleurloos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotatie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Token data</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Voeg token toe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Verwijder token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>Aangepaste tokens bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Gelieve de naam van de token in te voeren:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>De gekozen naam is al in gebruik door een bestaande kaart of token.
@@ -2515,27 +2155,27 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Land:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Echte naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Gebruikers profiel aanpassen</translation>
     </message>
@@ -2543,143 +2183,137 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>Geen limiet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5 minuten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10 minuten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30 minuten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1 uur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2 uur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
-        <translation>Verberg &apos;alleen maatjes&apos; spellen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
-        <translation>Verberg volle spellen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
-        <translation>Verberg spellen die al begonnen zijn</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
-        <translation>Verberg met wachtwoord vergrendelde spellen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
-        <translation>Verberg spellen door &apos;genegeerde&apos; gebruikers</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <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>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation>Verberg spellen met gedwongen open decklijsten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Nieuwer dan:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>Spel &amp;omschrijving:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>Naam van &amp;maker:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>&amp;Spel types</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>ten&amp;minste:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>op zijn &amp;hoogst:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Maximale aantal spelers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Restricties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Laat alleen spellen zien als &amp;toeschouwers kunnen kijken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Laat spellen zien met &amp;wachtwoord voor toeschouwers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Laat alleen spellen zien als toeschouwers kunnen &amp;chatten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Laat alleen spellen zien als toeschouwers &amp;handen kunnen zien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation>Toeschouwers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Spellen filteren</translation>
     </message>
@@ -2687,52 +2321,52 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation>Wachtwoord Vergeten Challenge Waarschuwing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Een probleem heeft zich opgetreden. Gelieve opnieuw een wachtwoord aan te vragen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation>Vul de gegevens in van de server en het account waar je een nieuw wachtwoord aan voor wil vragen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Poort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Spelernaam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>E-mail:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation>Wachtwoord Vergeten Challenge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation>Foutmelding Wachtwoord Vergeten Challenge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>Het e-mailadres mag niet leeg zijn.</translation>
     </message>
@@ -2740,37 +2374,37 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation>Vul de gegevens in van de server waar je een nieuw wachtwoord aan voor wil vragen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Poort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Spelernaam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation>Wachtwoord Vergeten Aanvraag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation>Foutmelding Wachtwoord Resetten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>De spelernaam kan niet leeg zijn.</translation>
     </message>
@@ -2778,86 +2412,86 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation>Waarschuwing Wachtwoord Resetten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Een probleem heeft zich opgetreden. Gelieve opnieuw een wachtwoord aan te vragen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation>Vul het ontvangen token en het nieuwe wachtwoord in om je wachtwoord in te stellen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Poort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Spelernaam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Token:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Nieuw Wachtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Reset Wachtwoord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>De spelernaam kan niet leeg zijn.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation>Foutmelding Resetten Wachtwoord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>De token mag niet leeg zijn.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>Het nieuwe wachtwoord mag niet leeg zijn.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation>Uw wachtwoord is te kort.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>De wachtwoorden komen niet overeen.</translation>
     </message>
@@ -2865,162 +2499,71 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
-        <translation>Deck Laden</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Niet geldige deck lijst.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation>Plak hier een link naar een decklijst site om deze te importeren.
-(Archidekt, Deckstats, Moxfield, en TappedOut worden ondersteund.)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation>Deck van Website Laden.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation>Geen lezer beschikbaar voor deze deck-leveraar.
-(Archidekt, Deckstats, Moxfield, en TappedOut worden ondersteund.)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation>Netwerk fout: %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation>Lege deckinformatie ontvangen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation>Parsen deckinformatie mislukt: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-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>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Laad dek</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation>Spelers:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation>Algemeen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation>Beginnend levenstotaal:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation>Spel opzet opties</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation>Instellingen onthouden</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation>Opties plaatselijk spel</translation>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
-        <translation>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/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation>Ongeldige filter</translation>
     </message>
@@ -3028,92 +2571,92 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Vul je gegevens en de gegevens van de server waar je wil registreren.
 Je email zal gebruikt worden om je account te controleren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Eigenaar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Poort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Naam van speler:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>W&amp;achtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Wachtwoord (opnieuw):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Email (opnieuw):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Land:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Echte naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Registreer op server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Registratie Waarschuwing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>Je wachtwoord is te kort.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Uw wachtwoorden komen niet overeen, probeer opnieuw.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Uw email adressen komen niet overeen, probeer opnieuw.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Spelersnaam kan niet leeg zijn.</translation>
     </message>
@@ -3121,17 +2664,17 @@ Je email zal gebruikt worden om je account te controleren.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation>Aantal zijden:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation>Aantal dobbelstenen:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation>Werp Dobbelstenen</translation>
     </message>
@@ -3139,55 +2682,40 @@ Je email zal gebruikt worden om je account te controleren.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <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"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <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"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
-        <translation>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"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <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"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
-        <translation>Alle naar voorkeur instellen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation>Drukken aangepast als groep</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation>Alle drukinformatie gewist</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation>Alle drukken naar voorkeur instellen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3204,7 +2732,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3221,7 +2749,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2762,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3243,7 +2771,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3252,7 +2780,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3265,59 +2793,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Weergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>Gebruikersomgeving</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation>Kaart Bronnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Geluid</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Sneltoetsen</translation>
     </message>
@@ -3325,59 +2853,57 @@ Wilt u uw database lokatie aanpassen?</translation>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/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"/>
+        <location filename="src/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"/>
+        <location filename="src/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"/>
+        <location filename="src/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"/>
+        <location filename="src/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"/>
+        <location filename="src/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"/>
+        <location filename="src/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>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>Volgende</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>Vorige</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Tip van de Dag</translation>
     </message>
@@ -3385,166 +2911,169 @@ Je kan altijd dit gedrag aanpassen in de &quot;Algemeen&quot; instellingtab.</tr
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Huidig releasekanaal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Herinstalleer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Annuleer Downloaden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Open de downloadpagina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation>Controleren op Client-updates</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>Cockatrice is niet gebouwd met SSL-ondersteuning, daarom kunt u niet automatisch updates downloaden! 
 Ga naar de downloadpagina om handmatig bij te werken.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
-        <translation>Bewerkingen downloaden: %1</translation>
+        <oldsource>Downloading update...</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Controleren op updates...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Controle op updates voltooid</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Geen Update Beschikbaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice is up to date!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>U draait al de laatste versie die beschikbaar is in het gekozen releasekanaal.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Huidige versie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Geselecteerd releasekanaal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Update Beschikbaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Een nieuwe versie van Cockatrice is beschikbaar!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Nieuwe versie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>Released</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Changelog</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Wilt u nu updaten?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <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>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Update Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Er is een fout opgetreden bij het controleren op updates:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Er is een fout opgetreden tijdens het downloaden van een update:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Installeren...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice kan het installatieprogramma niet openen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Probeer handmatig bij te werken door Cockatrice te sluiten en het installatieprogramma uit te voeren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>Download locatie</translation>
     </message>
@@ -3552,263 +3081,125 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Wis log bij sluiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
-        <translation>Kopieer naar klembord</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Debug Log</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation>Raapkansinstellingen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation>Criteria:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation>Kaartnaam</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation>Subtype</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation>Manawaarde</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation>Precisie:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation>Minstens</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation>Precies</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation>Kwantiteit (N):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation>Kaarten getrokken (M):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation>kaarten</translation>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation>Raapkans</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation>Kans op rapen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation>Kaartnaam</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation>Hoeveel</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation>Kans (%)</translation>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/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>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
-        <translation>Card Hoarder</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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
-        <translation>Card Kingdom</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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
-        <translation>Card Market</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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
-        <translation>Face 2-Face</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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
-        <translation>Mana Pool</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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
-        <translation>MTG Stocks</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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
-        <translation>Scg</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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
-        <translation>Tcgl</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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
-        <translation>Tcgplayer</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
-        <translation>%1% Synergie</translation>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation>Game Changers</translation>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation>Budget</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
-        <translation>Gemiddeld Deck</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
-        <translation>Zoutigheid:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>Typ hier uw filter in</translation>
     </message>
@@ -3816,325 +3207,244 @@ Je moet misschien handmatig de nieuwe versie downloaden.</translation>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
-        <translation>Bevestig Verwijderen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/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"/>
+        <location filename="src/client/ui/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"/>
+        <location filename="src/client/ui/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>
-    </message>
-</context>
-<context>
-    <name>GameEventHandler</name>
-    <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>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation>speler heeft het spel verlaten</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation>speler verbrak verbinding van server</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation>reden onbekend</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Gelieve eerst naar de juiste kamer te gaan.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Verkeerd wachtwoord.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Toeschouwers zijn niet toegelaten in dit spel.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>Dit spel is reeds vol.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>Het spel bestaat niet meer.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Dit spel is alleen toegankelijk voor geregistreerde gebruikers.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <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"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Je wordt genegeerd door de maker van dit spel.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
-        <translation>Aansluiten bij spel</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
-        <translation>Spel Toeschouwen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
-        <translation>Spelgegevens</translation>
+        <translation type="unfinished"/>
     </message>
     <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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Aansluiten bij spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>Gelieve eerst bij de betreffende kamer aan te sluiten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filter spellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>W&amp;is filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>C&amp;reëer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>&amp;Aansluiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation>Aansluiten als judge</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>&amp;Aansluiten als toeschouwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation>Aansluiten als judge toeschouwer</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation>Spellen weergegeven: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Spellen</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation>Alle types</translation>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 dag</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 uur</numerusform><numerusform>%1%2 uur</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation>nieuw</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>wachtwoord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <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"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>enkel geregistreerde gebruikers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation>decklijsten gedeeld</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>kan praten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>zie handen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>kan handen zien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>niet toegelaten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Kamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Ouderdom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Omschrijving</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Maker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Restricties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Spelers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Toeschouwers</translation>
     </message>
@@ -4142,609 +3452,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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="381"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="380"/>
         <source>Check for card database updates on startup</source>
-        <translation>Controleren op kaartendatabasebewerkingen bij opstarten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="381"/>
         <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/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="386"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="385"/>
         <source>Always update in the background</source>
-        <translation>Altijd in achtergrond bewerken</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="386"/>
         <source>Check for card database updates every</source>
-        <translation>Controleren op kaartendatabasebewerkingen iedere</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
-        <translation>dagen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/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/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/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/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>
-    </message>
-</context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Graveyard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation>&amp;Bekijk graveyard</translation>
-    </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>
-    </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>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation>Onthul willekeurige kaart aan...</translation>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Hand</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation>&amp;Bekijk hand</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation>Sorteer hand op...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation>Naam</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation>Manawaarde</translation>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Graveyard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exile</translation>
-    </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>Reveal r&amp;andom card to...</source>
-        <translation>Onthul &amp;willekeurige kaart aan....</translation>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation>Maak Nieuw Deck</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation>Decks Doorbladeren</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation>Kaartendatabase Doorbladeren</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation>EDHRec Doorbladeren</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation>Archidekt Doorbladeren</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation>Replays Inzien</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation>Sluiten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation>Verbinden...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation>Verbinden</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation>Spelen</translation>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation>&amp;Library</translation>
-    </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>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</source>
-        <translation>Leen library aan...</translation>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation>&amp;Raap kaart</translation>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation>Schudden</translation>
-    </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>
-    </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>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation>&amp;Alle spelers</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation>Onthul bovenste kaarten van library</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation>Aantal kaarten: (max. %1)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>De server heeft zijn maximale gebruikerscapaciteit bereikt, controleer later nogmaals.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Er zijn te veel gelijktijdige verbindingen vanaf uw adres.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Verbannen door moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Verwachte eindtijd: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>Deze verbanning duurt voor onbepaalde tijd.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Geplande stillegging van de server.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Ongeldige spelersnaam.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>U bent uitgelogd omdat u op een andere locatie bent ingelogd.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Connectie verbroken</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>De server heeft uw verbinding beëindigd.
 Reden: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4755,603 +3661,613 @@ Alle lopende spellen zullen verloren gaan.
 Reden voor de sluiting: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Geplande stillegging server</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Succesvol</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Registratie geaccepteerd.
 Logt nu in.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Account activering geaccepteerd.
 Logt nu in.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Aantal spelers</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Voer het aantal spelers in.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Speler %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Laad replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>Over Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>Versie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice Webpagina</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Project Manager:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>Vroegere projectmanagers:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>Ontwikkelaars:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>Onze ontwikkelaars</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>Help ontwikkelen!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Vertalers:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>Onze Vertalers</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>Help Vertalen!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Steun:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Een probleem melden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Probleemoplossing</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Time-out van de server</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Gefaalde Login</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>Uw client lijkt functies te missen die deze server nodig heeft voor de verbinding.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>Om uw client bij te werken, gaat u naar &apos;Hulp -&gt; Controleer op Client Updates&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Onjuiste gebruikersnaam of wachtwoord. Controleer uw verificatiegegevens en probeer het opnieuw.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Er is al een actieve sessie bezig met deze gebruikersnaam.
 Gelieve die sessie eerst af te sluiten en opnieuw in te loggen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Je bent banned tot %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Je bent voor onbepaalde tijd banned.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>Deze server vereist een gebruikersregistratie. Wilt u zich nu registreren?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation>Deze server vereist client ID&apos;s. Uw client slaagt er niet in een ID te genereren of u heeft een aangepaste client.
 Gelieve uw client te sluiten en te heropenen om het opnieuw te proberen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>Er is een interne fout opgetreden, gelieve uw client te sluiten en te heropenen alvorens het opnieuw te proberen.
 Als de fout zich blijft voordoen, controleer dan of u de laatste versie van de software gebruikt en neem indien nodig contact op met de softwareontwikkelaars.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Account activering</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>Uw account is nog niet geactiveerd.
 U moet de activeringscode die u in de activeringsmail hebt ontvangen, invullen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>Server Vol</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Onbekende aanmeldingsfout: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 Dit betekent meestal dat uw clientversie verouderd is en dat de server een antwoord heeft gestuurd dat uw client niet begrijpt.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>Uw gebruikersnaam moet aan deze regels voldoen:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>is %1 - %2 karakters lang</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>kan %1 kleine letters bevatten.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>NIET</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>kan %1 hoofdletters bevatten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>kan %1 numerieke tekens bevatten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>kan de volgende leestekens bevatten: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>eerste teken kan %1 een leesteken zijn.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation>geen onacceptabel taalgebruik als aangegeven door deze server regels:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>mag niet een van de volgende woorden bevatten: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>mag niet overeenkomen met een van de volgende expressies: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>U mag alleen A-Z, a-z, 0-9, _, ., en - in uw gebruikersnaam gebruiken.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>Registratie geweigerd</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>Registratie is momenteel uitgeschakeld op deze server.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>Er bestaat al een bestaand account met dezelfde gebruikersnaam.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>Het is verplicht om een geldig e-mailadres op te geven bij de registratie.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>Het lijkt erop dat u probeert een nieuw account te registreren op deze server, maar dat u al een account hebt geregistreerd met de verstrekte e-mail. Deze server beperkt het aantal accounts dat een gebruiker per adres kan registreren. Neem contact op met de serverbeheerder voor verdere hulp of om uw gegevens te verkrijgen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>Wachtwoord te kort.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>De registratie is mislukt wegens een technisch probleem op de server.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <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"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>Onbekende registratiefout: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>Account activering mislukt</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Socket error: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>U probeert verbinding te maken met een verouderde server. Gelieve uw Cockatrice versie te downgraden of verbinding te maken met een geschikte server.
 Lokale versie is %1, externe versie is %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>Uw Cockatrice klant is verouderd. Gelieve uw Cockatrice versie bij te werken.
 Lokale versie is %1, externe versie is %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Verbinding maken met %1....</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>Registreren bij %1 als %2....</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Verbinding verbroken</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Verbonden, inloggen bij %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation>Aanvragen van vergeten wachtwoord tot %1 als %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Verbinden....</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>V&amp;erbinding verbreken</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <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"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Bekijk replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Volledig scherm</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Registreer bij server...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Reset wachtwoord...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Instellingen....</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Afsluiten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>Act&amp;ies</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;Kaartdatabase:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Beheer sets...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Aangepaste &amp;tokens bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>Open map voor aangepaste afbeeldingen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>Open aangepaste sets map</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>Aangepaste sets/kaarten toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
-        <translation>Kaartendatabase opniew laden</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
-        <translation>Tabs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;Hulp</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Over Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Tip van de Dag</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>Controleren op Client-updates</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation>Kijk of er kaartupdates zijn...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <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"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
-        <translation>Statusbalk Weergeven</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation>Bekijk &amp;debug log</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
-        <translation>Instellingsmap Openen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation>Tonen/Verbergen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>Niewe Versie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice geinstalleerd</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>Kaartdatabase</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Open instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <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/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5362,17 +4278,17 @@ Set codes: %1
 Wilt u deze inschakelen?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
+        <location filename="src/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>Bekijk sets</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Welkom</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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 +4297,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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <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/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <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/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,863 +4365,669 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation>Laad sets/kaarten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <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/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation>Reset Wachtwoord</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <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>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation>Manabasis Configuratie</translation>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
-        <translation>Manabasis</translation>
-    </message>
-</context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation>Groepeer Op:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation>type</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation>kleur</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation>subtype</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation>kracht</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation>hardheid</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation>Filters (optioneel):</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation>Hoofdbalk rij weergeven</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation>Rij per kategorie weergeven</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
-        <translation>Manacurve</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation>Soort weergave:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation>taart</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation>balk</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation>combinatieBalk</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation>Filter Kleuren (optioneel):</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
-        <translation>Manatoewijding</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation>Bovenste soort weergave:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation>taart</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation>balk</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation>Kleuren:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation>Rij per kleur weergeven</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation>%1 stipjes (%2 kaarten)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation>%1 mana (%2 kaarten)</translation>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation>Manaproductie/toewijding</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation>Manadistributieinstellingen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 is terug in het spel.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>een kaart</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <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/server/message_log_widget.cpp" line="369"/>
         <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/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <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"/>
-        <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>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation>omgekeerd</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation>normaal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>Kop</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>Munt</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 legt hun laats getrekte kaart terug (%2).</translation>
     </message>
@@ -6314,206 +5035,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <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/dialogs/dlg_settings.cpp" line="1467"/>
         <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/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation>Bericht bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation>Bericht Verwijderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Bericht:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation>Bericht bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation>Chat instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <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/dialogs/dlg_settings.cpp" line="1451"/>
         <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/dialogs/dlg_settings.cpp" line="1452"/>
         <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/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <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/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <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/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Woorden scheiden met een spatie, alleen alfanumerieke tekens</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation>Verplaats naar</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation>%bovenkant library in willekeurige volgorde</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation>X kaarten van bovenkant library...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation>&amp;Onderkant library in willekeurige volgorde</translation>
-    </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"/>
-        <source>&amp;Hand</source>
-        <translation>&amp;Hand</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation>&amp;Graveyard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exile</translation>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation>Kaart type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation>Mana Waarde</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation>Kleur(en)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation>Loyaliteit</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation>Hoofd Kaarttype</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation>Mana Kosten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation>Kant</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
-        <translation>Indeling</translation>
+        <translation>Lay-out</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation>Color Identity</translation>
     </message>
@@ -6521,80 +5199,80 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/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"/>
+        <location filename="src/client/ui/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"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
-        <translation>Overlap richting:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation>Onbekende fase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation>Untap</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation>Rapen</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation>Eerste Hoofdfase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation>Begin Gevecht</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation>Aanvallers Aangeven</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation>Verdedigers Aangeven</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation>Gevecht Schade</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation>Einde Gevecht</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation>Tweede Hoofdfase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation>Einde/Opruimen</translation>
     </message>
@@ -6602,57 +5280,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Einde van de beurt fase</translation>
     </message>
@@ -6660,376 +5338,796 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>en</translation>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation>Bekijk bovenste kaarten van library</translation>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>Onthul bovenste kaarten van 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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Aantal kaarten: (max. %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
-        <source>View bottom cards of library</source>
-        <translation>Bekijk onderste kaarten library</translation>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>&amp;Bekijk graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
-        <source>Shuffle top cards of library</source>
-        <translation>Schud bovenste kaarten library</translation>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>&amp;Bekijk exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
-        <source>Shuffle bottom cards of library</source>
-        <translation>Schud onderste kaarten library</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation>Raap hand</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation>0 en minder zijn in verhouding tot huidige handgrootte</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-    </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>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation>Raap onderste kaarten</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation>&amp;Maak nog een %1 token</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <source>Create tokens</source>
-        <translation>Token maken</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
-        <source>Number:</source>
-        <translation>Aantal:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation>Plaats kaart X kaarten vanaf bovenkant van library</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <source>Which position should this card be placed:</source>
-        <translation>Hoeveelste van boven moet de kaart geplaatst worden:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <source>(max. %1)</source>
-        <translation>(max. %1)</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change power/toughness</source>
-        <translation>Verander kracht/hardheid</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change stats to:</source>
-        <translation>Verander stats naar:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
-        <source>Set annotation</source>
-        <translation>Aantekening instellen</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
-        <source>Please enter the new annotation:</source>
-        <translation>Voer de nieuwe aantekening in:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
-        <source>Set counters</source>
-        <translation>Counters instellen</translation>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
+        <location filename="src/game/player/player.cpp" line="769"/>
         <source>Player &quot;%1&quot;</source>
         <translation>Speler &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;Graveyard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;Exile</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>&amp;Verplaats hand naar....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>&amp;Bovenkant van library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>&amp;Onderkant van library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>&amp;Verplaats graveyard naar...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;Hand</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>&amp;Verplaats exile naar...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>&amp;Bekijk library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation>&amp;Bekijk hand</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>Bekijk de b&amp;ovenste kaarten van de library....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>Onthul &amp;library aan...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>Toon &amp;altijd de bovenste kaart</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>&amp;Bekijk sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;Trek kaart</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>Tr&amp;ek kaarten....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>&amp;Laatste trekking ongedaan maken</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>Neem &amp;mulligan</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>Speel bovenste kaart &amp;verdekt</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation>Verplaats de bovenste kaart naar grave&amp;yard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation>Verplaats de bovenste kaart naar exile</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>Verplaats de bovenste kaarten naar de &amp;graveyard....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>Verplaats bovenste kaarten naar &amp;exile....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>Leg bovenste kaart aan de &amp;onderkant</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation>Leen library aan...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation>Plaats bovenste kaart op stack &amp;totdat...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>&amp;Onthul hand aan....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Onthul &amp;willekeurige kaarten aan....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation>Onthul willekeurige kaart aan...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>&amp;Sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
         <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>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</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>Drukkiezer opnieuw inschakelen</translation>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>&amp;Ontap alles</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>&amp;Rol dobbelsteen...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>&amp;Creëer token...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>C&amp;reëer nog een token</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>&amp;Voorgedefinieerde token maken</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>&amp;Alle spelers</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>&amp;Zeg</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Speel</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>&amp;Verberg</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>Speel kaart &amp;verdekt</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation>&amp;Tap / Ontap</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>&amp;Normal ontappen schakelen</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <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/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>&amp;Gluren naar de voorkant van de kaart</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>&amp;Kloneer</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>Aan de kaart &amp;bevestigen....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>&amp;Losmaken</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>&amp;Teken pijl....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>&amp;Verhoog kracht</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>V&amp;erlaag kracht</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>Ve&amp;rhoog hardheid</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>Ver&amp;laag hardheid</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>Ver&amp;hoog kracht en hardheid</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>Verl&amp;aag kracht en hardheid</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation>Verhoog kracht en verlaag hardheid</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation>Verminder kracht en verhoog hardheid</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>&amp;Zet kracht en hardheid</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation>Herstel &amp;kracht en hardheid</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>Aantekeningen &amp;zetten....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>Voeg counter &amp;toe (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;Verwijder counter (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>Counters &amp;instellen (%1)...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation>&amp;Bovenste kaart van library in willekeurige volgorde</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation>Kaarten van de bovenkant van de library...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation>&amp;Onderkant van library in willekeurige volgorde</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>Bekijk de bovenste kaarten van de library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <source>View bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <source>Shuffle top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1276"/>
+        <source>Shuffle bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <source>Which position should this card be placed:</source>
+        <translation>Hoeveelste van boven moet de kaart geplaatst worden:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <source>(max. %1)</source>
+        <translation>(max. %1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation>Trek hand</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation>0 en lager zijn in vergelijking met de huidige handgrootte</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>Trek kaarten</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>Aantal:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>Verplaats bovenste kaarten naar graveyard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation>&amp;Onthul bovenste kaarten aan....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation>&amp;Bovenkant van library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation>&amp;Onderkant van library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation>Toon &amp;altijd de bovenste kaart</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation>O&amp;pen deck in deck editor</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation>&amp;Speel bovenste kaart</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation>&amp;Trek onderste kaart</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation>T&amp;rek onderste kaarten...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation>&amp;Speel onderste kaart</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation>Speel onderste kaart &amp;gesloten</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <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/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation>Verplaats onderste kaart naar exile</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation>Verplaats onderste kaarten naar &amp;graveyard....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation>Verplaats onderste kaarten naar &amp;exile....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation>Leg onderste kaart &amp;bovenop</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation>&amp;Geselecteerde kaarten</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>Verplaats bovenste kaarten naar exile</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation>Verplaats onderste kaarten naar graveyard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation>Verplaats onderste kaart naar exile</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation>Trek onderste kaarten</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation>&amp;Maak nog een %1 token</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation>Token maken</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation>Plaats kaart X kaarten vanaf de bovenkant van de library</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change power/toughness</source>
+        <translation>Verander stats</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change stats to:</source>
+        <translation>Verander stats naar:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3653"/>
+        <source>Set annotation</source>
+        <translation>Aantekening instellen</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3654"/>
+        <source>Please enter the new annotation:</source>
+        <translation>Voer de nieuwe aantekening in:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Set counters</source>
+        <translation>Zet counters</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation>&amp;Onthul aan....</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation>Bekijk gerelateerde kaarten</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>Token: </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>Alle tokens</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <source>Display Navigation Buttons</source>
-        <translation>Navigatieknoppen weergeven</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="155"/>
-        <source>Printing Selector</source>
-        <translation>Drukkiezer</translation>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
-        <translation>Gerelateerde kaarten weergeven</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/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>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <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"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <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"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
-        <translation>Volgende Kaart in Deck</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <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"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <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"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <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>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation>Kracht / hardheid</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation>Ver&amp;hoog kracht</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation>Ver&amp;laag kracht</translation>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
-    </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>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>Diensten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>Verberg %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>Verberg Anderen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>Toon Alle</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>Voorkeuren...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>Stop %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>Over %1</translation>
     </message>
@@ -7037,174 +6135,135 @@ Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatrice kaartendatabase (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>Alle bestanden (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice replays (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation>Maindeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation>Tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <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"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <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>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation>Alles Opslaan</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation>Ja op A&amp;lle</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation>&amp;Nee</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation>Nee op &amp;Alle</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation>Afbreken</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation>Opnieuw proberen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation>Negeren</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation>Afleggen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation>Hulp</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation>Toepassen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation>Resetten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation>Standaardinstellingen herstellen</translation>
     </message>
@@ -7212,17 +6271,17 @@ Weet je zeker dat je deze functie wil uitschakelen?</translation>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Upload tijd</translation>
     </message>
@@ -7230,149 +6289,103 @@ Weet je zeker dat je deze functie wil uitschakelen?</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>Spelers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>Bewaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>Tijd begonnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>Duur (sec)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation>&amp;Exile</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation>&amp;Bekijk exile</translation>
-    </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>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation>&amp;Bovenkant library</translation>
-    </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>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Kamers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Deelnemen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Kamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Omschrijving</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>Toestemmingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Spelers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</source>
         <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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation>Kies een actie uit de tabel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation>Druk op de toets/combinatie van toetsen die je voor deze functie wilt gebruiken.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation>Ongeldige toets</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <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"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation>Wis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation>Herstel standaard</translation>
     </message>
@@ -7380,27 +6393,27 @@ Weet je zeker dat je deze functie wil uitschakelen?</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>Ingeschakeld</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>Set type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>Set code</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Lange naam</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>releasedatum</translation>
     </message>
@@ -7408,81 +6421,81 @@ 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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation>Sectie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation>Functie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation>Sneltoets:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <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/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
-        <translation>Zoek op sneltoetsnaam</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/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"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
-        <translation>Sneltoets</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Uw configuratiebestand bevatte ongeldige snelkoppelingen.
 Controleer uw snelkoppelingsinstellingen!</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>De volgende snelkoppelingen zijn op de standaardinstelling ingesteld:
@@ -7492,58 +6505,45 @@ Controleer uw snelkoppelingsinstellingen!</translation>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>&amp;Reden voor de sluiting:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;Tijd tot uitschakeling (minuten):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>Server uitschakelen</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation>&amp;Sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation>&amp;Bekijk sideboard</translation>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <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/dialogs/dlg_settings.cpp" line="1544"/>
         <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/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation>Geluidsinstellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>Hoofdvolume</translation>
     </message>
@@ -7551,48 +6551,48 @@ Controleer uw snelkoppelingsinstellingen!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation>Spoilers seizoen is afgelopen</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Verwijdert spoiler.xml. Gelieve Oracle te draaien</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation>Spoilers downloaden mislukt</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation>Geen internetverbinding</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation>Spoilers reeds up-to-date</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation>Geen nieuwe spoilers toegevoegd</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation>Spoilers zijn bijgewerkt!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation>Laatste Wijziging:</translation>
     </message>
@@ -7600,27 +6600,27 @@ Controleer uw snelkoppelingsinstellingen!</translation>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/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"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>Geen antwoord ontvangen van de release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Ongeldig antwoord ontvangen van de release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>Geen antwoord ontvangen van de tag update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Ongeldig antwoord ontvangen van de tag update server.</translation>
     </message>
@@ -7628,307 +6628,184 @@ Controleer uw snelkoppelingsinstellingen!</translation>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
-        <translation>Account</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>Beheer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>Update server &amp;bericht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;Server uitschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>&amp;Herlaad configuratie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Functies voor serverbeheer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
-        <translation>Servermoderatiefuncties</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
-        <translation>Replay ID</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <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"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <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"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <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"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>Functies &amp;ontgrendelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>&amp;Vergrendel functies</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
-        <translation>Succesvol</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <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"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
-        <translation>Foutmelding</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <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"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <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"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <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"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <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"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <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"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
-        <translation>Niet mogelijk om gebruiker te activeren. Interne fout</translation>
-    </message>
-</context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation>Afl.</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>EN</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>Vereis ALLE gekozen kleuren</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>Decknaam...</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>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>
-    </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>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"/>
-        <source>Search</source>
-        <translation>Zoeken</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"/>
-        <source>Formats</source>
-        <translation>Formats</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation>Archidekt:</translation>
+        <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/client/tabs/tab_deck_editor.cpp" line="125"/>
         <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/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>&amp;Bekijk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation>Kaartendatabase</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <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/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>Zichtbaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>Zwevend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <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/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Dek: %1</translation>
     </message>
@@ -7936,635 +6813,664 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
-        <translation>Herstel indeling</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <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"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <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"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <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"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
-        <translation>Proefhand</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <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"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Dekopslag op de server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <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"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <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"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Upload dek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Download dek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <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"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <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"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <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"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <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"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <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"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <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"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation>Ongeldig deck bestand</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Geeft dek naam in</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>De deklijst heeft geen naam. Geef een naam in aub.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Onbenoemd dek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation>Uploaded van deck naar server mislukt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <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"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <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"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
-        <translation>Deckopslag</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
-        <translation>Kon deck op %1 niet openen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
-        <translation>EDHREC:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/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>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
+        <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation>Replay Tijdslijn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>Fases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>Spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <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/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <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/client/tabs/tab_game.cpp" line="236"/>
         <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/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <source>Game &amp;information</source>
         <translation>Spelgegevens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <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/client/tabs/tab_game.cpp" line="257"/>
         <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/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <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/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>Zeg:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation>Geselecteerde kaarten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>&amp;Bekijk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>Zichtbaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>Zwevend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <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/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>Opgeven</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation>Opgeven ongedaan maken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation>Verlaat spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation>Je bent het spel aan het overstelpen. Wacht enkele seconden aub.</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>gekickt door een game host of moderator</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>speler heeft het spel verlaten</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>verbinding tussen de speler en de server is verbroken</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation>reden onbekend</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>Je bent uit het spel gegooid.</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation>Thuis</translation>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>Tijd;Afzendernaam;AfzenderIP; Bericht;DoelID;DoelNaam</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>Kamerlogboeken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>Spellogboeken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>Chat Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>U moet ten minste één filter selecteren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>U moet een geldig aantal dagen selecteren om te zoeken.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>Gebruikersnaam: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>IP-adres: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>Spelnaam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>GameID: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>Boodschap: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>Hoofdkamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>Spelkamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>Privéchat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>Afgelopen X dagen: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>Vandaag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>Afgelopen uur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>Maximale resultaten: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>Er is minstens één filter nodig.
 Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>Gebruikerslogboeken ontvangen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>Wis filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>Loglokaties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>Datumbereik</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>Maximale resultaten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>Bericht Geschiedenis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>Het is mislukt om informatie over de berichtgeschiedenis te verzamelen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Er zijn geen berichten voor de geselecteerde filters.</translation>
     </message>
@@ -8572,37 +7478,37 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>Privaat gesprek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>Verlaat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Privaat gesprek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>Deze gebruiker negeert u, ze kunnen uw berichten niet zien in de hoofdchat en u kunt niet deelnemen aan hun spelletjes.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>Privé bericht van</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 heeft zich afgemeld van de server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 heeft zich aangemeld op de server</translation>
     </message>
@@ -8610,234 +7516,153 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <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"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>Opslag gespeelde spellen op server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>Bekijk opgeslagen spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <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"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
-        <translation>Nieuwe map</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <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"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>Download opgeslagen spel.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>Schakel expiratieslot om</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation>Ontvang replay-deelcode</translation>
-    </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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <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"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <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"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
-        <translation>Nieuwe naam:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
-        <translation>Foutmelding</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
-        <translation>Hernoemen mislukt</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <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"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <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"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <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"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <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>
-    </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>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <translation>Replay-deelcode</translation>
-    </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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation>Kopieer naar klembord</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation>Replay-deelcode</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation>Replay-code gevonden</translation>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation>Versturen code mislukt</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation>Onverwachte foutmelding</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>Verwijder op server opgeslagen spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
-        <translation>Spel-replays</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>Zeg:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Gesprek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>Kamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>Verlaat kamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>Maak gespreksgeschiedenis leeg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>Gespreksinstellingen...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation> heeft je genoemd.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/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"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>Je bent de chat aan het overstelpen. Wacht enkele seconden a.u.b.</translation>
     </message>
@@ -8845,35 +7670,35 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation>Aansluiten bij kamer mislukt: deze bestaat niet op de server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation>De server denkt dat je in de kamer bent, maar de client is niet in staat om deze te tonen. Probeer de client opnieuw te starten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation>U heeft niet de vereiste toestemming om bij deze kamer aan te sluiten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation>Mislukt om bij de kamer aan te sluiten door een onbekende fout: %1.</translation>
     </message>
@@ -8881,97 +7706,87 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
-        <translation>Deckbewerker</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <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"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation>Thuis</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <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"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <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"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
-        <translation>Server</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
-        <translation>Account</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
-        <translation>Deckopslag</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
-        <translation>Spel-replays</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
-        <translation>Beheer</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
-        <translation>Logs</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>Weet je het zeker?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>Er staan nog spellen open. Ben je zeker dat je wilt afsluiten?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation>Klik om weer te geven</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Je maatje %1 heeft in gelogd!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>Onbekend Event</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8982,39 +7797,39 @@ Dit bericht kan betekenen dat er een nieuwe versie van Cockatrice beschikbaar is
 Om uw client bij te werken, ga naar Hulp -&gt; Controleer op updates. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation>Inactiviteit Time-out</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>U staat op het punt uitgelogd te worden wegens inactiviteit.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>Promotie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation>Je bent bevorderd. Gelieve uit te loggen en weer in te loggen om de wijzigingen in werking te laten treden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>Gewaarschuwd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>U heeft een waarschuwing ontvangen wegens %1.
 Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties tegen u worden ondernomen. Als u vragen heeft, kunt u een privé-bericht sturen naar een moderator.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>U heeft het volgende bericht van de server ontvangen.
@@ -9024,26 +7839,21 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation>Databaseweergave</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
-        <translation>Visuele Databaseweergave</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>Niet in staat om het dek te analyseren.</translation>
     </message>
@@ -9051,14 +7861,14 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>Bestand bestaat niet.
 </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>Fout in het openen van bestand.
@@ -9068,42 +7878,42 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Leven</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Wit</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Blauw</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Zwart</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Rood</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Groen</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Kleurloos</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Overig</translation>
     </message>
@@ -9111,7 +7921,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>Kon het bestand niet openen om te lezen.</translation>
     </message>
@@ -9119,206 +7929,184 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>Gebruikersdetails</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>Privaat gesprek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Toon spellen van deze gebruiker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <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"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <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"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>Voeg toe aan negatielijst</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Verwijder uit negatielijst</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>Gooi uit spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>Waarschuw gebruiker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Bekijk waarschuwings&amp;geschiedenis van gebruiker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>Verban van de &amp;server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Bekijk &amp;bangeschiedenis van gebruiker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Bevorder gebruiker tot moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Demoteer gebruiker van moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation>Bevorder gebruiker tot &amp;judge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation>Demoteer gebruiker van judge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <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>
-    </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>
-    </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>
-    </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>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>%1&apos;s spellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>Ban Geschiedenis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>Ban Tijd;Moderator;Ban Lengte; Ban Reden; Zichtbare Reden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>De gebruiker is nog nooit gebant.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation>Mislukt in het verzamelen van gegevens over ban.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>Waarschuwingsgeschiedenis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>Waarschuwingstijd;Moderator;Gebruikersnaam;Reden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>De gebruiker is nog nooit gewaarschuwd.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation>Mislukt in het verzamelen van gegevens over waarschuwing.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <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"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>Succesvol</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>Succesvolle promotie van gebruiker.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>Succesvolle demotie van gebruiker.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>Mislukt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>Mislukt in het bevorderen van gebruiker.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>De gebruiker is niet gedemoteerd.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
-        <translation>Kopieer hash naar klembord</translation>
+        <translation>Copieer hash naar klembord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Verwijder de berichten van deze gebruiker</translation>
     </message>
@@ -9326,173 +8114,173 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>Leeftijd lidmaatschap</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>Bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>Verander wachtwoord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>Verander Icoon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Administrator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Geregistreerde gebruiker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Ongeregistreerde gebruiker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation>Judge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation>Het opgegeven wachtwoord komt niet overeen met jouw account.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>Gegevens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>Gebruikersgegevens bijgewerkt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation>Gebruikersgegevens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation>Echte Naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation>Gebruikersniveau:</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation><numerusform>%n jaar, </numerusform><numerusform>%n jaar, </numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation><numerusform>%10%n dag %20</numerusform><numerusform>%10%n Dagen %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>Wachtwoord Invoeren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation>Wachtwoord controle is vereist om je e-mailadres te veranderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation>Er is een fout opgetreden bij het bijwerken van uw gebruikersgegevens.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>Deze server staat jou niet toe om je gebruikersgegevens bij te werken.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>Wachtwoord gewijzigd.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>Deze server staat u niet toe uw wachtwoord te wijzigen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>Het nieuwe wachtwoord is te kort.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>Het oude wachtwoord is onjuist.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>Avatar bijgewerkt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Deze server laat je niet toe om je avatar bij te werken.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>Er is een fout opgetreden bij het updaten van uw avatar.</translation>
     </message>
@@ -9500,152 +8288,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <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/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <source>Do not delete &amp;arrows inside of subphases</source>
-        <translation>Verwijder &amp;pijlen niet binnen subphases</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation>Notificatie instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation>Animatie-instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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="978"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="888"/>
         <source>Open deck in new tab by default</source>
-        <translation>Deck standaard in niewe tab openen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="889"/>
         <source>Use visual deck storage in game lobby</source>
-        <translation>Visuele deckopslag gebruiken in spelontvangstscherm</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="890"/>
         <source>Use selection animation for Visual Deck Storage</source>
-        <translation>Gebruik selectieanimatie voor Visuele Deckopslag</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="892"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="984"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
-        <translation>niks doen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <source>ask to convert to .cod</source>
-        <translation>vragen om naar .cod om te zetten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="898"/>
         <source>always convert to .cod</source>
-        <translation>altijd omzetten naar .cod</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="899"/>
         <source>Default deck editor type</source>
-        <translation>Standaard deckbewerker soort</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
-        <translation>Klassieke Deckbewerker</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
-        <translation>Visuele Deckbewerker</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
-        <translation>Replayinstellingen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9653,241 +8426,86 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9895,27 +8513,27 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9923,7 +8541,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/client/ui/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 +8549,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9951,37 +8569,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9989,93 +8597,45 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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>Klik en sleep om de sorteervolgorde binnen de groepen aan te passen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10083,25 +8643,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10109,52 +8690,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10162,7 +8738,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10170,22 +8746,22 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10193,17 +8769,17 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10211,43 +8787,43 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>Welke waarschuwing wilt u sturen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Verwijder alle berichten van deze gebruiker in alle kamers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>Waarschuw gebruiker voor wangedrag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>Gebruikersnaam om een waarschuwing naar te sturen kan niet leeg zijn, geef een gebruiker op om te waarschuwen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>Te gebruiken waarschuwing kan niet leeg zijn, selecteer een geldige waarschuwing om te verzenden.</translation>
     </message>
@@ -10255,133 +8831,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <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/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation>Afbeelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation>Tips</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation>Opmerking</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation>Beheer sets</translation>
     </message>
@@ -10389,72 +8965,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>Stapelweergave</translation>
     </message>
@@ -10462,7 +9038,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Nederlands (Dutch)</translation>
     </message>
@@ -10470,12 +9046,12 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation>Verbinding maken bij het opstarten</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation>Debug naar bestand</translation>
     </message>
@@ -10483,1058 +9059,991 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>Hoofdscherm</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
-        <translation>Deckbewerker</translation>
+        <translation>Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>Spel Lobby</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation>Kaart-counters</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation>Tellers</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Kracht en Hardheid</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Spelfasen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>Speelruimte</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation>Verplaats Geselecteerde Kaart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>View</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation>Verplaats Bovenste Kaart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation>Verplaats Onderste Kaart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Spelverloop</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation>Kaarten Trekken</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation>Chatkamer</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation>Spel Venster</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation>Laad Deck van Klembord</translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation>Replays</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation>Controleren op Kaart Updates...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation>Verbinden...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>De verbinding verbreken</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>Verlaten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>Volledig scherm</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation>Registreer...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation>Instellingen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation>Bekijk Replay...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation>Wis Alle Filters</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation>Wis Geselecteerde Filter</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation>Verwijder Kaart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation>Beheer Sets...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation>Aangepaste Tokens Bewerken...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation>Voeg Kaart Toe</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation>Deck Inladen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Deck Inladen van Klembord...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation>Nieuw Deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Open Custom Afbeeldingen Map</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation>Print Deck...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation>Verwijder Kaart</translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>Bewaar Deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation>Bewaar Deck Als...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Bewaar Deck op Klembord, Geannoteerd</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation>Bewaar Deck op Klembord</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation>Remote Deck Inladen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
-        <translation>Gereed om te Beginnen</translation>
+        <translation>Klaar om te Beginnen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Sideboard Vergrendeling Omschakelen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation>Groene Counters Omhoog</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation>Groene Counters Omlaag</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation>Groene Tellers Instellen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation>Rode Counters Omhoog</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation>Rode Counters Omlaag</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation>Rode Counters Instellen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation>Levensteller Omhoog</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation>Levensteller Omlaag</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation>Levensteller Instellen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation>Witte Teller Omhoog</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation>Witte Teller Omlaag</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation>Witte Teller Instellen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation>Blauwe Teller Omhoog</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation>Blauwe Teller Omlaag</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation>Blauwe Teller Instellen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation>Zwarte Teller Omhoog</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation>Zwarte Teller Omlaag</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation>Zwarte Teller Instellen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation>Kleurloze Teller Omhoog</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation>Kleurloze Teller Omlaag</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation>Kleurloze Teller Instellen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation>Overige Teller Omhoog</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation>Overige Teller Omlaag</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation>Overige Teller Instellen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation>Kracht Verhogen (+1/+0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Kracht Verlagen (-1/-0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Verplaats Hardheid Naar Kracht (+1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Hardheid Verhogen (+0/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Hardheid Verlagen (-0/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Verplaats Kracht Naar Hardheid (-1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Kracht en Hardheid Verhogen (+1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Kracht en Hardheid Verlagen (-1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation>Kracht en Hardheid Instellen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation>Kracht en Hardheid Resetten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>Ontap</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>Trek</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation>Eerste Hoofdfase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation>Start Gevechtfase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>Aanval</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>Blokkeren</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>Schade</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation>Einde Gevechtfase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation>Tweede Hoofdfase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>Einde</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation>Volgende Fase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation>Volgende Fase Handeling</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation>Volgende Beurt</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation>Tap / Ontap Kaart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation>Untap Alles</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
+        <translation>Untap Omschakelen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation>Draai Kaart Om</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation>Bekijk Kaart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation>Speel Kaart</translation>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation>Kaart Bevestigen Aan...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation>Kaart Losmaken</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation>Copieer Kaart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation>Maak Token...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <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/settings/shortcuts_settings.h" line="518"/>
         <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/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation>Zet Annotatie...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation>Bovenkant van Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation>Speelveld, Gesloten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation>Speelveld</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation>Bovenste Kaarten van Library</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation>Recent Overzicht Sluiten</translation>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <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/settings/shortcuts_settings.h" line="615"/>
         <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/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation>Trek Pijl...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <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/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation>Verlaat Spel</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>Opgeven</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation>Werp Dobbelstenen...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation>Library Schudden</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <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/settings/shortcuts_settings.h" line="650"/>
         <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/settings/shortcuts_settings.h" line="653"/>
         <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/settings/shortcuts_settings.h" line="656"/>
         <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/settings/shortcuts_settings.h" line="659"/>
         <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"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <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/settings/shortcuts_settings.h" line="665"/>
         <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/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
         <translation>Textvak Verlaten</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation>Focus Naar Chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation>Wis Chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation>Verversen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation>Start/Stop</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation>Versnelling Schakelen</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
-        <translation>Server</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
-        <translation>Account</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_pl.ts b/cockatrice/translations/cockatrice_pl.ts
index 236eff991..dbbf90572 100644
--- a/cockatrice/translations/cockatrice_pl.ts
+++ b/cockatrice/translations/cockatrice_pl.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Ustaw znacznik…</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Ustaw znacznik</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nowa wartość dla znacznika &apos;%1&apos;</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,81 +36,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation>Aktualności</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation>Notatki Administracyjne dla %1</translation>
     </message>
@@ -118,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -131,312 +129,251 @@ 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"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>Ustawienia motywu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Obecny motyw:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <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"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation>Ustawienia menu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation>Rendering kart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <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"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
-        <translation type="unfinished"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
+        <translation>Zastąp obrazy kart tymi z preferowanych dodatków (Zachowanie sprzed zmiany ProviderID) [Wymaga restartu kilenta]</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation>rzędy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <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/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <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/dialogs/dlg_settings.cpp" line="691"/>
         <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/dialogs/dlg_settings.cpp" line="692"/>
         <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/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maksymalny rozmiar czcionki dla informacji wyświetlanych na kartach</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>zbanuj nazwę &amp;użytkownika</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>zbanuj adres &amp;IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>ID zablokowanego konta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Rodzaj bana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>ban &amp;permanentny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>ban &amp;tymczasowy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dni:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Godziny:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minuty:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Czas trwania bana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Podaj przyczynę bana.
 Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowanej osoby.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Podaj przyczynę bana do wglądu dla banowanej osoby.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Redaguj wiadomości od tego użytkownika we wszystkich pokojach</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Zbanuj użytkownika z serwera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Aby ustawić bana, musisz wybrać nazwę, IP, ID klienta lub dowolną kombinację tej trójki.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Pole imienia musi być wypełnione dla opcji ban imienia.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Pole ip musi być wypełnione dla opcji ban ip.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Pole id klienta musi być wypełnione dla opcji ban id klienta.</translation>
     </message>
@@ -444,22 +381,22 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>Brak odpowiedzi z serwera uaktualnień wersji.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Nieprawidłowa odpowiedź serwera uaktualnień wersji.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>Brak odpowiedzi z serwera uaktualnień plików.</translation>
     </message>
@@ -467,32 +404,32 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Dodatki</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Koszt many</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Typ karty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>S/W</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Kolor(y)</translation>
     </message>
@@ -500,101 +437,96 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>ORAZ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>LUB</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>ORAZ NIE</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>LUB NIE</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Imię</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Kolor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>Ustaw</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Koszt Many</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>Wartość Many</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Rzadkość</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Siła</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Wytrzymałość</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Lojalność</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -602,22 +534,22 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation>Ilustracja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation>Karta + opis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +557,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -648,294 +580,172 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation>Powiązane karty:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation>Nieznana karta:</translation>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Przenieść do</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Siła / Wytrzymałość</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation>Rozmiar Karty</translation>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>jego rękę</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>ręka gracza: %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>jego bibliotekę</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>bibliotekę gracza %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>swoją bibliotekę</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>z biblioteki gracza %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>jego bibliotekę</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>bibliotekę gracza %1.</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>jego bibliotekę</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>bibliotekę gracza %1.</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>jego bibliotekę</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>bibliotekę gracza %1.</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>jego cmentarz</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>cmentarz gracza %1.</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>jego wygnanie</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>wygnanie gracza %1.</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>jego bibliotekę poboczną</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>bibliotekę poboczną gracza %1.</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>jego bibliotekę poboczną</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>bibliotekę poboczną gracza %1.</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -944,7 +754,7 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -952,60 +762,15 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1013,47 +778,47 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,97 +826,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +914,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1177,114 +932,109 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1042,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,227 +1050,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>Sukces</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation>Edytuj URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <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/dialogs/dlg_settings.cpp" line="1219"/>
         <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/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <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/dialogs/dlg_settings.cpp" line="1224"/>
         <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/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation>Usuń URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation>Dni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>Trwa aktualizacja...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <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/dialogs/dlg_settings.cpp" line="1205"/>
         <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/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>Spoilery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <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/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation>Lokalizacja spoilera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>Ostatnia zmiana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <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/dialogs/dlg_settings.cpp" line="1216"/>
         <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/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <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>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation>Ilość</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation>Dodatek</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>Ilość</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Karta</translation>
     </message>
@@ -1528,12 +1245,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,17 +1258,17 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,7 +1276,7 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,62 +1284,62 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,166 +1347,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>Odpowiedź serwera nie mogła zostać zinterpretowana.</translation>
     </message>
@@ -1813,58 +1472,54 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Gotowe do rozpoczęcia</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation>Wymuś rozpoczęcie</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation>Biblioteka poboczna odblokowana</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1872,19 +1527,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1892,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Pobieranie...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Znane Hosty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation>Usuń zaznaczony zapisany serwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Odśwież listę serwerów ze znanymi serwerami publicznymi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Nowy Host</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nazwa gracza:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>H&amp;asło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>Zapi&amp;sz hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>Połącz a&amp;utomatycznie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Automatycznie połącz ostatnim loginem przy otwarciu Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>Jeżeli masz problem z połączeniem lub rejestracją, skontaktuj się z obsługą serwera!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Strona internetowa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Zresetuj hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation>Zapomniałeś hasła?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Połącz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Serwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>Kontakt z Serwerem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Połącz z Serwerem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>Serwer URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>Port Komunikacyjny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>Unikalna Nazwa Serwera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Ostrzeżenie o połączeniu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>Musisz nazwać swój nowy profil połączenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Ostrzeżenie połączenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Nazwa użytkownika nie może być pusta</translation>
     </message>
@@ -2041,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Zapa&amp;miętaj ustawienia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Opis:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>&amp;Liczba graczy:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>Ogólne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Hasło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Tylko dla zn&amp;ajomych</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Tylko dla &amp;zarejestrowanych użytkowników</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Ograniczenia dostępu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>&amp;Widzowie dozwoleni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Widzowie muszą z&amp;nać hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Widzowie mogą korzystać z &amp;czatu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Widzowie mogą oglądać &amp;ręce</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>Stwórz grę jako widz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Widzowie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation>Początkowa ilość życia:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation>Opcje tworzenia gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;Wyczyść</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Stwórz grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Informacje o grze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Błąd serwera.</translation>
     </message>
@@ -2164,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nazwa:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Kolor:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>biały</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>niebieski</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>czarny</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>czerwony</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>zielony</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>wielokolorowy</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>bezkolorowy</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;S/W:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Adnotacja:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Zniszcz tokena kiedy opuści stół</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Dane tokena</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Pok&amp;azuj wszystkie tokeny</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Pokazuj tokeny z tej &amp;talii</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Wybierz token z listy:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Tworzenie tokena</translation>
     </message>
@@ -2262,53 +1907,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2316,40 +1961,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Nie wybrano obrazu.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>By zmienić twojego awatara wybierz nowy obrazek.
 By usunąć twojego bieżącego awatara potwierdź bez wybierania nowego obrazka.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Przeglądaj...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Zmień awatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Otwórz plik obrazu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Obrazy (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Nieprawidłowy obraz.</translation>
     </message>
@@ -2357,17 +2002,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2375,38 +2020,38 @@ By usunąć twojego bieżącego awatara potwierdź bez wybierania nowego obrazka
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Bieżące hasło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nowe hasło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Potwierdź nowe hasło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Zmień hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Twoje hasło jest za krótkie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Hasła nie są zgodne.</translation>
     </message>
@@ -2414,93 +2059,93 @@ By usunąć twojego bieżącego awatara potwierdź bez wybierania nowego obrazka
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nazwa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>K&amp;olor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>biały</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>niebieski</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>czarny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>czerwony</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>zielony</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>multikolorowy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>bezkolorowy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;S/W:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Adnotacja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Dane tokena</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Dodaj token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Usuń token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>Edytuj niestandardowe żetony</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Wprowadź nazwę tokena:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>Wybrana nazwa koliduje z istniejącą kartą lub tokenem.
@@ -2510,27 +2155,27 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Kraj:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Niezdefiniowane</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Prawdziwe imię:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Edycja profilu użytkownika</translation>
     </message>
@@ -2538,143 +2183,137 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>bez limitu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5 minut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10 minut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30 minut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1 godzina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2 godziny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Nowsze niż: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Opis gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>Założy&amp;ciel gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>Generalne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>Typy roz&amp;grywki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>co &amp;najmniej</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>co naj&amp;wyżej</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Maksymalna liczba graczy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Ograniczenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Pokazuj gry tylko jeśli &amp;widzowie mogą oglądać</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Pokazuj gry wymagające hasła dla widzów</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Pokazuj gry tylko jeśli widzowie mogą rozm&amp;awiać</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Pokazuj gry tylko jeśli widzowie mogą oglądać &amp;ręce</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation>Widzowie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Filtruj gry</translation>
     </message>
@@ -2682,52 +2321,52 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation>Ostrzeżenie w procesie przypominania hasła</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Wystąpił problem. Poproś o nowe hasło ponownie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation>Wpisz informacje serwera oraz konta, do którego chciał(a)byś stworzyć nowe hasło.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nazwa gracza:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation>Proces przypominania hasła</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation>Błąd w procesie przypominania hasła</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>Adres email nie może być pusty.</translation>
     </message>
@@ -2735,37 +2374,37 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation>Wpisz informacje serwera na którym chciał(a)byś stworzyć nowe hasło.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nazwa gracza:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation>Żądanie Resetu Hasła</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation>Błąd Resetu Hasła</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Nazwa gracza nie może być pusta.</translation>
     </message>
@@ -2773,86 +2412,86 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation>Ostrzeżenie Resetu Hasła</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Wystąpił problem. Poproś o nowe hasło ponownie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation>Wpisz otrzymany token oraz nowe hasło aby je ustawić.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nazwa gracza:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Token:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Nowe Hasło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Zresetuj hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Nazwa gracza nie może być pusta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation>Błąd Resetu Hasła</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>Token nie może być pusty.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>Nowe hasło nie może być puste.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation>Twoje hasło jest za krótkie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>Hasła nie są zgodne.</translation>
     </message>
@@ -2860,7 +2499,7 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -2868,146 +2507,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Nieprawidłowa lista talii.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Wczytaj talię</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation>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/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation>Nieprawidłowy filtr</translation>
     </message>
@@ -3015,92 +2571,92 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Wpisz swoje informacje oraz informacje serwera do którego chciałbyś się zarejestrować.
 Twój email zostanie użyty aby zweryfikować twoje konto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nazwa gracza:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>H&amp;asło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Hasło (ponownie):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Email (ponownie):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Kraj:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Nie wiadomo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Prawdziwe imię:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Zarejestruj się</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Ostrzeżenie rejestracji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>Twoje hasło jest za krótkie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Wpisane hasła nie są zgodne. Spróbuj ponownie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Wpisane adresy mailowe nie są zgodne. Spróbuj ponownie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Nazwa użytkownika nie może być pusta</translation>
     </message>
@@ -3108,17 +2664,17 @@ Twój email zostanie użyty aby zweryfikować twoje konto.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation>Liczba ścian:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation>Liczba kości:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation>Rzuć kośćmi</translation>
     </message>
@@ -3126,55 +2682,40 @@ Twój email zostanie użyty aby zweryfikować twoje konto.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3191,7 +2732,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3208,7 +2749,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2762,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3230,7 +2771,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3239,7 +2780,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3252,59 +2793,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Ogólne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Wygląd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>Interfejs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <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/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Czat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Dźwięk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Skróty</translation>
     </message>
@@ -3312,39 +2853,39 @@ Czy chcesz zmienić ustawienia położenia bazy kart?</translation>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3352,17 +2893,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>Następna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>Poprzednia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Wskazówka na Dziś</translation>
     </message>
@@ -3370,165 +2911,169 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Kanał obecnej wersji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Przeinstaluj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Anuluj Pobieranie </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Otwórz stronę pobierań</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation>Sprawdź aktualizacje klienta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>Cockatrice nie wspiera SSL, dlatego automatyczne pobieranie uaktualnień nie jest możliwe!
 Odwiedź stronę pobierania żeby uaktualnić ręcznie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Sprawdzam aktualizacje...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Skończyłem sprawdzać aktualizacje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Brak nowych aktualizacji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice jest aktualny!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>Używasz obecnie najnowszej dostępnęj wersji w wybranym kanale wydania</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Obecna wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Wybierz kanał wydania</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Dostępna aktualizacja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Nowa wersja Cockatrice jest dostępna!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Nowa wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>Wydania</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Zmiany</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Chcesz teraz zaktualizować?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Błąd aktualizacji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Wystąpił błąd podczas sprawdzania aktualizacji:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Wystąpił błąd podczas pobierania aktualizacji:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Instaluję...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice nie może otworzyć instalatora.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Spróbuj zaktualizować ręcznie poprzez zamknięcie Cockatrice i włączenie instalatora.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>Lokalizacja pobierania</translation>
     </message>
@@ -3536,162 +3081,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Wyczyść logi przy zamykaniu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Log Debugera</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3699,47 +3112,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3747,44 +3160,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3792,7 +3199,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>Podaj swój filtr</translation>
     </message>
@@ -3800,325 +3207,244 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Proszę najpierw dołączyć do właściwego pokoju.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Nieprawidłowe hasło.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Ta rozgrywka nie dopuszcza widzów.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>Ta rozgrywka jest już pełna.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>Ta rozgrywka już nie istnieje.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Ta rozgrywka jest dostępna tylko dla zarejestrowanych użytkowników.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Ta rozgrywka jest dostępna tylko dla znajomych jej twórcy.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Twórca tej rozgrywki cię ignoruje.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Dołącz do gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Hasło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>Proszę najpierw dołączyć do odpowiedniego pokoju. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtr rozgrywek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>Usuń fi&amp;ltr</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>Utwó&amp;rz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>&amp;Dołącz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>D&amp;ołącz jako widz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation>Gra pokazana: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Gry</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 dzień</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 godz</numerusform><numerusform>%1%2 godz</numerusform><numerusform>%1%2 godz</numerusform><numerusform>%1%2 godz</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation>Nowa</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>tylko znajomi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>tylko zarejestrowani użytkownicy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>mogą rozmawiać</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>widzą ręce</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>widzą ręce</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>niedozwoleni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Pokój</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Wiek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Twórca</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Ograniczenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Gracze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Widzowie</translation>
     </message>
@@ -4126,609 +3452,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>Ten serwer osiągnął maksymalną liczbę użytkowników, proszę sprawdzić później.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Trwa zbyt wiele równoległych połączeń z twojego adresu.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Zbanowany przez moderatora.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Oczekiwany czas zakończenia: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>Ten ban jest bezterminowy.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Planowe wyłączenie serwera.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Nieprawidłowa nazwa użytkownika.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>Zostałeś wylogowany ze względu inny proces logowania.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Połączenie zakończone</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>Serwer zakończył twoje połączenie.
 Przyczyna: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4743,573 +3665,583 @@ Wszystkie trwające gry zostaną utracone.
 Przyczyna zamknięcia: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Planowe wyłączenie serwera</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Operacja zakończona pomyślnie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Rejestracja zaakceptowana.
 Rozpocznij logowanie.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Aktywacja konta zakończona pomyślnie.
 Rozpocznij logowanie.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Liczba graczy</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Wprowadź liczbę graczy.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Gracz %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Wczytaj powtórkę</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>O Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>Wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Oficjalna strona Cocatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Menadżer projektu:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>Poprzedni menadżerowie projektu:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>Twórcy:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>Lista współpracowników</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>Dołącz do grona twórców!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Tłumacze:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>Nasi Tłumacze:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>Pomóż w tłumaczeniu!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Wsparcie:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Zgłoś problem</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Rozwiązywanie problemów</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>Najczęściej zadawane pytania</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Upłynął limit czasu odpowiedzi serwera</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Nie udało się zalogować</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>Twój klient prawdopodobnie nie spełnia wymagań połączenia z tym serwerem.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>Aby zaktualizować twojego klienta, pójdź do &apos;Pomoc -&gt; Sprawdź ustawienia klienta&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Nieprawidłowa nazwa użytkownika lub hasło. Sprawdź swoje dane weryfikacyjne i spróbuj ponownie.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Istnieje już aktywna sesja dla tej nazwy użytkownika.
 Zakończ tamtą sesję i zaloguj się ponownie.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Twój ban trwa do: %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Zostałeś zbanowany bezterminowo.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>Ten serwer wymaga rejestracji użytkownika. Chcesz się teraz zarejestrować?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation>Ten serwer potrzebuje ID klienta. Twój klient nie może wygenerować ID lub używasz zmodyfikowanego klienta.
 Proszę zamknij i otwórz ponownie swojego klienta aby spróbować ponownie.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>Doszło do wewnętrznego błędu, proszę zamknąć i ponownie otworzyć Cockatrice przed ponowną próbą.
 Jeśli błąd będzie się utrzymywać, upewnij się, że używasz najnowszej wersji programu oraz jeśli potrzebne skontaktuj się z deweloperami programu.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Aktywacja konta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>Twoje konto nie zostało jeszcze aktywowane.
 Musisz podać token aktywujący, otrzymany w wiadomości email.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>Serwer pełny</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Nieznany błąd logowania: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>To zwykle oznacza że wersja klienta jest nieaktualna i serwer wysłał odpowiedź, której twój klient nie rozpoznaje.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>Twoja nazwa użytkownika musi być zgodna z poniższymi regułami:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>%1 jest o %2 znaków za długi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>może zawierać 1% małych liter</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>NIE</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>może zawierać %1 dużych liter</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>może zawierać %1 cyfr</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>Może zawierać następujące interpunkcje: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>Pierwszy znak może zawierać %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation>zasady serwera nie pozwalają na takie słownictwo:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>Nie można używać żadnego z podanych wyrazów: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>Nie pasuje to żadnego z podanych wyrażeń: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>Możesz użyć tylko tych znaków: A-Z, a-z, 0-9, _, ., i - w nazwie użytkownika.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>Rejestracja nieudana</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>Rejestracja jest obecnie wyłączona na tym serwerze.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>Istnieje już konto o tej nazwie.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>Podanie poprawnego adresu email jest wymagane przy rejestracji.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>Zdaje się że próbujesz zarejestrować nowe konto na tym serwerze, posiadając już zarejestrowane konto dla tego adresu. Ten serwer ogranicza liczbę kont, które można zarejestrować dla pojedynczego adresu. Skontaktuj się z operatorem serwera w celu uzyskania pomocy lub otrzymania twoich poufnych danych.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>Hasło jest zbyt krótkie.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>Rejestracja nie powiodła się z powodów technicznych na serwerze.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>Nieznany błąd rejestracji: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>Aktywacja konta zakończona niepowodzeniem</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Błąd gniazda: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>Próbujesz połączyć się z nieaktualnym serwerem. Zainstaluj starszą wersję Cockatrice lub wybierz odpowiedni serwer.
 Lokalna wersja to %1, wersja zdalna to %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>Twój klient Cockatrice jest nieaktualny. Uaktualnij Cockatrice do nowszej wersji.
 Lokalna wersja to %1, wersja zdalna to %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>%1 — łączenie…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>Rejestrowanie do %1 jako %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Rozłączony</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Połączenie ustanowione; logowanie jako %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation>Proszenie o zapomniane hasło do %1 jako %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Połącz…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Rozłącz</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>Rozpocznij &amp;lokalną grę…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Obejrzyj powtórkę…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>Pełny ekra&amp;n</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Zarejestruj się...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Przywróć hasło...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Ustawienia…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Wyjdź</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>Ak&amp;cje</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>B&amp;aza kart</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Zarządzaj dodatkami...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Edytuj niestandardowe %tokens...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>Otwórz folder ze spersonalizowanymi obrazkami</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>Otwórz folder ze spersonalizowanymi setami</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>Dodaj spersonalizowane sety/karty</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation>Przeładuj bazę kart</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>Po&amp;moc</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;O Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Wskazówka na Dziś</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>Sprawdź uaktualnienia klienta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation>Uaktualnij bazę kart...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation>Pokaż log &amp;debugowania</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation>Pokaż/Ukryj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>Nowa Wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice zainstalowany</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>Baza kart</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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 +4250,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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Otwórz ustawienia </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <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/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5355,17 +4287,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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>Pokaż dodatki</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Witaj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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 +4306,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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Informacja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,863 +4374,669 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation>Wczytaj dodatki/karty</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <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/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation>Zresetuj hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <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>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 nie poddał gry.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>kartę</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <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"/>
-        <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/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation>odwrócone</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation>normalne</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>Orzeł</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>Reszka</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 cofa ostatnią dobraną kartę (%2)</translation>
     </message>
@@ -6306,206 +5044,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <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/dialogs/dlg_settings.cpp" line="1467"/>
         <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/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation>Edytuj Wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation>Usuń Wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Wiadomość:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation>Edytuj wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation>Ustawienia czatu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <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/dialogs/dlg_settings.cpp" line="1451"/>
         <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/dialogs/dlg_settings.cpp" line="1452"/>
         <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/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <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/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <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/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Rozdziel słowa spacją, tylko alfanumeryczne znaki</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation>Typ Karty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation>Wartość Many</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation>Kolor(y)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation>Lojalność</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation>Główny Typ Karty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation>Koszt Many</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation>S/W</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation>Strona</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation>Ułożenie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation>Tożsamość Koloru</translation>
     </message>
@@ -6513,17 +5208,17 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation>Karty które mają się przykrywać:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation>Procent przykrycia:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation>Kierunek przykrycia:</translation>
     </message>
@@ -6531,62 +5226,62 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation>Nieznana Faza</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation>Odtapuj</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation>Utrzymanie</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation>Dobieranie</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation>Pierwsza Główna</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation>Początek Walki</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation>Wyznacz Atakujących</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation>Wyznacz Broniących</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation>Obrażenia</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation>Koniec Walki</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation>Druga Główna</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation>Koniec/Czyszczenie</translation>
     </message>
@@ -6594,57 +5289,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Krok końca tury</translation>
     </message>
@@ -6652,213 +5347,703 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>Odsłoń górną kartę biblioteki</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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
+        <translation>Liczba kart: (maksymalnie %1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>Przegląda&amp;j cmentarz</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>Przeglądaj strefę &amp;wygnania</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>Gracz &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>C&amp;mentarz</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>Str&amp;efa wygnania</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>Prze&amp;mieść rękę na…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>Wierzch biblio&amp;teki</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>Dno &amp;biblioteki</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>Prze&amp;mieść cmentarz na…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>Rę&amp;ka</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>Przen&amp;ieś strefę wygnania na…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>Przegląda&amp;j bibliotekę</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation>&amp;Zobacz rękę</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>Przeglądaj karty z &amp;wierzchu biblioteki…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>Pokaż bib&amp;liotekę innym…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>Z&amp;awsze graj z odwróconą kartą z wierzchu</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>Przegląda&amp;j talię poboczną</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;Dobierz kartę</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>Dobie&amp;rz karty…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>Co&amp;fnij ostatnie dobranie karty</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>Weź &amp;mulligan</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>Zagraj górną kartę &amp;koszulką do góry</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation>Przenieś wierzchnią kartę do cmentarza</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation>Przenieś wierzchnią kartę do wygnanych</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>Przemieść kart&amp;y z wierzchu na cmentarz…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>Przemi&amp;eść karty z wierzchu do strefy wygnania…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>Połóż kartę z wierzc&amp;hu na dnie</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation>Pożycz bibliotekę innym...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation>Kładź karty z wierzchu na stosie &amp;dopóki...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>Pokaż &amp;rękę innym…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Pok&amp;aż losową kartę innym…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation>Pokaż losową kartę...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>Ta&amp;lia poboczna</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Biblioteka</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>Li&amp;czniki</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>Odtap&amp;uj wszystkie permanenty</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>Rzuć k&amp;ostką…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>Ut&amp;wórz token…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>Utwó&amp;rz kolejny token</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>Utwórz zd&amp;efiniowany token</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>Wszyscy gr&amp;acze</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>P&amp;owiedz</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation>Zaznacz wszystko</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation>W&amp;ybierz rząd</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation>W&amp;ybierz kolumnę</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Zagraj</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>Sc&amp;howaj</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>Zagraj k&amp;oszulką do góry</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation>&amp;Zatapuj / Odtapuj</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Przełącz &amp;normalne odtapowywanie</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation>Połóż grzbietem do dołu/do góry</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>S&amp;pójrz na awers karty</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>Klo&amp;nuj</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>Przyłącz do kart&amp;y…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>Odłą&amp;cz</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>Narysuj wskaźni&amp;k</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>Zw&amp;iększenie siły</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>Re&amp;dukcja siły</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>Zwiększe&amp;nie wytrzymałości</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>R&amp;edukcja wytrzymałości</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>Zwięk&amp;sz siłę i wytrzymałość</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>Red&amp;ukuj siłę i wytrzymałość</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation>Zwiększ siłę i zmniejsz wytrzymałość</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation>Zmniejsz siłę i zwiększ wytrzymałość</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>Ustaw siłę i w&amp;ytrzymałość</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation>Resetuj siłę i wytrzymałość</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>U&amp;staw adnotację…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>Dodaj znacznik (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>Odejmij znacznik (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>&amp;Ustaw znaczniki (%1)...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation>&amp;Wierzch biblioteki w losowej kolejności</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation>X kart z wierzchu biblioteki...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation>Spód biblioteki w losowej kolejności</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>Przeglądaj karty z wierzchu biblioteki</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
         <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.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
+        <translation>W której pozycji ta karta powinna być zagrana:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <source>(max. %1)</source>
-        <translation type="unfinished"/>
+        <translation>(maks. %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation>Dobierz rękę</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation>0 i mniejsze są w porównaniu do aktualnego rozmiaru ręki</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>Dobierz karty</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>Liczba:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>Przenieś karty z wierzchu na cmentarz</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation>Pokaż kar&amp;ty z wierzchu innym…</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation>Wierzch biblio&amp;teki...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation>Dno &amp;biblioteki...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation>Z&amp;awsze patrz na pierwszą kartę z wierzchu</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation>&amp;Otwórz talię w edytorze talii</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation>Zagraj wierzchnią kartę</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation>&amp;Dobierz kartę z dna</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation>Dobie&amp;rz karty z dna...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation>Zagraj kartę z dna</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation>Zagraj kartę z dna &amp;koszulką do góry</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation>Przen&amp;ieś kartę z dna na cmentarz</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation>Przenieś kartę z dna do strefy wygnania</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation>Przen&amp;ieś karty z dna na cmentarz...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation>Przenieś karty z dna do strefy wygnania</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation>Przenieś kartę z dna na wierzch</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation>Wybrane karty</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>Przenieś karty z wierzchu do strefy wygnania</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation>Przenieś karty z dna na cmentarz</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation>Przenieś karty z dna do strefy wygnania</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation>Dobierz karty z dna</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation>Stwórz kolejny token %1</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation>Stwórz tokeny</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation>Umieść kartę w kolejności X od wierzchu biblioteki.</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change power/toughness</source>
-        <translation type="unfinished"/>
+        <translation>Zmień siłę/wytrzymałość</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change stats to:</source>
-        <translation type="unfinished"/>
+        <translation>Zmień statystyki na:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player.cpp" line="3653"/>
         <source>Set annotation</source>
-        <translation type="unfinished"/>
+        <translation>Ustaw adnotację</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player.cpp" line="3654"/>
         <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
+        <translation>Podaj treść nowej adnotacji:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation>Ustaw znaczniki</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <source>&amp;Counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingDisabledInfoWidget</name>
-    <message>
-        <location filename="src/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"/>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation>Pokaż innym…</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation>Zobacz powiązane karty</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>Token:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>Wszystkie tokeny</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation>Pokaż powiązane karty</translation>
     </message>
@@ -6866,7 +6051,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation>Szukaj po nazwie dodatku lub kodzie dodatku</translation>
     </message>
@@ -6874,17 +6059,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation>Poprzednia karta w talii</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation>Następna karta w talii</translation>
     </message>
@@ -6892,132 +6077,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation>Alfabetycznie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation>Rosnąco</translation>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>Usługi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>Ukryj %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>Ukryj pozostałe</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>Pokaż wszystkie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>Preferencje…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>Zakończ %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>O programie %1</translation>
     </message>
@@ -7025,162 +6144,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Baza kart Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Powtórki Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation>Maindeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation>Tokeny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation>Zapisz Wszystko</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation>Tak - wszystko</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation>Nie - wszystko</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation>Przerwij</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation>Powtórz</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation>Ignoruj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation>Odrzuć</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation>Aplikuj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation>Przywróć domyślne</translation>
     </message>
@@ -7188,17 +6280,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Data dodania</translation>
     </message>
@@ -7206,149 +6298,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>Gracze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>Zachowaj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>Czas rozpoczęcia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>Czas trwania (sek)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Pokoje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Dołącz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Pokój</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>Zezwolenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Gracze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation>Wybierz akcję z tabeli</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation>Naciśnij klawisz lub kombinację klawiszy którą chcesz ustawić na tą akcję</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation>Nieprawidłowy klawisz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation>Skrót aktualnie użyty przez:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation>Wyczyść</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation>Przywróć domyślne</translation>
     </message>
@@ -7356,27 +6402,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>Włączone</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>Rodzaj dodatku</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>Kod dodatku</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Pełna nazwa</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>Data wydania</translation>
     </message>
@@ -7384,53 +6430,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation>Sekcja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation>Akcja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation>Skrót:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <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/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation>Szukaj po nazwie skrótu</translation>
     </message>
@@ -7438,12 +6484,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Akcja</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Skrót</translation>
     </message>
@@ -7451,14 +6497,14 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Twój plik konfiguracyjny zawierał nieprawidłowe skróty.
 Sprawdź ustawienia skrótów!</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Następujące skróty zostały zamienione na domyślne:
@@ -7468,58 +6514,45 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>P&amp;rzyczyna zamknięcia:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>Czas do zamknięcia (w minu&amp;tach):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>Zamknij serwer</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <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/dialogs/dlg_settings.cpp" line="1544"/>
         <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/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <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/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>Główne ustawienia głośności</translation>
     </message>
@@ -7527,48 +6560,48 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation>Sezon spoilerów zakończony</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Usuwanie spoiler.xml. Uruchom Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation>Pobieranie spoilerów nieudane</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation>Brak połączenia z internetem</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation>Spoilery są już aktualne</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation>Nie dodano nowych spoilerów</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation>Spoilery zostały zaktualizowane.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation>Ostatnia zmiana:</translation>
     </message>
@@ -7576,27 +6609,27 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>Brak odpowiedzi z serwera uaktualnień wersji.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Nieprawidłowa odpowiedź serwera uaktualnień wersji.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>Brak odpowiedzi z serwera uaktualnień tagów.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Nieprawidłowa odpowiedź serwera uaktualnień tagów.</translation>
     </message>
@@ -7604,17 +6637,17 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -7622,289 +6655,166 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>Administracja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>Aktualizuj wiado&amp;mość serwera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>Zamknij &amp;serwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>&amp;Załaduj ponownie konfigurację</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Pokaż funkcje administracyjne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation>ID powtórki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation>Przyznaj Dostęp do Powtórki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation>Nazwa użytkownika do aktywowania</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation>Wymuś aktywowanie użytkownika</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>Odblok&amp;uj funkcje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>Zab&amp;lokuj funkcje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation>Operacja zakończona pomyślnie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation>Dostęp do powtórki przyznany</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation>Nie można przyznać dostępu. ID powtórki jest nieprawidłowe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation>Nie można przyznać dostępu. Błąd wewnętrzny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation>Użytkownik pomyślnie aktywowany</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation>Nie można aktywować użytkownika. Nazwa użytkownika jest nie prawidłowa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation>Nie można aktywować użytkownika. Użytkownik jest już aktywny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation>Nie można aktywować użytkownika. Błąd wewnętrzny</translation>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <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/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>Talia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>Filtry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>&amp;Widok</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation>Wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>Widoczne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <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/client/tabs/tab_deck_editor.cpp" line="142"/>
         <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/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Talia: %1</translation>
     </message>
@@ -7912,55 +6822,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7968,22 +6891,22 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7991,139 +6914,139 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>Pliki lokalne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Przechowalnia talii na serwerze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Otwórz w edytorze talii</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Wyślij talię</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Pobierz talię</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>Nowy folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation>Otwórz folder talii</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation>Nieprawidłowy plik talii</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Podaj nazwę talii</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>Talia nie posiada nazwy.
 Wprowadź nazwę:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Nienazwana talia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation>Nie udało się wysłać talii na serwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>Usuń plik lokalny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Czy na pewno chcesz usunąć wybrane pliki?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>Nazwa nowego folderu:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8131,17 +7054,17 @@ Wprowadź nazwę:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8149,7 +7072,7 @@ Wprowadź nazwę:</translation>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8157,391 +7080,407 @@ Wprowadź nazwę:</translation>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <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/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>&amp;Fazy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>&amp;Gra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <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/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <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/client/tabs/tab_game.cpp" line="236"/>
         <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/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <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/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <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/client/tabs/tab_game.cpp" line="257"/>
         <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/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <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/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>&amp;Powiedz:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>&amp;Widok</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>Widoczne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>Pływające</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <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/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>Poddaj grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation>Powróć do gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation>Opuść grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation>Spamujesz. Poczekaj chwilę.</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>wyrzucony przez gospodarza gry lub moderatora</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>gracz opuścił grę</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>gracz rozłączył się z serwerem</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation>nieznany powód</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>Wyrzucono cię z gry.</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>Logi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>Logi Pokoju</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>Logi Gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>Logi Czatu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>Musisz wybrać przynajmniej jeden filtr.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>Musisz wybrać poprawną liczbę dni żeby zlokalizować.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>Nazwa użytkownika:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>Adres IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>Nazwa rozgrywki:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>ID Gry:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>Wiadomość:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>Pokój Główny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>Pokój</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>Rozmowa Prywatna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>Ostatnie X Dni:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>Dziś</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>Ostatnia godzina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>Maksymalny Wynik:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>Wymagany jest co najmniej jeden filtr.
 Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>Pobierz Logi Użytkownika</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>Wyczyść Filtry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>Filtry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>Loguj Połóżenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>Okres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>Maksymalny Wynik</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>Historia wiadomości</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>Nie udało się zebrać informacji o historii wiadomości.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Brak wiadomości dla wybranych filtrów.</translation>
     </message>
@@ -8549,37 +7488,37 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>Prywatny &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;Opuść</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Prywatny chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>Ten użytkownik Cię ignoruje, nie może zobaczyć twoich wiadomości w głównym czacie oraz nie możesz dołączyć do jego gier.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>Prywatna wiadomość od</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>Gracz %1 opuścił serwer.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>Gracz %1 pojawił się na serwerze.</translation>
     </message>
@@ -8587,185 +7526,105 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>Lokalny system plików</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>Powtórki na serwerze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>Obejrzyj powtórkę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation>Zmień nazwę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation>Nowy folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation>Otwórz folder powtórek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>Pobierz powtórkę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>Wł./Wył. ochronę przed automatycznym usunięciem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation>Zmień nazwę lokalnego folderu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation>Zmień nazwę lokalnego pliku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation>Nowa nazwa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation>Zmiana nazwy nie powiodła się</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation>Nazwa nowego folderu:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>Usuń plik lokalny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Czy na pewno chcesz usunąć wybrane pliki?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Czy na pewno chcesz usunąć wybrane powtórki?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>Usuń przechowywaną powtórkę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -8773,47 +7632,47 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;Powiedz:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Czat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>P&amp;okój</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>Op&amp;uść pokój</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>Wyczyść &amp;czat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>Ustawienia czatu…</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation>wspomniał o tobie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>Kliknij aby podglądnąć</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>Spamujesz. Poczekaj chwilę.</translation>
     </message>
@@ -8821,35 +7680,35 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>Serwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation>Błąd podczas próby dołączenia do pokoju: nie istnieje na serwerze.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation>Serwer myśli że jesteś w pokoju ale twój klient nie może tego wyświetlić. Spróbuj zrestartować twojego klienta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation>Nie masz uprawnień do dołączenia do tego pokoju.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation>Błąd podczas próby dołączenia do pokoju z powodu nieznanego błędu: %1</translation>
     </message>
@@ -8857,97 +7716,87 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>Czy na pewno?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>Ciągle masz otwarte gry. Czy na pewno chcesz wyjść?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation>Kliknij aby podglądnąć</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Twój znajomy %1 zalogował się!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>Nieznane zdarzenie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8958,39 +7807,39 @@ Ta wiadomośc może oznaczać że jest dostępna nowa wersja Cockatrice, lub że
 Aby aktualizować klienta, otwórz okno Pomoc -&gt; Sprawdź Aktualizacje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation>Przekroczono czas bezczynności</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Zostaniesz wylogowany ze względu na nieaktywność.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>Awans</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation>Zostałeś awansowany. Proszę wyloguj się i zaloguj ponownie aby zmiany zostały wprowadzone.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>Ostrzeżony</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>Otrzymałeś ostrzeżenie z powodu %1.
 Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. Jeżeli masz pytania, wyślij prywatną wiadomość do moderatora.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>Otrzymałeś następującą wiadomość od serwera.
@@ -9000,12 +7849,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -9013,13 +7857,13 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>Nie można przeanalizować talii.</translation>
     </message>
@@ -9027,13 +7871,13 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>Plik nie istnieje.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>Nie udało się otworzyć pliku</translation>
@@ -9042,42 +7886,42 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Życie</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Biały</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Niebieski</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Czarny</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Czerwony</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Zielony</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Bezkolorowy</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Inne</translation>
     </message>
@@ -9085,7 +7929,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>Nie można było otworzyć pliku do odczytu.</translation>
     </message>
@@ -9093,206 +7937,184 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>&amp;Dane użytkownika</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>Prywatny &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Wyświetl &amp;gry użytkownika</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>&amp;Dodaj do listy znajomych</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>&amp;Usuń z listy znajomych</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>Dodaj do listy &amp;ignorowanych</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Usuń z listy &amp;ignorowanych</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>Wyrzuć z &amp;gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>Daj ostrzeżenie użytkownikowi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Zobacz historie ostrzeżeń użytkownika</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>Zbanuj z &amp;serwera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Zobacz historie blokad użytkownika</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Daj użytkownikowi uprawnienia moderatora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>&amp;Zabierz użytkownikowi uprawnienia moderatora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation>&amp;Daj użytkownikowi uprawnienia sędziego</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation>&amp;Zabierz użytkownikowi uprawnienia sędziego</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation>Sprawdź notatki administratorskie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <source>This user does not exist.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>Gry gracza %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>Historia blokad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>Blokada Czas;Moderator;Czas Blokady;Powód Blokady;Widoczny Powód</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>Użytkownik nigdy nie został zablokowany</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation>Błąd podczas zbierania informacji o blokadach.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>Historia ostrzeżeń</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>Ostrzeżenie Czas;Moderator;Nazwa Użytkownika;Powód</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>Użytkownik nigdy nie dostał ostrzeżenia.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation>Błąd podczas zbierania informacji o ostrzeżeniach.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation>Błąd podczas zbierania notatek administratorskich.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>Operacja zakończona pomyślnie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>Pomyślny awans gracza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>Pomyślna degradacja gracza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>Wystąpił błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>Błąd podczas awansu gracza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>Błąd podczas degradacji gracza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation>Zapisz hash do schowka</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Usuń wiadomości tego użytkownika</translation>
     </message>
@@ -9300,173 +8122,173 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Lokacja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>Wiek konta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>Zmień hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>Zmień awatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Administrator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Zarejestrowany użytkownik</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Niezarejestrowany użytkownik</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation>Sędzia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation>Wpisane hasło nie pasuje do twojego konta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>Informacje o użytkowniku zaktualizowane.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation>Informacje o użytkowniku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation>Prawdziwe imię:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation>Rodzaj użytkownika:</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation><numerusform>%n Rok</numerusform><numerusform>%n Lat</numerusform><numerusform>%n Lat</numerusform><numerusform>%n Lat</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation><numerusform>%10%n Dzień %20</numerusform><numerusform>%10%n Dni %20</numerusform><numerusform>%10%n Dni %20</numerusform><numerusform>%10%n Dni %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>Wpisz hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation>Weryfikacja hasłem jest wymagana aby zmienić twój adres email.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation>Wystąpił błąd podczas aktualizacji informacji o użytkowniku.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>Ten serwer nie pozwala na aktualizację twoich informacji o użytkowniku.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>Hasło zmienione.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>Ten serwer nie pozwala na zmianę twojego hasła.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>Nowe hasło jest za krótkie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>Stare hasło jest niepoprawne.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>Awatar zaktualizowany</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Ten serwer nie pozwala na aktualizację twojego awatara.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>Wystąpił błąd podczas aktualizowania twojego awatara.</translation>
     </message>
@@ -9474,152 +8296,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <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/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation>Ustawienia powiadomień</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation>Ustawienia animacji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <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/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Buforuj czas do przeskoku w tył wywołane przez skrót:</translation>
     </message>
@@ -9627,241 +8434,86 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9869,27 +8521,27 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9897,7 +8549,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/client/ui/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 +8557,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9925,37 +8577,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9963,93 +8605,45 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10057,25 +8651,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10083,52 +8698,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10136,7 +8746,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10144,22 +8754,22 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10167,17 +8777,17 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10185,43 +8795,43 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>Jakie ostrzeżenie chciałbyś wysłać?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Redaguj wiadomości od tego użytkownika we wszystkich pokojach</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>Ostrzeż gracza za złe zachowanie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>Nazwa gracza do wysłania ostrzeżenia nie może być pusta, prosze podać gracza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>Ostrzeżenie nie może być puste, zaznacz poprawne ostrzeżenie do wysłania.</translation>
     </message>
@@ -10229,133 +8839,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <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/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation>Wskazówki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation>Notatka</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation>Zarządzaj dodatkami</translation>
     </message>
@@ -10363,72 +8973,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>widok sterty</translation>
     </message>
@@ -10436,7 +9046,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Polski (Polish)</translation>
     </message>
@@ -10444,12 +9054,12 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation>Zaloguj po uruchowmieniu</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation>Debuguj do pliku</translation>
     </message>
@@ -10457,1058 +9067,991 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>Główne okno</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>Edycja Talii</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>Poczekalnia gier</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation>Znaczniki kart</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation>Znaczniki graczy</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Siła i wytrzymałość</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Fazy gry</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>Teren gry</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation>Przenieś wybraną kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation>Przenieś kartę z wierzchu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation>Przenieś kartę z dołu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Rozgrywka</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation>Dobieranie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation>Pokój czatu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation>Okno gry</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation>Wczytaj talię ze schowka</translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation>Powtórki</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation>Uaktualnij bazę kart...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation>Połącz…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>Rozłącz</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>Wyjście</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>Pełny ekran</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation>Zarejestruj się...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation>Ustawienia...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation>Rozpocznij lokalną grę…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation>Obejrzyj powtórkę…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation>Wyczyść wszystkie filtry</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation>Wyczyść zaznaczone filtry</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation>Usuń kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation>Zarządzaj dodatkami...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation>Edytuj niestandardowe tokeny...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation>Dodaj kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation>Wczytaj talię...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Wczytaj talię ze schowka…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation>Nowa talia</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Otwórz folder z niestandardowymi obrazkami</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation>Drukuj talię</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation>Usuń kartę</translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation>Zresetuj wygląd</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>Zapisz talię</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation>Zapisz talię jako…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Zapisz talię, anotowaną, do schowka</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation>Zapisz talię do schowka</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation>Wczytaj talię lokalną...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation>Wczytaj zdalną talię...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation>Ustaw gotowość do rozpoczęcia</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Przełącz blokadę sideboard</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation>Dodaj Zielony Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation>Odejmij Zielony Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation>Ustaw Zielony Znacznik...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation>Dodaj Czerwony Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation>Odejmij Czerwony Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation>Ustaw Czerwony Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation>Dodaj do Znacznika Życia</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation>Odejmij od Znacznika Życia</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation>Ustaw Znacznik Życia...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation>Dodaj Biały Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation>Odejmij Biały Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation>Ustaw Biały Znacznik...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation>Dodaj Niebieski Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation>Odejmij Niebieski Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation>Ustaw Niebieski Znacznik...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation>Dodaj Czarny Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation>Odejmij Czarny Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation>Ustaw Czarny Znacznik...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation>Dodaj Bezkolorowy Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation>Odejmij Bezkolorowy Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation>Ustaw Bezkolorowy Znacznik...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation>Dodaj Inny Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation>Odejmij Inny Znacznik</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation>Ustaw Inny Znacznik...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation>Dodaj Power (+1/+0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Odejmij Power (-1/-0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Przesuń Toughness do Power (+1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Dodaj Toughness (+0/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Odejmij Toughness (-0/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Przesuń Power do Toughness (-1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Dodaj Power i Toughness (+1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Odejmij Power i Toughness (-1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation>Ustaw Power i Toughness...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation>Resetuj Power i Toughness</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>Odtapuj</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>Utrzymanie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>Dobranie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation>Pierwsza Faza Główna</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation>Początek Walki</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>Atak</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>Blok</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>Obrażenia</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation>Koniec Walki</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation>Druga Faza Główna</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>Koniec</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation>Następna Faza</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation>Następna Akcja Fazowa</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation>Następna Tura</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation>Zatapuj / Odtapuj kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation>Odtapuj Wszystkie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
+        <translation>Odtapuj</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation>Obróć Kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation>Podglądnij Kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation>Zagraj Kartę</translation>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation>Dołącz Kartę..</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation>Odłącz Kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation>Sklonuj Kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation>Utwórz token…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <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/settings/shortcuts_settings.h" line="518"/>
         <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/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation>Ustaw Adnotację…</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <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"/>
-        <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/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation>Wierzch biblioteki</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation>Pole Bitwy, Koszulką do Góry</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation>Pole Bitwy</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Biblioteka</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>Biblioteka poboczna</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation>Karty z Wierzchu Biblioteki</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation>Zamknij Ostatni Widok</translation>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <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/settings/shortcuts_settings.h" line="615"/>
         <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/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation>Narysuj wskaźnik...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <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/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation>Opuść Grę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>Poddanie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation>Rzuć Kośćmi...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation>Potasuj Bibliotekę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
         <translation>Dobierz Kartę</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <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/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation>Cofnij Dobranie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <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/settings/shortcuts_settings.h" line="659"/>
         <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"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <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/settings/shortcuts_settings.h" line="665"/>
         <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/settings/shortcuts_settings.h" line="668"/>
         <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/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation>Skup Czat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation>Wyczyść czat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation>Odśwież</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation>Przeskocz do Przodu</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <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/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation>Odtwórz/Pauza</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation>Przełącz przyspieszenie</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_pt.ts b/cockatrice/translations/cockatrice_pt.ts
index f67c8d138..ebc8495c6 100644
--- a/cockatrice/translations/cockatrice_pt.ts
+++ b/cockatrice/translations/cockatrice_pt.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>Definir marcador</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation type="unfinished"/>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,81 +36,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -118,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -131,312 +129,251 @@ 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"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <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/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Tema actual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>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/dialogs/dlg_settings.cpp" line="663"/>
         <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/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <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/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <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/dialogs/dlg_settings.cpp" line="691"/>
         <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/dialogs/dlg_settings.cpp" line="692"/>
         <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/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>Banir nome de &amp;utilizador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>Banir endereço de &amp;IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>banir I&amp;D do cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Tipo de Ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>Ban &amp;permanente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>Ban &amp;temporário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dias:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Horas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Duração do ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Por favor introduza o motivo do ban.
 Isto apenas é guardado para os moderadores e não é visível para a pessoa banida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Por favor introduza o motivo do ban que será visível à pessoa banida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Banir utilizador do servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Tem de seleccionar um banimento baseado no nome, no IP ou ambos.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Deve preencher o campo de nome a banir quando selecciona a caixa de verificação para banir um nome.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Deve preencher o campo de IP a banir quando selecciona a caixa de verificação para banir um IP.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Deve preencher o campo de identificação de cliente quando selecciona a caixa de verificação para banir uma identificação de cliente.</translation>
     </message>
@@ -444,22 +381,22 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -467,32 +404,32 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Expansões</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Custo de mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Tipo de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>P/R</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Cor(es)</translation>
     </message>
@@ -500,101 +437,96 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -602,22 +534,22 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +557,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -648,294 +580,172 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Mover para</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Poder / resistência</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>sua mão</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>mão de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>do seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>seu cemitério</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>cemitério de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>seu exílio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>exílio de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>seu sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>sideboard de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>seu sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>sideboard de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -944,7 +754,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -952,60 +762,15 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1013,47 +778,47 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,97 +826,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +914,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1177,114 +932,109 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1042,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,227 +1050,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <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="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Carta</translation>
     </message>
@@ -1528,12 +1245,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,17 +1258,17 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,7 +1276,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,62 +1284,62 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,166 +1347,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>A resposta do servidor não pôde ser analisada.</translation>
     </message>
@@ -1813,58 +1472,54 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1872,19 +1527,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1892,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Novo anfitrião</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome do jogador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Guardar password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>Conectar a&amp;utomaticamente no arranque</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Conectar automaticamente ao mais recente login ao abrir o Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Aviso de conexão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>O nome de utilizador tem de ser inserido.</translation>
     </message>
@@ -2041,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Re&amp;lembrar definições.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Descrição:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>&amp;Jogadores:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Tipo de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Apenas &amp;amigos podem entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Apenas utilizadores &amp;registados podem entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Restrições para ligar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>E&amp;spectadores podem ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Espectadores &amp;necessitam de palavra-passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Espectadores podem c&amp;onversar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>&amp;Espectadores podem ver as mãos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Espectadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;Limpar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Criar jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Informação do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Erro do servidor.</translation>
     </message>
@@ -2164,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;or:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>branco</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>azul</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>preto</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>vermelho</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>incolor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/R:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Nota:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Destruir ficha quando ela deixar a mesa</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Informação de ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Mostrar &amp;todas as fichas</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Mostrar &amp;fichas deste deck</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Escolha ficha da lista</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Criar ficha</translation>
     </message>
@@ -2262,53 +1907,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2316,40 +1961,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Não escolheu nenhuma imagem.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Para alterar o seu avatar, escolha uma nova imagem.
 Para remover o seu avatar actual, confirme SEM escolher uma nova imagem.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Procurar...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Alterar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Abrir Imagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Ficheiros de Imagem (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Escolheu uma imagem inválida.</translation>
     </message>
@@ -2357,17 +2002,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2375,38 +2020,38 @@ Para remover o seu avatar actual, confirme SEM escolher uma nova imagem.</transl
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Password antiga:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nova password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Confirme a nova password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Alterar a password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>As novas passwords que digitou não coincidem.</translation>
     </message>
@@ -2414,93 +2059,93 @@ Para remover o seu avatar actual, confirme SEM escolher uma nova imagem.</transl
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;or:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>branco</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>azul</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>preto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>vermelho</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>incolor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/R:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Nota:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Informação de ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Adicionar ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Remover ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Por favor introduza o nome da ficha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation type="unfinished"/>
@@ -2509,27 +2154,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>País:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Indefinido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Nome real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Fazer alterações no seu perfil:</translation>
     </message>
@@ -2537,143 +2182,137 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Descrição de jogo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Nome do criador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>&amp;Tipo de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>no &amp;mínimo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>no m&amp;áximo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Limite máximo de jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Restrições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Filtrar jogos</translation>
     </message>
@@ -2681,52 +2320,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2734,37 +2373,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2772,86 +2411,86 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation type="unfinished"/>
     </message>
@@ -2859,7 +2498,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -2867,146 +2506,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Lista de deck inválida.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Carregar baralho</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3014,91 +2570,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome do jogador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Password (novamente):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Email (novamente):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>País:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Indefinido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Nome real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Registe-se no server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Registo recusado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>As passwords que digitou não coincidem.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Os emails que digitou não coincidem.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Tem de escolher um nome de utilizador.</translation>
     </message>
@@ -3106,17 +2662,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -3124,55 +2680,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3189,7 +2730,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3206,7 +2747,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2756,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3224,7 +2765,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3233,7 +2774,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3242,59 +2783,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Definições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Aparência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <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/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Atalhos</translation>
     </message>
@@ -3302,39 +2843,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3342,17 +2883,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
@@ -3360,164 +2901,168 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Abrir a página de downloads</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>A procurar actualizações...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Erro na actualização</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>A instalar...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3525,162 +3070,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Registo de erros</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3688,47 +3101,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3736,44 +3149,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3781,7 +3188,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation type="unfinished"/>
     </message>
@@ -3789,325 +3196,244 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Por favor entre na sala apropriada primeiro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Password incorrecta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Não são permitidos espectadores neste jogo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>O jogo já se encontra cheio.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>O jogo já não existe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Este jogo só está aberto a utilizadores registados.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Este jogo só está aberto aos amigos do seu criador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Você está a ser ignorado pelo criador deste jogo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Entrar no jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>Por favor entre na sala respectiva primeiro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtrar jogos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>&amp;Limpar filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>C&amp;riar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>&amp;Entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>Entrar como &amp;espectador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Jogos</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>amigos apenas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>utilizadores registados apenas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>pode falar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>ver mãos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>pode ver as mãos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>não permitidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Idade</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Criador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Restrições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Espectadores</translation>
     </message>
@@ -4115,609 +3441,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>O servidor atingiu a máxima capacidade de utilizadores, por favor verifique de novo mais tarde.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Há demasiadas ligações concorrentes do seu endereço.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Banido por moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Tempo previsto para o final:%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>Este banimento dura indefinidamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Encerramento do servidor agendado.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Nome de utilizador invalido.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>Você deslogado por ter entrado numa outra localização.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Ligação terminada</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>O servidor terminou a sua ligação.
 Motivo: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4730,569 +3652,579 @@ Todos os jogos a decorrer serão perdidos.
 Motivo para o encerramento: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Encerramento do servidor agendado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Sucesso</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Registo aceite.%s
 Entrará agora.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Activação da conta aceite. %s
 Entrará agora.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Número de jogadores</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Por favor introduza o número de jogadores.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Jogador %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Carregar replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>Sobre o Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Website Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Gestor do projecto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>Anteriores gestores do projecto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>Desenvolvedores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>Os nossos desenvolvedores</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>Ajuda Desenvolvimento!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Tradutores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>Ajude a traduzir!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Ajuda técnica:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Reportar um Problema</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Solução de problemas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>Perguntas frequentes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Tempo do servidor esgotado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Tentativa falhada de entrada</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Nome de utilizador ou palavra-passe incorrecta. Por favor verifique as suas informações e tente de novo.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Já existe uma sessão activa com este nome de utilizador.
 Por favor termine essa sessão e volte a ligar-se.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Está banido até %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Está banido indefinidamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>Este servidor requer registo de utilizador. Gostaria de se registar agora?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Activação de conta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Erro de login desconhecido:%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 Normalmente isto significa que a sua versão de cliente está desactualizada e que o servidor enviou uma resposta que o seu cliente não percebe.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>O seu nome de utilizador deve respeitar as seguintes regras:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>tem %1 - %2 caracteres</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>%1 pode conter caracteres em minúsculas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>NÃO</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>%1 pode conter caracteres em maiúsculas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>%1 pode conter caracteres numéricos</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>pode conter a seguinte pontuação: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>o primeiro caracter %1 pode ser pontuação </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>Apenas A-Z, a-z, 0-9, _, ., e - são permitidos.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>Registo recusado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>Os registos encontram-se indisponívels para este servidor de momento.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>Já existe uma conta com o mesmo nome de utilizador.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>É obrigatório especificar um endereço de e-mail válido quando se regista.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>A password que inseriu é demasiado curta.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>Falha no registo devido a um problema técnico com o servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>Erro de registo desconhecido: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>Falha na activação de conta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Erro de ligação:%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>Está a tentar ligar-se a um servidor obsoleto. Por favor faça downgrade à sua versão do Cockatrice ou ligue-se a servidor adequado.
 Versão local é %1, versão remota é %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>A sua versão do Cockatrice é obsoleta. Por favor actualize-a.
 Versão local é %1, versão remota é %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Ligando a %1...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>Registando em %1 como %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Desligado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Conectado, logando em %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Ligar...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Desligar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>Começar &amp;jogo local...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Ver replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>Ecrã &amp;inteiro</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;A registar no servidor...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Configurações...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Sair</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>A&amp;cções</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>B&amp;ase de dados de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>Abrir a pasta de imagens personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>Abrir a pasta de expansões personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>Adicione cartas/expansões personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>S&amp;obre o Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <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/client/ui/window_main.cpp" line="1133"/>
         <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 +4233,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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Abrir definições</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <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/client/ui/window_main.cpp" line="1156"/>
         <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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>Ver expansões</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Bem-vindo/a</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,863 +4344,669 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1393"/>
         <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/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="137"/>
+        <location filename="src/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>uma carta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <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"/>
-        <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/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>Cara</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>Coroa</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 desfaz a sua última compra (%2).</translation>
     </message>
@@ -6276,206 +5014,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Mensagem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <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/dialogs/dlg_settings.cpp" line="1450"/>
         <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/dialogs/dlg_settings.cpp" line="1451"/>
         <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/dialogs/dlg_settings.cpp" line="1452"/>
         <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/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <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/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <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/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Palavras separadas com espaço, apenas caracteres alfanuméricos</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -6483,17 +5178,17 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -6501,62 +5196,62 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -6564,57 +5259,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Fase Final</translation>
     </message>
@@ -6622,213 +5317,703 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>pt</translation>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>Mostrar as cartas do topo do grimório</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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
+        <translation>Número de cartas: (max. %1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>&amp;Ver cemitério</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>&amp;Ver exílio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>Jogador &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;Cemitério</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;Exílio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>&amp;Mover mão para...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>&amp;Topo do grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>&amp;Fundo do grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>&amp;Mover cemitério para...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;Mão</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>&amp;Mover exílio para...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>&amp;Ver grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>Ver as cartas do &amp;topo do grimório...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>&amp;Mostrar grimório a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>&amp;Revelar sempre carta do topo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>&amp;Ver sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;Comprar carta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>C&amp;omprar cartas...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>Desfa&amp;zer a última compra</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>Fazer &amp;mulligan</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>Jogue carta do topo &amp;virada para baixo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>Mover as cartas do topo para o &amp;cemitério...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>Mover as cartas do topo para o &amp;exílio...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>Colocar carta do topo no &amp;fundo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>&amp;Mostrar mão a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Revele c&amp;arta aleatória a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>&amp;Sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>&amp;Marcadores</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>&amp;Desvirar topas as permanentes</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>&amp;Lançar dado...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>&amp;Criar token</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>C&amp;riar outro token</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>Cr&amp;iar token pré-definido</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>Todos os &amp;jogadores</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>&amp;Dizer</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Jogar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>Esco&amp;nder</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>Jogue &amp;virada para baixo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>A&amp;lterar desvirar normalmente</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>&amp;Espreitar a face da carta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>Copi&amp;ar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>Ane&amp;xar a carta...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>Separar as car&amp;tas</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>Desen&amp;har seta...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>&amp;Aumentar poder</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>&amp;Diminuir poder</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>A&amp;umentar resistência</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>Di&amp;minuir resistência</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>Aumen&amp;tar poder e resistência</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>Dimin&amp;uir poder e resistência</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>Definir &amp;poder e resistência...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>Colocar &amp;nota...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation>X cartas do topo do grimório...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>Ver as cartas do topo do grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
         <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.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <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.cpp" line="3188"/>
         <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.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>Comprar cartas</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>Número:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>Mover as cartas to topo para o cemitério</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>Mover as cartas to topo para o exílio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation>C&amp;riar outro marcador %1</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <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.cpp" line="3534"/>
         <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.cpp" line="3653"/>
         <source>Set annotation</source>
-        <translation type="unfinished"/>
+        <translation>Colocar nota</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player.cpp" line="3654"/>
         <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
+        <translation>Por favor introduza a nova nota:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <source>Set counters</source>
-        <translation type="unfinished"/>
+        <translation>Definir marcadores</translation>
     </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <source>&amp;Counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingDisabledInfoWidget</name>
-    <message>
-        <location filename="src/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>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</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/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</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/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6836,7 +6021,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"/>
     </message>
@@ -6844,17 +6029,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6862,132 +6047,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>Serviços</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>Ocultar %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>Ocultar outros</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>Mostrar tudo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>Preferências...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>Sair %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>Cerca %1</translation>
     </message>
@@ -6995,162 +6114,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Base de dados de cartas Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>Todos os ficheiros (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Replays do Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
-        <translation>Baralho</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
-        <translation>Sideboard</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
-        <translation>Tokens</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -7158,17 +6250,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Hora de upload</translation>
     </message>
@@ -7176,149 +6268,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>Keep</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>Tempo de começo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>Duração (seg)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>E&amp;ntrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>Permissões</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation type="unfinished"/>
     </message>
@@ -7326,27 +6372,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>Tipo de expansão</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>Código da expansão</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Nome longo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>Data de lançamento</translation>
     </message>
@@ -7354,53 +6400,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7408,12 +6454,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -7421,13 +6467,13 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -7436,58 +6482,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>&amp;Motivos para o encerramento:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;Tempo até ao encerramento (minutos):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>Encerrar servidor</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <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/dialogs/dlg_settings.cpp" line="1544"/>
         <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/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <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/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>Volume mestre</translation>
     </message>
@@ -7495,48 +6528,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -7544,27 +6577,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -7572,17 +6605,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -7590,289 +6623,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>Administração</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>&amp;Actualizar mensagem do servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;Encerrar servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>&amp;Recarregar configuração</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Funções do administrador do servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>&amp;Desbloquear funções</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>&amp;Bloquear funções</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <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/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>Baralho</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>Flutuando</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <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/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Deck:%1</translation>
     </message>
@@ -7880,55 +6790,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7936,22 +6859,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7959,139 +6882,139 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>Ficheiros locais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Decks armazenados no servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Abrir no editor de decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Upload do deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Download do deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>Nova pasta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Introduza o nome do deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>Este deck nao tem um nome
 Por favor introduza um nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Deck sem nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>Apagar ficheiro local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>Nome da nova pasta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8099,17 +7022,17 @@ Por favor introduza um nome:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8117,7 +7040,7 @@ Por favor introduza um nome:</translation>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8125,391 +7048,407 @@ Por favor introduza um nome:</translation>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation>Repetir Cronologia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <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/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>&amp;Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <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/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <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/client/tabs/tab_game.cpp" line="236"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <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/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation>&amp;Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <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/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>&amp;Dizer:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>Flutuando</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <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/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation>Você está a sobrecarregar o jogo. Por favor aguarte uns segundos.</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>Foi expulso do jogo.</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>Registos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>Tempo;NomeEnviador;IPEnviador;Mensagem;IDAlvo;NomeAlvo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>Registos das salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>Registos dos jogos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>Registos das conversas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>Deve seleccionar pelo menos um filtro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>Deve seleccionar um número válido de dias para localizar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>Nome de utilizador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>Morada IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>Nome do Jogo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>ID do Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>Mensagem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>Sala principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>Sala de Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>Chat Privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>Últimos X Dias:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>Última Hora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>Resultados Máximos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>É requerido pelo menos um filtro. %s
 Quanta mais informação der, mais específicos serão os resultados.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>Obter registos dos utilizadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>Limpar Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>Filtros:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>Localização dos Registos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>Alcance de dados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>Resultados máximos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>Histórico de mensagens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>Falha na obtenção do histórico de mensagens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Não há mensagens para os filtros seleccionados</translation>
     </message>
@@ -8517,37 +7456,37 @@ Quanta mais informação der, mais específicos serão os resultados.</translati
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>Chat &amp;privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;Abandonar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Chat privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 abandonou o servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 entrou no servidor.</translation>
     </message>
@@ -8555,185 +7494,105 @@ Quanta mais informação der, mais específicos serão os resultados.</translati
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>Ficheiros locais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>Armazenamento de replays no servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>Ver replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>Download replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>Alternar bloqueio de expiração</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>Apagar ficheiro local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>Apagar replay remoto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -8741,47 +7600,47 @@ Quanta mais informação der, mais específicos serão os resultados.</translati
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;Dizer:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Abandonar a sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>&amp;Limpar chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>Definições do chat...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation>mencionou-o.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>Clicar para ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>Estás a inundar o chat .Por favor aguarde alguns segundos.</translation>
     </message>
@@ -8789,35 +7648,35 @@ Quanta mais informação der, mais específicos serão os resultados.</translati
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -8825,97 +7684,87 @@ Quanta mais informação der, mais específicos serão os resultados.</translati
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>Tem a certeza?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>Ainda estão a decorrer alguns jogos. Tem a certeza que quer sair?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8923,39 +7772,39 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>Promoção</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>Avisado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>Recebeu um aviso devido a %1. %s
 Por favor evite continuar essa actividade ou acções serão tomadas contra si futuramente. Se tem alguma questão, por favor envie uma mensagem privada a um moderador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"/>
@@ -8964,12 +7813,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -8977,13 +7821,13 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>Incapaz de analisar o baralho.</translation>
     </message>
@@ -8991,13 +7835,13 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"/>
@@ -9006,42 +7850,42 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -9049,7 +7893,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>Incapaz de abrir o ficheiro para leitura.</translation>
     </message>
@@ -9057,206 +7901,184 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>Detalhes do &amp;utilizador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>Chat &amp;privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Mostrar os &amp;jogos deste utilizador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>Adicionar à &amp;lista de amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Remover da lista de &amp;amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>Adicionar a lista a i&amp;gnorar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Remover da lista a &amp;ignorar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>Expulsar do &amp;jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>Avisar utilizador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Ver o histórico de avi&amp;sos do utilizador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>Banir do &amp;servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Ver o histórico de &amp;bans do utilizador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promover utilizador a moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>&amp;Despromover utilizador do cargo de moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <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 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 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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>jogos de %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>Histórico de banições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>Hora de Banição; Moderador; Duração da Banição; Razão da Banição; Razão visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>O utilizador nunca foi banido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>Histórico de avisos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>Hora do aviso; Moderador; Nome do Utilizador; Razão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>O utilizador nunca foi avisado.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>Sucesso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>Utilizador promovido com sucesso.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>Utilizador despromovido com sucesso.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>Falhou</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>Falha na promoção do utilizador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>Falha na despromoção do utilizador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -9264,173 +8086,173 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>Idade da Conta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>Alterar password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>Alterar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Administrador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>Moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Utilizador registado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Utilizador não registado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>Desconhecido </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>Informação do utilizador actualizada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>Este servidor não permite a actualização da sua informação pessoal.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>Password alterada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>Este servidor não permite a actualização da sua password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>A password nova é demasiado curta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>A password antiga está incorrecta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>Avatar actualizado.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Este servidor não permite a actualização do seu avatar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>Um erro ocorreu ao tentar actualizar o seu avatar.</translation>
     </message>
@@ -9438,152 +8260,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <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/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <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/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9591,241 +8398,86 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9833,27 +8485,27 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9861,7 +8513,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/client/ui/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 +8521,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9889,37 +8541,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9927,93 +8569,45 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10021,25 +8615,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10047,52 +8662,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10100,7 +8710,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10108,22 +8718,22 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10131,17 +8741,17 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10149,43 +8759,43 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>Que aviso gostaria de enviar?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>Aviso por má conduta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>O nome de utilizador não se pode encontrar vazio, por favor especifique o utilizador que deseja avisar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>O aviso a enviar não se pode encontrar vazio, por favor seleccione um aviso válido para enviar.</translation>
     </message>
@@ -10193,133 +8803,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10327,72 +8937,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>vista em pilha</translation>
     </message>
@@ -10400,7 +9010,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Português (Portuguese)</translation>
     </message>
@@ -10408,12 +9018,12 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -10421,1058 +9031,991 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>Janela Principal</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>Editor de Baralhos</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>Lobby de jogo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Poder e Resistência</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Etapas de jogo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>Área de jogo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Área de jogo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>Ecrã Inteiro</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>Desvirar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>Etapa de Upkeep</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>Etapa de compra de cartas</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>Etapa de Ataque</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>Etapa de Bloqueio</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>Etapa de atribuição de dano</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>Fim de turno</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Baralho</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>Desistir</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_pt_BR.ts b/cockatrice/translations/cockatrice_pt_BR.ts
index 2c331260f..06300e19e 100644
--- a/cockatrice/translations/cockatrice_pt_BR.ts
+++ b/cockatrice/translations/cockatrice_pt_BR.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Definir marcador...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Definir marcador</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Novo valor para marcador &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Analisar nome e número do conjunto (se disponível)</translation>
     </message>
@@ -36,83 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation>Não há cartas em seu deck a serem exportadas</translation>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
+        <translation>Nenhum deck selecionado para ser exportado.</translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation>Notas de Atualização</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation>Notas do Administrador para %1</translation>
     </message>
@@ -120,12 +118,12 @@ Por favor, verifique se a pasta não é somente leitura e tente novamente.</tran
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation>Main</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation>Side</translation>
     </message>
@@ -133,312 +131,251 @@ 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"/>
-        <source> seconds</source>
-        <translation>segundos</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <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/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Tema atual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <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"/>
-        <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"/>
-        <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"/>
-        <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/dialogs/dlg_settings.cpp" line="660"/>
         <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/dialogs/dlg_settings.cpp" line="661"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="663"/>
         <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/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <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"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
-        <translation type="unfinished"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
+        <translation>Substituir todas as artes das cartas com a preferência de conjunto pessoal (comportamento anterior à mudança do ProviderID) [Requer reinício do cliente]</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation>linhas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
-        <translation>Marcadores de carta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
-        <translation>Marcador %1</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <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/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <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/dialogs/dlg_settings.cpp" line="691"/>
         <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/dialogs/dlg_settings.cpp" line="692"/>
         <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/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Tamanho máximo da fonte para informações nas cartas:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation>Abrir no Editor de Decks</translation>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation>Tema</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation>Arte de uma carta aleatória</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation>Arte de um arquivo de deck backround.cod</translation>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>banir &amp;usuário pelo nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>banir endereço &amp;IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>banir cliente por I&amp;D:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Tipo de banimento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;banir permanentemente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;banir temporariamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dias:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Horas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Duração do banimento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Por favor, entre com o motivo do banimento.
 Isto será visto somente por moderadores e não pode ser visto pela pessoa banida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Por favor, entre com o motivo para o banimento que será visível pela pessoa banida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Remover todas mensagens deste usuário em todas as salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Banir usuário do servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Você deve selecionar um nome, IP, cliente ou alguma combinação desses três itens para banir.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Você têm que colocar um nome válido quando seleciona a caixa de banimento por nome.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Você têm que colocar um IP válido quando seleciona a caixa de banimento por IP.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Você têm que colocar um ID de cliente válido quando seleciona a caixa de banimento por ID de cliente.</translation>
     </message>
@@ -446,22 +383,22 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>Nenhuma resposta recebida do servidor de atualização.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Resposta inválida recebida do servidor de atualização.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>Nenhuma resposta recebida do servidor de atualização.</translation>
     </message>
@@ -469,32 +406,32 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Expansões</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Custo de mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Tipo de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>P/R</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Cor(es)</translation>
     </message>
@@ -502,124 +439,119 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OU</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>E NÃO</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OU NÃO</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation>Nome (Exatamente)</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Cor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>Coleção</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Custo de Mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>Valor de Mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Raridade</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Poder</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Resistência</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Lealdade</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
-        <translation>Tipo Principal</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
-        <translation>Sub-Tipo</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation>Imagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation>Ambos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation>Ver transformação</translation>
     </message>
@@ -627,22 +559,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation>Main</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation>Side</translation>
     </message>
@@ -650,364 +582,197 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation>Coleção:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation>Número de Colecionador:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation>Cartas relacionadas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation>Carta desconhecida:</translation>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation>Revelar para...</translation>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Mover para</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation>Todos os &amp;jogadores</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation>Visualizar cartas relacionadas</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation>Ficha:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation>Todas as fichas</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation>&amp;Marque todos</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation>Selecionar Linha</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation>Selecionar Coluna</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation>&amp;Jogar</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation>&amp;Ocultar</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <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"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
-        <source>T&amp;urn Over</source>
-        <extracomment>Turn face up/face down</extracomment>
-        <translation>&amp;Virar</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="460"/>
-        <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"/>
-        <source>&amp;Clone</source>
-        <translation>&amp;Clonar</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <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"/>
-        <source>Unattac&amp;h</source>
-        <translation>De&amp;sanexar</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation>&amp;Desenhar seta...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation>Colocar &amp;nota...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation>Marcadores de carta</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <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"/>
-        <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"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation>&amp;Definir marcadores (%1)...</translation>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Poder / resistência</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation>Tamanho da Carta</translation>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <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/card_zone.cpp" line="63"/>
         <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/card_zone.cpp" line="67"/>
         <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/card_zone.cpp" line="68"/>
         <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/card_zone.cpp" line="70"/>
         <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/card_zone.cpp" line="71"/>
         <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="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation>grimório de %1</translation>
+        <translation>%1º grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation>grimório de %1</translation>
+        <translation>%1º grimório.</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <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/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation>cemitério de %1</translation>
+        <translation>%1º cemitério</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <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/card_zone.cpp" line="83"/>
         <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/card_zone.cpp" line="87"/>
         <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="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <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/card_zone.cpp" line="96"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
-        <translation>sua zona customizada &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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
-        <translation>zona customizada &apos;%2&apos; de %1</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation>Erro na linha %1 coluna %2:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation>Erro na linha %1 coluna %2:</translation>
-    </message>
-</context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation>Zonas Customizadas</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation>Ver zona customizada &apos;%1&apos;</translation>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation>Adicionar Painel</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation>Remover Painel</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation>Salvar Layout</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation>Carregar Layout</translation>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation>Banco de Dados de Cartas</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/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation>Informações da carta</translation>
     </message>
@@ -1015,47 +780,47 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation>Pesquisar pelo nome da carta (ou expressões de busca)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation>Adicionar ao deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation>Adicionar ao Sideboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <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"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <source>Show on EDHREC (Commander)</source>
+        <translation>Mostrar em EDHREC (Commander)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="197"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <source>Show on EDHREC (Card)</source>
+        <translation>Mostrar em EDHREC (Carta)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Adicionar carta ao &amp;sideboard</translation>
     </message>
@@ -1063,97 +828,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation>Escolher Impressão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation>&amp;Nome do Deck:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Comments:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation>Hash:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation>&amp;Aumentar número</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation>&amp;Diminuir número</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation>&amp;Remover linha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation>Mover carta para/do Side</translation>
     </message>
@@ -1161,17 +916,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation>Apagar selecionados</translation>
     </message>
@@ -1179,114 +934,109 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation>&amp;Editor de Decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation>&amp;Novo deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation>&amp;Carregar deck...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation>Carregar deck recente...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation>&amp;Salvar deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation>Salvar deck &amp;como...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Carregar deck da área de &amp;transferência...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation>Editar deck na área de transferência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation>Anotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation>Não anotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation>Salvar deck para a área de transferência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation>Anotado (Sem informação de expansão)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation>Não Anotado (Sem informação de expansão)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation>&amp;Imprimir deck...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation>&amp;Enviar deck para serviço online</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation>Criar decklist (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation>Criar decklist (decklist.xyz)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation>&amp;Analisar deck (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation>&amp;Analisar deck (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation>&amp;Fechar</translation>
     </message>
@@ -1294,7 +1044,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation>Seletor de Impressão</translation>
     </message>
@@ -1302,227 +1052,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>Sucesso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation>Editar URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <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/dialogs/dlg_settings.cpp" line="1219"/>
         <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/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <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/dialogs/dlg_settings.cpp" line="1224"/>
         <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/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation>Remover URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation>Dia(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>Atualizando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <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/dialogs/dlg_settings.cpp" line="1205"/>
         <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/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>&apos;Spoilers&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <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/dialogs/dlg_settings.cpp" line="1208"/>
         <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/dialogs/dlg_settings.cpp" line="1209"/>
         <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/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <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/dialogs/dlg_settings.cpp" line="1216"/>
         <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/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <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>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation>Contagem</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation>Conjunto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <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="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Card</translation>
     </message>
@@ -1530,12 +1247,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation>Todos arquivos (*.*)</translation>
     </message>
@@ -1543,17 +1260,17 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation>Modo: Correspondência Exata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation>Modo: Inclui</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1561,7 +1278,7 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation>Editar tags ...</translation>
     </message>
@@ -1569,62 +1286,62 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation>Gerenciador de Tags de Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>Gerencie suas tags de deck. Marque ou desmarque as tags conforme necessário ou adicione novas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Adicionar uma nova tag (ex.: Aggro)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation>Adicionar Tag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation>Filtrar tags...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation>Entrada Inválida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation>O nome da tag não pode estar vazio!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation>Tag Duplicada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation>Essa tag já existe.</translation>
     </message>
@@ -1632,166 +1349,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation>Falha ao deletar</translation>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>A resposta do servidor não pode ser analisada.</translation>
     </message>
@@ -1815,71 +1474,67 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation>Descarregar deck</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Ready to start</source>
         <translation>Preparadx para começar</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation>Forçar início</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation>Sideboard aberto</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
-        <translation>Cockatrice</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation>Converter formato do deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
@@ -1888,7 +1543,7 @@ Tags só podem ser adicionadas a decks no formato .cod.
 Deseja converter o deck para .cod?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation>Lembrar e aplicar essa escolha automaticamente no futuro</translation>
     </message>
@@ -1896,148 +1551,148 @@ Deseja converter o deck para .cod?</translation>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Baixando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Servidores conhecidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation>Excluir o servidor salvo atualmente selecionado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Atualizar a lista de servidores com servidores públicos conhecidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Novo servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome do jogador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>S&amp;enha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Salvar senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>&amp;Conectar automaricamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Conectar automaticamente com o login mais recente quando Cockatrice for iniciado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>Se você tiver problemas ao se conectar ou registar entre em contato com os responsáveis pelo servidor!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Página da Web</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Resetar Senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation>Esqueceu a senha?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Conectar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>Salvar Contato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Conectar ao Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>URL do Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>Porta de comunicação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>Nome Único de Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Aviso de conexão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>Você deve nomear seu novo perfil de conexão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Aviso de conexão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>O nome do jogador é obrigatório.</translation>
     </message>
@@ -2045,122 +1700,112 @@ Deseja converter o deck para .cod?</translation>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Le&amp;mbrar configurações.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Descrição:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>&amp;Jogadores:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Tipo de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Senha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Apenas &amp;amigos podem entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Apenas usuários &amp;registrados podem entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Restrições para entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>&amp;Espectadores podem assistir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>&amp;Espectadores precisam de uma senha para assistir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Visitantes podem &amp;conversar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Espectadores podem ver &amp;mãos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>Criar jogo como espectador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Visitantes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation>Total de vida inicial:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation>Opções de configuração do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;Limpar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Criar jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Informação de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Erro do servidor.</translation>
     </message>
@@ -2168,97 +1813,97 @@ Deseja converter o deck para .cod?</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;or:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>branco</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>azul</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>preto</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>vermelho</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolorido</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>incolor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/R:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Nota:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>Destruir a &amp;ficha quando ela sair do campo de batalha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Informação de ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Mostre &amp;todas fichas</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Mostre fichas deste &amp;deck</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Mostre fichas da lista</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Criar ficha</translation>
     </message>
@@ -2266,53 +1911,53 @@ Deseja converter o deck para .cod?</translation>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2320,40 +1965,40 @@ Deseja converter o deck para .cod?</translation>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Nenhuma imagem selecionada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Para mudar seu avatar, escolha uma nova imagem
 Para remover o avatar atual, confirme sem escolher uma nova imagem.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Procurar...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Mudar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Abrir imagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Arquivos de imagem (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Imagem inválida.</translation>
     </message>
@@ -2361,17 +2006,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation>Decklist inválida.</translation>
     </message>
@@ -2379,38 +2024,38 @@ Para remover o avatar atual, confirme sem escolher uma nova imagem.</translation
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Senha antiga:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nova senha: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Confirmar senha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Trocar senha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Sua senha é muito curta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>As novas senhas não coincidem.</translation>
     </message>
@@ -2418,93 +2063,93 @@ Para remover o avatar atual, confirme sem escolher uma nova imagem.</translation
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Cor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>branco</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>azul</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>preto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>vermelho</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>multicor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>incolor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/R:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Anotação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Informação da ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Adicionar ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Remover ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>Editar fichas personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Por favor, entre com o nome da ficha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>O nome escolhido está em conflito com uma carta ou ficha existente. 
@@ -2514,27 +2159,27 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>País:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Indefinido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Nome real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Editar perfil</translation>
     </message>
@@ -2542,143 +2187,137 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>sem limite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5 minutos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10 minutos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30 minutos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1 hora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2 horas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>Ocultar jogos &apos;apenas amigos&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation>Ocultar jogos cheios</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation>Ocultar jogos já iniciados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation>Ocultar jogos com senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>Ocultar &apos;jogos de usuários ignorados&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Mais novos que:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Descrição do jogo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>Nome do &amp;criador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>Tipos de &amp;jogos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>&amp;ao menos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>no &amp;máximo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Quantidade máxima de jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Restrições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Mostrar jogos apenas se &amp;espectadores puderem assistir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Mostrar jogos p&amp;rotegidos por senha para espectador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Mostrar apenas se espectadores puderem interagir com o chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Mostrar apenas se as mãos forem visíveis para os espectadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation>Espectadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Filtrar jogos</translation>
     </message>
@@ -2686,52 +2325,52 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation>Aviso de redefinição de desafio de senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Houve um problema. Por favor, tente solicitar uma nova senha novamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation>Coloque a informação do servidor e a conta que você gostaria de solicitar uma nova senha.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>Jogador &amp;nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation>Desafio de redefinir senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation>Erro no desafio de redefinir senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>O endereço de email não pode estar vazio.</translation>
     </message>
@@ -2739,37 +2378,37 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation>Coloque a informação do servidor que você gostaria de solicitar uma nova senha.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>Nome do &amp;jogador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation>Pedido de redefinição de senha.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation>Erro de redefinição de senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>O nome do jogador não pode ficar vazio.</translation>
     </message>
@@ -2777,86 +2416,86 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation>Aviso de Redefinição de Senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>Um problema ocorreu. Por favor tente requisitar uma nova senha novamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation>Insira o código recebido e a nova senha para definir sua nova senha.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>Jogador &amp;nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Ficha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Nova senha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Redefinir Senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>O nome do jogador não pode estar vazio.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation>Erro de Redefinição de Senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>O código não pode estar vazia.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>A nova senha não pode estar vazia.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation>Sua senha é muito curta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>As senhas não correspondem.</translation>
     </message>
@@ -2864,7 +2503,7 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation>Carregar Deck</translation>
     </message>
@@ -2872,146 +2511,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Lista de deck inválida.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Carregar deck</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation 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/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation>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/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation>Filtro inválido</translation>
     </message>
@@ -3019,92 +2575,92 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Insira seus dados e os do servidor que você gostaria de se registrar.
 Seu e-mail será utilizado para verificar sua conta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>Nome do &amp;jogador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>S&amp;enha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Senha (novamente):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Email (novamente):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>País:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Indefinido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Nome real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Registrar ao servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Aviso de Registro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>Sua senha é muito curta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Suas senhas não coincidem, por favor tente novamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Seus endereços de email não coincidem,  por favor tente novamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>O nome de jogador não pode estar vazio.</translation>
     </message>
@@ -3112,17 +2668,17 @@ Seu e-mail será utilizado para verificar sua conta.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation>Número de lados:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation>Número de dados:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation>Rolar dados</translation>
     </message>
@@ -3130,55 +2686,40 @@ Seu e-mail será utilizado para verificar sua conta.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3195,7 +2736,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3212,7 +2753,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/dialogs/dlg_settings.cpp" line="1813"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3225,7 +2766,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3234,7 +2775,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3243,7 +2784,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3256,59 +2797,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Aparência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <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/dialogs/dlg_settings.cpp" line="1873"/>
         <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/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Conversa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Atalhos</translation>
     </message>
@@ -3316,39 +2857,39 @@ Você gostaria de alterar seu local de configuração do banco de dados?</transl
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3356,17 +2897,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Dica do Dia</translation>
     </message>
@@ -3374,165 +2915,169 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Canal de lançamento atual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Reinstalar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Cancelar Download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Abrir página de download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation>Procurar por atualizações do cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>Cockatrice não possui suporte a SSL, por causa disso você não pode baixar updates automaticamente! Por favor visite a página de downloads para atualizar manualmente. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation>Baixando atualização: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Verificando atualizações...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Busca por atualizações concluída</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Sem atualização disponível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice está atualizado!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>Você já está executando a última versão disponível no canal de lançamento escolhido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Versão atual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Canal de lançamento selecionado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Atualização disponível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Uma nova versão do Cockatrice está disponível!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Nova versão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>Lançado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Log de mudanças</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Você quer atualizar agora?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation>Infelizmente, o atualizador automática não encontrou um download compatível.
 Talvez você tenha que baixar a nova versão manualmente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation>Por favor confira a &lt;a href=&quot;%1&quot;&gt;página de releases&lt;/a&gt; no nosso repositório do Github e baixe o programa para o seu sistema.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Erro na atualização</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Ocorreu um erro enquanto procurávamos por atualizações:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Um erro ocorreu enquanto uma atualização era baixada:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Instalando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice está incapaz de abrir o instalador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Tente atualizar o Cockatrice manualmente fechando-o e rodando o instalador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>Localização do download</translation>
     </message>
@@ -3540,162 +3085,30 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Limpar log ao fechar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Registro de Depuração</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3703,47 +3116,47 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3751,44 +3164,38 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation>Sal:</translation>
     </message>
@@ -3796,7 +3203,7 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>Digite seu filtro aqui</translation>
     </message>
@@ -3804,325 +3211,244 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Por favor, entre na sala apropriada primeiramente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Senha incorreta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Não são permitidos visitantes neste jogo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>O jogo está cheio.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>O jogo não existe mais.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Este jogo é aberto apenas para usuários registrados.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Este jogo é aberto apenas para os amigos de quem criou o jogo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Você está sendo ignorado pelo criador deste jogo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation>Entrar no jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation>Assistir ao jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation>Informações do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Entrar no jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Senha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>Por favor, entre na respectiva sala primeiro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtrar jogos.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>L&amp;impar Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>C&amp;riar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>&amp;Entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>E&amp;ntrar como visitante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation>Jogos mostrados: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Jogos</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 dia</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 h</numerusform><numerusform>%1%2 h</numerusform><numerusform>%1%2 h</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation>novo</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>apenas amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>usuários reg. apenas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>pode conversar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>ver mãos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>pode ver mãos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>não permitidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Idade</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Criador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Restrições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Visitantes</translation>
     </message>
@@ -4130,609 +3456,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>O servidor atingiu a capacidade maxima de usuarios, tente novamente mais tarde.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Há conexões concorrentes demais vinds do seu endereço.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Banido pelo moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Esperado tempo para fim: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>Este banimento dura indefinidamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Servidor de eventos fora do ar.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Usuário inválido</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>Você foi desconectado devido a um acesso em outra localidade.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Conexão fechada</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>O servidor terminou sua conexão.
 Razão: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4745,574 +3667,584 @@ Todos os jogos serão perdidos.
 Motivo para desligar: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Servidor de eventos fora do ar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Sucesso</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Registro aceito
 Irá entrar agora</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Ativação da conta aceita.
 Irá entrar agora.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Número de jogadores</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Por favor, entre o número de jogadores.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Jogador %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Carregar replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>Sobre o Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Pagina da Web do Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Diretor do projeto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>Antigos diretores do projeto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>Desenvolvedores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>Nossos desenvolvedores</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>Ajude a desenvolver!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Tradutores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>Nossos tradutores.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>Ajude a traduzir!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Suporte:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Reporte um problema:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Solução de problemas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Tempo esgotado do servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Login falhou</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>Seu cliente parece estar faltando recursos que este servidor requer para conexão.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>Para atualizar seu cliente, vá para &apos;Ajuda -&gt; Procurar por atualizações do cliente&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Usuário ou senha incorretos. Por favor, verifique suas informações de autenticação e tente novamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Já existe uma sessão ativa usando este nome de usuário.
 Por favor, feche a sessão primeiro e logue novamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Você está banido até %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Você está banido indefinidamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>Este servidor exige registro de usuário. Você gostaria de registrar agora?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation>Este servidor requer ID de cliente. Seu cliente ou não está conseguindo gerar um ID ou você está executando um cliente modificado.
 Por favor feche e abra seu cliente para tentar novamente. </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>Ocorreu um erro interno, por favor, feche e reabra o Cockatrice antes de tentar novamente.
 Se o erro persistir, verifique se você está executando a versão mais recente do software e, se necessário, entre em contato com os desenvolvedores de software.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Ativação da conta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>Sua conta não foi ativada ainda
 Você precisa fornecer o código de ativação recebido por email.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>Servidor cheio.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Erro de login desconhecido: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 Isso geralmente significa que seu cliente está obsoleto, e o servidor enviou uma resposta que seu cliente não entende.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>Seu nome de usuário precesia seguir essas regras:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>tem entre %1 e %2 caracteres</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>%1 pode conter caracteres minúsculos.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>NÃO</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>%1 pode conter caracteres maiúsculos.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>%1 pode conter caracteres numéricos.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>Pode conter a seguinte pontuação: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>Primeiro caractere pode %1 ser um sinal de pontuação</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation>Nenhuma linguagem inaceitável, conforme especificado por estas regras do servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>Não pode conter nenhuma das seguintes palavras: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>Não pode corresponder a nenhuma das seguintes expressões: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>Você pode usar apenas A-Z, a-z, 0-9, _, ., e - em seu nome de usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>Registro negado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>Registro está atualmente desabilitado neste servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>Já existe uma conta com este nome de usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>É obrigatório especificar um endereço de email válido para registrar.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>Aparentemente você está tentando registrar uma nova conta nesse servidor, porém você já tem uma conta registrada com o e-mail fornecido. Este servidor restringe a quantidade de contas que podem ser registradas por endereço. Por favor contate o operador do servidor para assistência posterior ou para obter informações das suas credenciais.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>Senha muito curta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>Registro falhou devido a um problema tecnico no servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>Erro de registro desconhecido: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>A ativação de conta falhou</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Erro de ligação:%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>Você está tentando conectar a um servidor obsoleto. Por favor, faça um downgrade na versão do seu Cockatrice ou conecte-se ao servidor correto.
 A versão local é %1 e a versão remota é %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>A versão do seu Cockatrice é obsoleta. Por favor, atualize a sua versão.
 A versão local é %1 e a versão remota é %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Conectando a %1...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>Registrando em %1 como %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Desconectado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Conectado, logando em %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation>Solicitando senha esquecida para %1 como %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Conectar...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Desconectar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>Iniciar jogo &amp;local...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Assistir replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>Tela &amp;cheia</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Registrar ao servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Recuperar senha...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Configurações...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Sair</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>Açõ&amp;es</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>Base de Cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Gerenciar expansões...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Editar &amp;fichas personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>Abrir pasta customizada de imagens.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>Abrir pasta de sets personalizados</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>Adicionar sets/cartas personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation>Recarregar banco de dados de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation>Abas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>So&amp;bre o Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Dica do Dia</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>Procurar por atualizações do cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation>Procurar por atualizações de cartas...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation>Ver registro de &amp;depuração</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation>Abrir Pasta de Configurações</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation>Mostrar/Ocultar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>Nova Versão</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice instalado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>Base de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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>
@@ -5321,29 +4253,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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Abrir configurações</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <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/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5356,17 +4288,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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>Visualizar expansões</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Bem vindo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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>
@@ -5375,64 +4307,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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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.
 
@@ -5443,863 +4375,669 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1393"/>
         <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/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation>Redefinir Senha</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <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>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 desfez a concessão do jogo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>um card</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation>de fundo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation>de topo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <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"/>
-        <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/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation>revertido</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>Cara</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>Coroa</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 desfaz sua última compra (%2).</translation>
     </message>
@@ -6307,206 +5045,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <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/dialogs/dlg_settings.cpp" line="1467"/>
         <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/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation>Editar mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation>Remover mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Mensagem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation>Editar mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <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/dialogs/dlg_settings.cpp" line="1450"/>
         <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/dialogs/dlg_settings.cpp" line="1451"/>
         <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/dialogs/dlg_settings.cpp" line="1452"/>
         <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/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <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/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <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/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separar palavras com um espaço, apenas caracteres alfanuméricos</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation>Tipo de Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation>Valor de Mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation>Cor(es)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation>Lealdade</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation>Tipo de Carta Principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation>Custo de Mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation>P/R</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation>Side</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation>Layout</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation>Identidade de Cor</translation>
     </message>
@@ -6514,17 +5209,17 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation>Cartas para sobrepor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation>Porcentagem de sobreposição:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation>Direção da sobreposição:</translation>
     </message>
@@ -6532,62 +5227,62 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation>Frase desconhecida</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation>Desvirar</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation>Manutenção</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation>Compra</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation>Primeira fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation>Início do combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation>Declaração de atacantes</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation>Declaração de bloqueadores</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation>Dano de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation>Fim do combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation>Segunda fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation>Fim do turno</translation>
     </message>
@@ -6595,57 +5290,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Etapa de fim de combate</translation>
     </message>
@@ -6653,213 +5348,703 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>pt</translation>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>Revelar cartas do topo do grimório</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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
+        <translation>Número de cartas: (no máximo %1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>V&amp;er cemitério</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>&amp;Ver exílio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>Jogador &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;Cemitério</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;Exílio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>&amp;Mover mão para...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>&amp;Topo do grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>&amp;Fundo do grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>&amp;Mover cemitério para...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;Mão</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>&amp;Mover exílio para...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>&amp;Ver grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation>&amp;Ver mão</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>Ver os cards do to&amp;po do grimório...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>Revelar &amp;grimório para...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>&amp;Sempre revelar a carta do topo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>&amp;Ver sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>Co&amp;mprar card</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>Comprar car&amp;ds...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>Desfa&amp;zer última compra</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>Pedir mu&amp;lligan</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>Coloque em jogo a primeira carta do topo do grimório com a face para baixo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation>Move a carta do topo para o cemitério</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation>Exila a carta do topo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>Mover os cards do topo para o ce&amp;mitério...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>Mover os cards do topo para o e&amp;xílio...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>Colocar o card do topo no &amp;fundo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation>Visualizar cartas do fundo da biblioteca... </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation>Emprestar biblioteca para...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation>Colocar as cartas do topo na pilha até...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>&amp;Revelar carta para...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Revelar uma carta &amp;aleatória para...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation>Revele uma carta aleatória a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>&amp;Sideboard</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>&amp;Marcadores</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>Des&amp;virar todas as permanentes</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>&amp;Jogar dado...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>Criar fich&amp;a...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>Criar &amp;outra ficha</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>Cr&amp;iar uma ficha predefinida</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>To&amp;dos os jogadores</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>&amp;Falar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation>Selecionar Tudo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation>Selecionar Linha</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation>Selecionar Coluna</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Jogar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>&amp;Ocultar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>Jogar com a &amp;Face-para-Baixo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation>&amp;Virar / Desvirar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>&amp;Trocar o modo de desvirar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation>&amp;Virar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>&amp;Olhar a face da carta</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>Clo&amp;nar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>Ane&amp;xar na carta...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>De&amp;sanexar</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>&amp;Desenhar seta...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>Au&amp;mentar poder</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>Dimi&amp;nuir poder</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>A&amp;umentar resistência</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>D&amp;iminuir resistência</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>Aumen&amp;tar poder e resistência</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>Diminuir p&amp;oder e resistência</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation>Aumentar o poder e diminuir a resistência</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation>Diminuir o poder e aumentar a resistência</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>Definir poder e resis&amp;tência...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation>Reinicia o poder e resistência</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>Definir &amp;nota...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>&amp;Adicionar marcador(%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;Remover marcador (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>&amp;Definir marcadores (%1)...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation>Topo da biblioteca em ordem aleatória</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation>X cartas do topo do grimório...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation>&amp;Fundo do grimório em ordem aleatória</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>Ver os cards do topo do grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
         <source>View bottom cards of library</source>
-        <translation type="unfinished"/>
+        <translation>Visualizar cartas do fundo da biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
+        <translation>Em que posição esta carta deve ser colocada:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <source>(max. %1)</source>
-        <translation type="unfinished"/>
+        <translation>(máx. %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation>Comprar mão</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation>Zero ou menos é a quantidade em relação à mão atual</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>Comprar cards</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>Número:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>Mover os cards do topo para o cemitério</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation>Revelar as cartas do &amp;topo para...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation>&amp;Topo do grimório...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation>&amp;Fundo do grimório...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation>&amp;Sempre olhar a carta do topo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation>Abrir no edit&amp;or de decks</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation>Jogar a carta do to&amp;po</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation>Comprar carta do fun&amp;do</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation>Comprar cartas do fu&amp;ndo...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation>&amp;Jogar carta do fundo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation>Jogar carta do fundo com a &amp;face voltada para baixo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation>Mover a carta do fundo para o cem&amp;itério</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation>Mover a carta do fundo para o e&amp;xílio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation>Mover as cartas do fundo para &amp;cemitério</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation>Mover as cartas do fundo para o &amp;exílio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation>Colocar carta do fundo no &amp;topo</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation>Cartas &amp;selecionadas</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>Mover as cartas do topo para o exílio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation>Mover as cartas do fundo para o cemitério</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation>Mover as cartas do fundo para o exílio</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation>Comprar cards do fundo do grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation>Criar outra ficha %1</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation>Criar fichas</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation>Colocar a carta X cartas do topo do grimório</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change power/toughness</source>
-        <translation type="unfinished"/>
+        <translation>Mudar o poder/resistêcia</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change stats to:</source>
-        <translation type="unfinished"/>
+        <translation>Mudar estatísticas para:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player.cpp" line="3653"/>
         <source>Set annotation</source>
-        <translation type="unfinished"/>
+        <translation>Alterar nota</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player.cpp" line="3654"/>
         <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
+        <translation>Por favor, entre com a nova nota:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation>Alterar marcadores</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <source>&amp;Counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingDisabledInfoWidget</name>
-    <message>
-        <location filename="src/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"/>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation>Revelar para...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation>Ver cartas relacionadas</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>Ficha:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>Todas as fichas</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation>Mostrar Cartas Relacionadas</translation>
     </message>
@@ -6867,7 +6052,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation>Pesquisar pelo nome ou código do conjunto</translation>
     </message>
@@ -6875,17 +6060,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation>Carta Anterior no Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation>Próxima Carta no Deck</translation>
     </message>
@@ -6893,132 +6078,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation>Alfabética</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation>Preferência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <translation>Data de Lançamento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="36"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation>Crescente</translation>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>Serviços</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>Esconder %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>Esconder outros</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>Mostrar tudo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>Sair %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>Sobre %1</translation>
     </message>
@@ -7026,162 +6145,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Banco de dados de cartas do Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>Todos arquivos (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice replays (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation>Main</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation>Side</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation>Fichas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation>Salvar Todos</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation>&amp;Sim</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation>Sim para &amp;Todos</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation>&amp;Não</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation>Não para &amp;Todos</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation>Tentar Novamente</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation>Descartar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation>Resetar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation>Restaurar Padrão</translation>
     </message>
@@ -7189,17 +6281,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Hora do upload</translation>
     </message>
@@ -7207,149 +6299,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>Código</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>Manter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>Tempo iniciado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>Duração (seg)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>Permissões</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation>Escolha uma ação da tabela</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation>Pressione a tecla/combinação de teclas que deseja definir para esta ação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation>Tecla inválida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation>Atalho já está sendo usado por:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation>Restaurar padrão</translation>
     </message>
@@ -7357,27 +6403,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>Ativado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>Selecione tipo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>Selecione código</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Nome longo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>Data lançamento</translation>
     </message>
@@ -7385,53 +6431,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation>Seção:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation>Ação:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation>Atalho:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <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/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation>Pesquisar pelo nome do atalho</translation>
     </message>
@@ -7439,12 +6485,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Ação</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Atalho</translation>
     </message>
@@ -7452,14 +6498,14 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Seu arquivo de configurações contém atalhos inválidos.
 Por favor, verifique suas configurações de atalho!</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Os seguintes atalhos foram configurados como padrão:
@@ -7469,58 +6515,45 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>&amp;Motivo para desligar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;Tempo até o desligamento (minutos):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>Servidor desligado</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <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/dialogs/dlg_settings.cpp" line="1544"/>
         <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/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <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/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>Volume principal</translation>
     </message>
@@ -7528,48 +6561,48 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation>Temporada de &apos;spoilers&apos; encerrada</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Deletando spoiler.xml. Favor rodar o Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation>Falha no download de &apos;spoilers&apos;</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation>Sem conexão com a internet</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation>&apos;Spoilers&apos; já atualizados</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation>Nenhum &apos;spoiler&apos; novo adicionado</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation>&apos;Spoilers&apos; foram adicionados!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation>Última alteração:</translation>
     </message>
@@ -7577,27 +6610,27 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation>Padrão</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>Sem resposta do servidor de atualização</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Resposta inválida do servidor de atualização</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>Nenhuma resposta recebida do servidor de atualização de tags.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Resposta inválida recebida do servidor de atualização de tags.</translation>
     </message>
@@ -7605,17 +6638,17 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation>Adicionar à lista de amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation>Adicionar à lista de ignorados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
@@ -7623,289 +6656,166 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>Administração</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>&amp;Atualizar mensagem do servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;Servidor desligado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>&amp;Recarregar configuração</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Funções do administrador do servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation>Funções de moderador do servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation>ID da Repetição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation>Conceder Acesso à Repetição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation>Nome de Usuário para Ativar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation>Forçar Ativação do Usuário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>&amp;Desbloquear funções</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>&amp;Bloquear funções</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation>Sucesso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation>Acesso à repetição concedido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation>Não foi possível conceder acesso à repetição. ID da Repetição inválido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation>Não foi possível conceder acesso à repetição. Erro interno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation>Usuário ativado com sucesso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation>Não foi possível ativar o usuário. Nome de usuário inválido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation>Não foi possível ativar o usuário. Usuário já está ativo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation>Não foi possível ativar o usuário. Erro interno</translation>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <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/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation>Impressão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>Flutuante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <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/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Deck: %1</translation>
     </message>
@@ -7913,55 +6823,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7969,22 +6892,22 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7992,139 +6915,139 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>Sistema de arquivos local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Armazenamento de decks no servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Abrir no editor de decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Upload do deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Download do deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>Nova pasta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation>Abrir pasta de decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation>Arquivo de deck inválido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Entre o nome do deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>Este deck não tem um nome.
 Por favor, entre um nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Deck sem nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation>Falha ao enviar deck ao servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>Excluir arquivo local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Tem certeza de que deseja excluir os arquivos selecionados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>Nome da nova pasta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation>Armazenamento de Deck</translation>
     </message>
@@ -8132,17 +7055,17 @@ Por favor, entre um nome:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation>Decks Visuais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8150,7 +7073,7 @@ Por favor, entre um nome:</translation>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation>EDHREC:</translation>
     </message>
@@ -8158,391 +7081,407 @@ Por favor, entre um nome:</translation>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <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/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>&amp;Etapas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>&amp;Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <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/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <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/client/tabs/tab_game.cpp" line="236"/>
         <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/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <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/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation>&amp;Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <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/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <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/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>&amp;Falar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>Flutuante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation>Reiniciar layout </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation>Defazer concessão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation>Você está &apos;flodando&apos; o chat (jogo). Por favor, espere alguns segundos.</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>expulso pelo hospedador do jogo ou moderador.</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>jogador deixou o jogo</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>jogador desconectado do servidor</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation>razão desconhecida</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>Você foi &apos;chutado&apos; do jogo.</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>Tempo;RemetenteNome;RemetenteIP;Mensagem;AlvoID;AlvoNome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>Logs de salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>Logs de jogos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>Logs de conversas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>Você precisa selecionar pelo menos um filtro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>Você precisa selecionar um número de dias válido para localizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>Nome de usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>Endereço de IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>Nome do jogo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>ID do Jogo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>Mensagem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>Sala Principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>Sala de Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>Chat Privado.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>X dias anteriores:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>Última hora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>Máximo de resultados:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>Ao menos um filtro deve ser selecionado.
 Quanto mais informação você inserir, mais específicos seus resultados serão.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>Obter logs de usuário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>Limpar Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>Logs de localização</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>Intervalo de data</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>Máximo de resultados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>Histórico de Mensagens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>Falha ao coletar informação do histórico de mensagens. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Não existe mensagem que corresponda aos filtros selecionados.</translation>
     </message>
@@ -8550,37 +7489,37 @@ Quanto mais informação você inserir, mais específicos seus resultados serão
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>Conversa privada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;Sair</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Conversa privada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>Este usuário esta ignorando você, ele não pode ver suas mensagens no chat principal e você não pode entrar nos jogos dele.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>Mensagem privada de</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 saiu do servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 entrou no servidor.</translation>
     </message>
@@ -8588,185 +7527,105 @@ Quanto mais informação você inserir, mais específicos seus resultados serão
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>Sistema de arquivos local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>Servidor de armazenamento de replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>Assistir replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation>Renomear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation>Nova pasta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>Excluir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation>Abrir pasta de repetições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>Baixar replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>Trocar expiração da trava</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation>Renomear pasta local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation>Renomear arquivo local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation>Novo nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation>Falha ao renomear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation>Nome da nova pasta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>Excluir arquivo local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Tem certeza de que deseja excluir os arquivos selecionados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Tem certeza de que deseja excluir as repetições selecionadas?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>Excluir replay remoto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation>Repetições de jogo</translation>
     </message>
@@ -8774,47 +7633,47 @@ Quanto mais informação você inserir, mais específicos seus resultados serão
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;Falar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>S&amp;air da sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>Limpar conversa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>Configurações de Conversa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation>mencionou você.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>Clique para ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>Você está flodando o chat. Por favor, espere alguns segundos.</translation>
     </message>
@@ -8822,35 +7681,35 @@ Quanto mais informação você inserir, mais específicos seus resultados serão
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation>Falha ao entrar na sala: ela não existe no servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation>O servidor pensa que você está na sala, mas seu cliente não consegue exibi-la. Tente reiniciar o seu cliente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation>Você não tem permissão para entrar nesta sala.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation>Falha ao entrar na sala devido a um erro desconhecido: %1.</translation>
     </message>
@@ -8858,97 +7717,87 @@ Quanto mais informação você inserir, mais específicos seus resultados serão
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation>Editor de Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation>&amp;Decks Visuais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation>Armazenamento de Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation>Repetições de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation>Administração</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation>Registros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>Você tem certeza?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>Ainda existem jogos abertos. Você tem certeza que deseja sair?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation>Clique para visualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Seu amigo %1 entrou no servidor!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>Evento desconhecido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8959,39 +7808,39 @@ Esta mensagem pode significar que existe uma nova versão do Cockatrice disponí
 Para atualizar seu cliente, vá para Ajuda -&gt; Verificar atualizações.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation>Tempo esgotado de inatividade</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Você irá ser desconectado por inatividade</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>Promoção</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation>Você foi promovido a moderador(a). Por favor faça logout e depois acesse novamente para que as mudanças sejam efetivadas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>Advertido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>Você recebeu uma advertência por %1.
 Por favor evite tais ações ou outras medidas poderão ser tomadas contra você. Se você tem qualquer dúvida, por favor envie uma mensagem privada um dos moderadores.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>Você recebeu a seguinte mensagem do servidor.
@@ -9001,12 +7850,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -9014,13 +7858,13 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>Não foi possível analisar o deck.</translation>
     </message>
@@ -9028,14 +7872,14 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>Arquivo não existe.
 </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>Falha ao abrir arquivo.
@@ -9045,42 +7889,42 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Vida</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Branco</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Azul</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Preto</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Vermelho</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Verde</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Incolor</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Outro</translation>
     </message>
@@ -9088,7 +7932,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>Não foi possível abrir o arquivo para leitura.</translation>
     </message>
@@ -9096,206 +7940,184 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>&amp;Detalhes do usuário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>Conversa privada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Mostrar este usuário de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>Adicionar à &amp;lista de amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Remover da li&amp;sta de amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>Adicionar à li&amp;sta dos ignorados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Remover da lista dos i&amp;gnorados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>C&amp;hutar do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>Advertir usuário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Visualizar o histórico de advertê&amp;ncias do usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>Ban&amp;ir do servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Visualizar o histórico de %banimento do usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promover usuário a moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Rev&amp;ogar as permissões de moderação do usuário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation>Promover usuário a &amp;juiz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation>Remover usuário da posição de juiz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation>Visualizar notas do administrador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <source>This user does not exist.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>Jogos de %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>Histórico de banimento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>Tempo de banimento;Moderador;Duração do Banimento;Razão do Banimento;Razão Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>O usuário nunca foi banido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation>Falha ao coletar informações de banidas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>Histórico de advertências</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>Tempo de advertência;Moderador;Nome de Usuário;Razão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>Usuário nunca foi advertido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation>Falha ao coletar informações de aviso.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation>Falha ao obter as notas do administrador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>Sucesso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>Usuário promovido com sucesso.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>Permissões de moderação revogadas com sucesso.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>Falha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>Falha ao promover usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>Falha ao revogar permissões de moderação do usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation>Copiar hash para área de transferência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Remover mensagens deste usuário</translation>
     </message>
@@ -9303,173 +8125,173 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>Idade conta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>Alterar senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>Alterar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Administrador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>Moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Usuário registrado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Usuário não registrado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation>Juíz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation>A senha inserida não coincide com de sua conta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>Informações do usuário atualizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation>Informação do usuário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation>Nome real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation>Nível do usuário:</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation><numerusform>%n ano(s),</numerusform><numerusform>%n ano(s),</numerusform><numerusform>%n ano(s),</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation><numerusform>%10%n dia(s) %20</numerusform><numerusform>%10%n dia(s) %20</numerusform><numerusform>%10%n dia(s) %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>Insira a senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation>Uma verificação de senha é obrigatória para alterar seu endereço de e-mail</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation>Ocorreu um erro ao tentar atualizar suas informações de usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>Este servidor não permite que você atualize suas informações de usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>Senha alterada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>Este servidor não permite que você altere sua senha.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>A nova senha é muito curta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>A senha antiga está incorreta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>Avatar alterado.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Este servidor não permite que você altere seu avatar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>Um erro ocorreu enquanto seu avatar era atualizado.</translation>
     </message>
@@ -9477,152 +8299,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <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/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <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/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <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/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <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/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Tempo de buffer para retroceder usando atalho:</translation>
     </message>
@@ -9630,241 +8437,86 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation>Usuários conectados ao servidor: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation>Usuários nesta sala: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation>Amigos online: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation>Usuários ignorados online: %1 / %2</translation>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9872,27 +8524,27 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9900,7 +8552,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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9908,19 +8560,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9928,37 +8580,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9966,93 +8608,45 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10060,25 +8654,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation>Decks Visuais</translation>
     </message>
@@ -10086,52 +8701,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10139,7 +8749,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10147,22 +8757,22 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation>Ordenar Alfabeticamente (Nome do Deck)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation>Ordenar Alfabeticamente (Nome do Arquivo)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation>Ordenar por Última Modificação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation>Ordenar por Último Carregamento</translation>
     </message>
@@ -10170,17 +8780,17 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation>Carregando banco de dados ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10188,43 +8798,43 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>Qual advertência você gostaria de enviar?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Remover todas mensagens deste usuário em todas salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>%OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>Advertir usuario por mau comportamento.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>O campo &quot;nome de usuário&quot; ao qual se deseja enviar uma advertência não pode permanecer em branco, por favor especifique um usuário para ser advertido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>O campo &quot;advertência&quot; não pode permanecer em branco, por favor selecione uma advertência para ser enviada.</translation>
     </message>
@@ -10232,133 +8842,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <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/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation>Dicas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation>Gerenciar expansões</translation>
     </message>
@@ -10366,72 +8976,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>visualização da pilha</translation>
     </message>
@@ -10439,7 +9049,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Português do Brasil (Brazilian Portuguese)</translation>
     </message>
@@ -10447,12 +9057,12 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation>Conectar ao iniciar</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation>Depurar para um arquivo</translation>
     </message>
@@ -10460,1058 +9070,991 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>Janela Principal</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>Editor de Deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>Saguão de jogo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation>Marcadores de carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation>Marcadores de jogador</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Poder e Resistência</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Etapas de Jogo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>Área de jogo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation>Mover Carta Selecionada</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>Visualizar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation>Mover A Carta Do Topo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation>Mover A Carta Do Fundo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Jogabilidade</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation>Comprando</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation>Sala de Conversa</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation>Janela de Jogo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation>Carregar deck da área de transferência</translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation>Repetições</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation>Abas</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation>Procurar por atualizações de cartas...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation>Conectar...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>Tela cheia</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation>Registrar...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation>Configurações...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation>Iniciar um Jogo Local...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation>Assistir Replay...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation>Limpar todos os FIltros</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation>Limpar Filtro Selecionado</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation>Remover Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation>Gerenciar expansões...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation>Editar fichas customizadas...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation>Adicionar Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation>Carregar Deck...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Carregar deck da área de transferência...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation>Novo Deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Abrir pasta de imagens customizadas</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation>Imprimir Deck...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation>Deletar carta</translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation>Redefinir layout</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>Salvar Deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation>Salvar Deck Como...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Salvar deck na área de transferência, anotado</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation>Salvar deck na área de transferência</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation>Carregar deck local...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation>Carregar deck remoto...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation>Preparade para começar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Alternar trava de sideboard</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation>Adicionar marcador verde</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation>Remover marcador verde</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation>Definir marcadores verde...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation>Adicionar marcador vermelho</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation>Remover marcador vermelho</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation>Definir marcadores vermelhos</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation>Adicionar ponto de vida</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation>Remover ponto de vida</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation>Definir pontos de vida...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation>Adicionar marcador branco</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation>Remover marcador branco</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation>Definir marcadores brancos...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation>Adicionar marcador azul</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation>Remover marcador azul</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation>Definir marcadores azul</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation>Adicionar marcador preto</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation>Remover marcador preto</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation>Definir marcadores pretos...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation>Adicionar marcador incolor</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation>Remover marcador incolor</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation>Definir marcadores incolor...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation>Adicionar outro marcador</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation>Remover outro marcador</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation>Definir outros marcadores...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation>adicionar Poder (+1/+0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Remover Poder (-1/-0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Mover Resistência Para Poder (+1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Adicionar Resistência (+0/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Remover Resistência (-0/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Mover Poder Para Resistência (-1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Adicionar Poder e Resistência (+1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Remover Poder e Resistência (-1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation>Definir poder e resistência...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation>Redefinir poder e resistência</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>Desvirar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>Manutenção</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>Compra</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation>Primeira Fase Principal</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation>Iniciar Combate</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>Atacar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>Bloquear</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>Dano</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation>Terminar Combate</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation>Segunda Fase Principal</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation>Próxima Fase</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation>Ação de Próxima Etapa</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation>Próximo Turno</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation>Ocultar Carta na Janela de Revelação</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation>Virar / Desvirar Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation>Desvirar Tudo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
+        <translation>Alternar modo de desvirar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation>Virar carta para cima</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation>Olhar carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation>Jogar Carta</translation>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation>Anexar carta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation>Desanexar carta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation>Duplicar Carta</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation>Criar Ficha</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <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/settings/shortcuts_settings.h" line="518"/>
         <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/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation>Definir anotação</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <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"/>
-        <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/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation>Topo do Grimório</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation>Campo de batalha, Voltada para baixo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation>Campo de Batalha</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Grimório</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation>Cartas do topo do grimório</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation>Cartas do Fundo da Biblioteca</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation>Fechar visualização recente</translation>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <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/settings/shortcuts_settings.h" line="615"/>
         <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/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation>Desenhar seta...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <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/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation>Sair do jogo</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation>Rolar dados...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation>Embaralhar grimório</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <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/settings/shortcuts_settings.h" line="650"/>
         <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/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation>Desfazer compra</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <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/settings/shortcuts_settings.h" line="659"/>
         <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"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <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/settings/shortcuts_settings.h" line="665"/>
         <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/settings/shortcuts_settings.h" line="668"/>
         <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/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation>Focar no chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation>Limpar chat</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation>Atualizar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation>Avançar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation>Retroceder</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation>Reproduzir/Pausar</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <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"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation>Decks Visuais</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation>Armazenamento de Deck</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation>Administração</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation>Registros</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_ru.ts b/cockatrice/translations/cockatrice_ru.ts
index e666bf0de..450c279e8 100644
--- a/cockatrice/translations/cockatrice_ru.ts
+++ b/cockatrice/translations/cockatrice_ru.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Установить жетоны...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Установить жетоны</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Новое значение жетонов &apos;%1&apos;:</translation>
     </message>
@@ -23,422 +23,357 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <source>&amp;Refresh</source>
-        <translation>Обновить</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <source>Open in new tab</source>
-        <translation>Открыть в новой вкладке</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <source>The decklist has been modified.
 Do you want to save the changes?</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="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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <source>Could not open deck at %1</source>
-        <translation>Не удалось открыть колоду по пути «%1»</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
-        <translation>Не удалось сохранить сетевую колоду</translation>
+        <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/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <source>The deck could not be saved.
 Please check that the directory is writable and try again.</source>
-        <translation>Колода не может быть сохранена.
-Проверьте что директория доступна для записи и попробуйте снова.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="374"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <source>Save deck</source>
-        <translation>Сохранить колоду</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="409"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <source>The deck could not be saved.</source>
-        <translation>Не удалось сохранить колоду.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="532"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
-        <translation>В колоде нет карт для экспорта</translation>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
-        <translation>Список изменений</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
-        <translation>Примечания администратора для %1</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
-        <translation>Основная колода</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
-        <translation>Сайдборд</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="446"/>
-        <source> seconds</source>
-        <translation>секунд</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>Настройки темы</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Текущая тема:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation>Открыть папку с темами</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation>Путь до обоев на домашней вкладке:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation>Частота смены обоев:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
-        <translation>Настройки меню</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
-        <source>Show keyboard shortcuts in right-click menus</source>
-        <translation>Отображать сочетания клавиш в контекстном меню</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <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/dialogs/dlg_settings.cpp" line="661"/>
+        <source>Show keyboard shortcuts in right-click menus</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation>Отрисовка карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
-        <translation>Автоматически поворачивать карты альбомной ориентации </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
-        <translation>Перезаписать все арты в соответствии с выбранными изданиями (Pre-ProviderID меняет это поведение)</translation>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <source>Bump sets that the deck contains cards from to the top in the printing selector</source>
-        <translation>Перемещать в начало списка выбора издания те выпуски, из которых в колоде есть карты.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <source>Use rounded card corners</source>
-        <translation>Использовать скругленные углы карт</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="674"/>
         <source>Minimum overlap percentage of cards on the stack and in vertical hand</source>
-        <translation>Минимальный процент наложения карт в стеке и вертикальной руке</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="675"/>
         <source>Maximum initial height for card view window:</source>
-        <translation>Максимальная начальная высота для окна просмотра карты</translation>
+        <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
-        <translation>строки</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <source>Maximum expanded height for card view window:</source>
-        <translation>Макс. высота окна для просмотра карт</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="680"/>
         <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/dialogs/dlg_settings.cpp" line="684"/>
         <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/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
         <translation>Раскладка руки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <source>Enable left justification</source>
         <translation>Выравнивание по левому краю</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <source>Table grid layout</source>
         <translation>Сетка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="692"/>
         <source>Invert vertical coordinate</source>
         <translation>Инвертировать вертикальные координаты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Максимальный размер шрифта для текста карт:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation>Тема</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation>Обрезать арт случайной карты</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation>Вырезать арт из файла background.cod</translation>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>Забанить по &amp;Имени игрока</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>Забанить по &amp;адресу IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>Забанить по I&amp;D клиента</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Тип бана</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;постоянный бан</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;временный бан</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Дни</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Часы</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Минуты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Длительность бана</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Пожалуйста, назовите причину бана.
 Эта информация сохраняется для модераторов и не будет видна забаненному игроку</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Пожалуйста, назовите причину бана, которая будет видна забаненному игроку.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>Отредактировать все сообщения от этого пользователя во всех комнатах</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Забанить игрока на этом сервере</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Необходимо выбрать тип бана: по имени, по адресу IP, по ID клиента или комбинацию этих трех типов.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Необходимо ввести имя игрока при выборе опции бана по имени.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Необходимо ввести адрес IP при выборе опции бана по IP.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Необходимо ввести ID клиента при выборе опции бана по ID.</translation>
     </message>
@@ -446,22 +381,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
-        <translation>Бета</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>Нет ответа от сервера обновления версий.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Неправильный ответ от сервера обновления версий.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>Нет ответа от сервера обновления файлов.</translation>
     </message>
@@ -469,32 +404,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Издания</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Мана-стоимость</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>Сила/Выносливость:</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Цвет(а)</translation>
     </message>
@@ -502,1027 +437,807 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>И</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>ИЛИ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>И НЕ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>ИЛИ НЕ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>Издание</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Мана-стоимость</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>Количество маны</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Редкость</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Сила</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>Выносливость</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Преданность</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Формат</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
-        <translation>Тип</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
-        <translation>Подтип</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
-        <translation>Изображение</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
-        <translation>Описание</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
-        <translation>Оба</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <source>View related cards</source>
-        <translation>Посмотреть связанные карты</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
-        <translation>Сайд</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
-        <translation>Название:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
-        <translation>Связанные карты:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
-        <translation>Неизвестная карта:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation>Показать...</translation>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;Переместить...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation>Всем игрокам</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>Выбрать все</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation>Выбрать строку</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation>Выбрать колонку</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation>Разыграть</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation>Спрятать</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation>Разыграть лицом вниз</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>Повернуть / Развернуть</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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation>Посмотреть лицевую сторону</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation>Клонировать</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation>Прикрепить к карте...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation>Открепить</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation>Нарисовать стрелку</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation>Добавить заметку</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation>Жетоны на карте</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation>&amp;Добавить жетон (%1)</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation>&amp;Убрать жетон (%1)</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation>&amp;Установить жетоны (%1)...</translation>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;Сила / выносливость</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
-        <translation>Размер карты</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation>своей руки</translation>
+        <translation>их руки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation>%1 руки</translation>
+        <translation>рука %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation>своей библиотеки</translation>
+        <translation>их библиотеку</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation>библиотеки %1</translation>
+        <translation>библиотеку %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation>своей библиотеки</translation>
+        <translation>их библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <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="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation>своей библиотеки</translation>
+        <translation>их библиотеку</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation>библиотеки %1</translation>
+        <translation>библиотеку %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation>своей библиотеки</translation>
+        <translation>их библиотеку</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation>библиотеки %1</translation>
+        <translation>библиотеку %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation>своей библиотеки</translation>
+        <translation>их библиотека</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation>библиотеки %1</translation>
+        <translation>библиотека %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation>своего кладбища</translation>
+        <translation>их кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation>кладбища %1</translation>
+        <translation>кладбище %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation>своего изгнания</translation>
+        <translation>их изгнание</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <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/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation>своего сайда</translation>
+        <translation>их сайдборд</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation>сайда %1</translation>
+        <translation>сайдборд %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation>своего сайда</translation>
+        <translation>их сайдборд</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation>сайда %1</translation>
+        <translation>сайдборд %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
-        <translation>кастомной зоны &apos;%2&apos; игрока &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation>Ошибка распознавания, строка %1 колонка %2:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation>Ошибка распознавания, строка %1 колонка %2:</translation>
-    </message>
-</context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation>Кастомная зона</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation>Посмотреть кастомную зону &apos;%1&apos;</translation>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
-        <translation>Информация о карте</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
-        <translation>Искать по названию карты (или по поисковому запросу)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
-        <translation>Добавить в колоду</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
-        <translation>Добавить в сайд</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
-        <translation>Выбрать издание</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation>Посмотреть на EDHRec (Командир)</translation>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation>Посмотреть на EDHRec (карта)</translation>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <source>Show Related cards</source>
-        <translation>Посмотреть связанные карты</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <source>Add card to &amp;maindeck</source>
-        <translation>Добавить карту в колоду</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="242"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
-        <translation>Добавить карту в сайд</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
-        <source>Loading Database...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <source>Banner Card</source>
-        <translation>Обложка колоды</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
-        <source>Main Type</source>
-        <translation>Тип</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
-        <source>Mana Cost</source>
-        <translation>Мана-стоимость</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
-        <source>Colors</source>
-        <translation>Цвет</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
-        <source>Select Printing</source>
-        <translation>Выбрать издание</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
-        <source>Deck</source>
-        <translation>Колода</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
-        <source>Deck &amp;name:</source>
-        <translation>Название колоды:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
-        <source>Banner Card/Tags Visibility Settings</source>
-        <translation>Настройки отоборажение обложки и тегов</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
-        <source>Show banner card selection menu</source>
-        <translation>Показать меню выбора обложки</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
-        <source>Show tags selection menu</source>
-        <translation>Показать меню выбора тегов</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
-        <source>&amp;Comments:</source>
-        <translation>Комментарий:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
-        <source>Group by:</source>
-        <translation>Группировать по:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <source>Mana Cost</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
+        <source>Colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
+        <source>Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
+        <source>Deck &amp;name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
+        <source>Banner Card/Tags Visibility Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
+        <source>Show banner card selection menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
+        <source>Show tags selection menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
+        <source>&amp;Comments:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
+        <source>Group by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
-        <translation>Хэш-сумма</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
-        <translation>Увеличить количество</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
-        <translation>Уменьшить количество</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
-        <translation>Удалить строку</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
-        <translation>Переместить карту в/из сайда</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <source>Filters</source>
-        <translation>Фильтры</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>&amp;Clear all filters</source>
-        <translation>Убрать все фильтры</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
-        <translation>Удалить выбранное</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
-        <translation>Редактор колоды</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
-        <translation>Новая колода</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
-        <translation>Загрузить колоду</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
-        <translation>Загрузить недавнюю колоду</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
-        <translation>Очистить</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
-        <translation>Сохранить колоду</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
-        <translation>Сохранить колоду как...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
-        <translation>Загрузить колоду из буфера обмена</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
-        <translation>Редактировать колоду из буфера обмена</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
-        <translation>Аннотировано</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
-        <translation>Не аннотировано</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
-        <translation>Сохранить колоду в буфер обмена</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
-        <translation>Аннотировано (нет информации об издании)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
-        <translation>Не аннотировано (нет информации об издании)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
-        <translation>Распечатать колоду...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation>Загрузить колоду из онлайн-сервиса</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
-        <translation>Сохранить колоду в онлайн-сервис</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
-        <translation>Создать деклист (decklist.org)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
-        <translation>Создать деклист (decklist.xyz)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
-        <translation>Анализировать колоду (deckstats.net)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
-        <translation>Анализировать колоду (tappedout.net)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
-        <translation>Закрыть</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
-        <translation>Выбрать издание</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>Успешно</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation>Изменить URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
-        <translation>Размер сетевого кеша:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
-        <translation>TTL кеша перенаправлений:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <source>How long cached redirects for urls are valid for.</source>
-        <translation>Время жизни кеша редиректов</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1311"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
-        <translation>Размер кеша изображений:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
         <translation>Добавить новый URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation>Удалить URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
-        <translation>Дней</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>Обновление...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation>Выбрать путь</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <source>URL Download Priority</source>
         <translation>Приоритет загрузки URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>Спойлеры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <source>Download Spoilers Automatically</source>
         <translation>Скачивать спойлеры автоматически</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation>Расположение спойлеров:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>Последние изменения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <source>Delete Downloaded Images</source>
         <translation>Удалить загруженные изображения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Reset Download URLs</source>
         <translation>Обнулить загруженные URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1218"/>
         <source>On-disk cache for downloaded pictures</source>
-        <translation>Размер кеша для загруженных артов</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
-        <translation>Размер кеша в памяти для загруженных артов</translation>
-    </message>
-</context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
-        <translation>Количество</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
-        <translation>Издание</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>Номер</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <source>Provider ID</source>
-        <translation>Provider ID</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
+        <location filename="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Название</translation>
     </message>
@@ -1530,268 +1245,210 @@ 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/deck/deck_loader.cpp" line="22"/>
         <source>Common deck formats (%1)</source>
-        <translation>Формат колоды (%1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
+        <location filename="src/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
-        <translation>Все файлы (*.*)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
-        <translation>Режим: полное совпадение</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
-        <translation>Режим: частичное совпадение</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation>Фильтра совпадения цветов (И/ИЛИ/НЕ фильтр)</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
-        <translation>Редактировать теги ...</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
-        <translation>Управление тегами колоды</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
-        <translation>Редактируйте теги в колоде. Выберите нужные теги или добавьте новый:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
-        <translation>Новый тег (например, Aggro)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
-        <translation>Добавить тег</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
-        <translation>Фильтр тегов...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
-        <translation>ОК</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
-        <translation>Редактировать теги по умолчанию</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
-        <translation>Отменить</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
-        <translation>Неправильный ввод</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
-        <translation>Название тега не может быть пустым!</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
-        <translation>Копировать тег</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
-        <translation>Этот тег уже существует</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
         <source>Banner Card</source>
-        <translation>Обложка</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <source>Open in deck editor</source>
-        <translation>Открыть в редакторе колоды</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <source>Edit Tags</source>
-        <translation>Редактировать теги</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <source>Rename Deck</source>
-        <translation>Переименовать колоду</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <source>Save Deck to Clipboard</source>
-        <translation>Сохранить колоду в буфер обмена</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <source>Annotated</source>
-        <translation>Аннотировано</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <source>Annotated (No set info)</source>
-        <translation>Аннотировано (нет информации об издании)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <source>Not Annotated</source>
-        <translation>Не аннотировано</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <source>Not Annotated (No set info)</source>
-        <translation>Не аннотировано (нет информации об издании)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <source>Rename File</source>
-        <translation>Переименовать файл</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <source>Delete File</source>
-        <translation>Удалить файл</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <source>Set Banner Card</source>
-        <translation>Установить обложку колоды</translation>
+        <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <source>New name:</source>
-        <translation>Новое название:</translation>
+        <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Error</source>
-        <translation>Ошибка</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <source>Rename failed</source>
-        <translation>Не удалось переименовать</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Delete file</source>
-        <translation>Удалить файл</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <source>Are you sure you want to delete the selected file?</source>
-        <translation>Уверены, что хотите удалить выбранный файл?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
-        <translation>Не удалось удалить</translation>
-    </message>
-</context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>Ответ от сервера не может быть распознан</translation>
     </message>
@@ -1811,234 +1468,227 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
-        <translation>Загрузить из буфера обмена...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
-        <translation>Загрузить из интернета...</translation>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation>Выгрузить колоду</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>&amp;Готов</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
-        <translation>Принудительный старт</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation>Сайдборд разблокирован</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <source>Deck is greater than maximum file size.</source>
-        <translation>Колода больше максимально возможного размера файла</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="329"/>
         <source>Are you sure you want to force start?
 This will kick all non-ready players from the game.</source>
-        <translation>Уверены что хотите принудительно начать?
-Это кикнет всех неготовых игроков из игры</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="331"/>
         <source>Cockatrice</source>
-        <translation>Cockatrice</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
-        <translation>Изменить формат колоды</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
-        <translation>Вы пытаетесь присвоивить тег колоде в формате .txt
-Теги могут быть добавлены только к колоде в формате .cod
-Хотите конвертировать колоду в фомат .cod?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
-        <translation>Запомнить выбор</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Загрузка...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Известные Хосты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
-        <translation>Удалить текущий выбранный сервер</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Обновить список известных публичных серверов</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Новый хост</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Название:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Хост:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Порт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Имя пользователя:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>П&amp;ароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Сохранить пароль</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>Присоединяться автоматически</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Автоматически подключится с последним логином при открытии Кокатрис</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>Если у вас появилась проблема при присоединении или регистрации - свяжитесь с сотрудниками для помощи!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Веб-страница</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>Обнулить пароль</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
-        <translation>Забыли пароль?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Подключиться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Логин</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>Соединение с сервером</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Подключиться к серверу</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>URL сервера</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>Порт связи</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>Уникальное имя сервера</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Предупреждение при соединении</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>Назовите ваш профиль для соединения.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Ошибка при соединении</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Необходимо указать имя пользователя.</translation>
     </message>
@@ -2046,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>&amp;Запомнить настройки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Описание:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>&amp;Игроки:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>Основные</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Формат игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Пароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Только для &amp;друзей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Только для &amp;зарегистрированных пользователей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Ограничения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>&amp;Зрители могут наблюдать за игрой</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Зрителям &amp;необходим пароль для просмотра игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Позволить зрителям &amp;комментировать</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Зрители могут видеть &amp;руки игроков</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>Создать игру как зритель</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Зрители</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
-        <translation>Начальное количество жизней:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation>Открыть деклист в лобби</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
-        <translation>Настройки игры</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;Очистить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Создать игру</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Информация об игре </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Ошибка сервера.</translation>
     </message>
@@ -2169,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Название:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Фишка</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Цвет:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>белый</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>синий</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>черный</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>красный</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>зеленый</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>многоцветный</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>бесцветный</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;Сила/Выносливость:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Примечание:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Уничтожить фишку, когда она покинет поле битвы</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
-        <translation>Создать лицом вниз (скроет только название)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Описание фишки</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Показать &amp;все фишки</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Показать фишки из указанной &amp;колоды</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Выбрать фишку из списка</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Создать фишку</translation>
     </message>
@@ -2267,94 +1907,94 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
-        <translation>Редактировать теги</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
-        <translation>Добавить</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
-        <translation>Подтвердить</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
-        <translation>Отменить</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
-        <translation>Введите тег и нажмите 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"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
-        <translation>✖</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
-        <translation>Неправильный ввод</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
-        <translation>Название тега не может быть пустым!</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
-        <translation>Копировать тег</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
-        <translation>Этот тег уже существует</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Изображение не выбрано.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Чтобы сменить аватар, выберите новое изображение.
 Чтобы удалить текущий аватар, нажмите &quot;Сменить аватар&quot;, оставив поле выбора изображения пустым.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Поиск...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Сменить аватар</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Открыть изображение</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Файлы изображений (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Выбрано не подходящее изображение.</translation>
     </message>
@@ -2362,56 +2002,56 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <source>Edit deck in clipboard</source>
-        <translation>Редактировать колоду из буфера обмена</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Error</source>
-        <translation>Ошибка</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
-        <translation>Неправильный деклист</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Старый пароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Новый пароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Подтверждение пароля:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Сменить пароль</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Пароль слишком короткий</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Введенные пароли не совпадают.</translation>
     </message>
@@ -2419,93 +2059,93 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Название</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Цвет</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>белый</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>синий</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>чёрный</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>красный</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>зелёный</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>мультицветный</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>бесцветный</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;Сила/Выносливость:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Примечание:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Описание фишки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Добавить фишку</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Удалить фишку</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>Редактировать пользовательские фишки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Введите имя фишки:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Ошибка </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>Выбранное имя конфликтует с существующей картой или токеном.
@@ -2515,27 +2155,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>Электронная почта:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Страна:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Не указано</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Настоящее имя:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Редактировать профиль</translation>
     </message>
@@ -2543,143 +2183,137 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>без лимита</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5 минут</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10 минут</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30 минут</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1 час</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2 часа</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
-        <translation>Скрывать игры &quot;только для друзей&quot;</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
-        <source>Hide full games</source>
-        <translation>Скрыть заполненные игры</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
-        <source>Hide games that have started</source>
-        <translation>Скрыть уже начавшиеся игры</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
-        <source>Hide password protected games</source>
-        <translation>Скрыть игры, защищенные паролем</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
-        <source>Hide &apos;ignored user&apos; games</source>
-        <translation>Скрыть игры от игнорируемых пользователей</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation>Скрыть игры &quot;только с открытыми деклистами&quot;</translation>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
+        <source>Hide games that have started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
+        <source>Hide password protected games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
+        <source>Hide &apos;ignored user&apos; games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Новее чем:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Описание игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>Имя &amp;создателя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>Основные</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>Форматы &amp;игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>не &amp;менее</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>не &amp;более</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Максимальное количество игроков</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Ограничения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Показывать игры со &amp;зрителями</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Показывать &amp;игры с паролем для зрителей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Показывать игры где зрители могут &amp;писать в чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Показывать игры где зрители могут видеть &amp;руки игроков</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation>Зрители</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Фильтровать игры</translation>
     </message>
@@ -2687,52 +2321,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
-        <translation>Предупреждение при проверке сброса пароля</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
-        <translation>Возникла проблема. Попробуй запросить новый пароль еще раз</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
-        <translation>Введите информации о сервере и учетной записи, для которой нужен новый пароль</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Хост:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Порт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Имя игрока:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>Электронная почта:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
-        <translation>Сбросить пароль</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
-        <translation>Предупреждение при проверке сброса пароля</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>Необходимо указать ваш e-mail</translation>
     </message>
@@ -2740,37 +2374,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
-        <translation>Введите информации о сервере и учетной записи, для которой нужен новый пароль</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Хост:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Порт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Имя игрока:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
-        <translation>Забыл пароль</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
-        <translation>Ошибка сброса пароля</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Необходимо указать имя игрока.</translation>
     </message>
@@ -2778,86 +2412,86 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
-        <translation>Сбросить предупреждение о пароле</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
-        <translation>Возникла проблема. Попробуй запросить новый пароль еще раз</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
-        <translation>Введите полученный токен и новый пароль</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Хост:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Порт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Имя игрока:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Жетон:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Новый пароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
-        <translation>Сбросить пароль</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Необходимо указать имя игрока.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
-        <translation>Ошибка сброса пароля</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>Необходимо указать код активации.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>Необходимо ввести новый пароль.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
-        <translation>Ошибка</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
-        <translation>Пароль слишком короткий</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>Введенные пароли не совпадают.</translation>
     </message>
@@ -2865,255 +2499,163 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
-        <translation>Загрузить колоду</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Неверный деклист.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation>Вставьте ссылку на сайт с деклистом для импорта
-(Поддерживаются Archidekt, Deckstats, Moxfield, and TappedOut)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation>Загрузить колоду из интернета</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation>Недоступен парсер для данного источника
-(Поддерживаются Archidekt, Deckstats, Moxfield, and TappedOut)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation>Ошибка сети: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation>Получен пустой ответ</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation>Ошибка парсинга колоды: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-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>Предоставленная ссылка не выглядит как рабочая
-Правильные ссылки выглядят следующим образом:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</translation>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Загрузить колоду</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <source>Card name (or search expressions):</source>
-        <translation>Название карты (или поисковый запрос)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <source>Number of hits:</source>
-        <translation>Количество:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <source>Auto play hits</source>
-        <translation>Автоматически разыгрывать найденные карты</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <source>Put top cards on stack until...</source>
-        <translation>Поместить вернюю карту в стек, пока...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="82"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
-        <translation>В базе данных карт ничего не найдено. Все равно продолжить?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
-        <translation>Cockatrice</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
-        <translation>Неправильный фильтр</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
-        <translation>Введите информацию о себе и о сервере, на котором хотите зарегистрироваться.
-На электронную почту будет отправлено письмо активации учетной записи.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;Хост</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;Порт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Имя пользователя:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Подтверждение пароля:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>Адрес email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>Подтверждение email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Страна:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Не определено</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Настоящее имя:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Зарегистрироваться на сервере</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Предкпреждение</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
-        <translation>Пароль слишком короткий</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Введенные пароли не совпадают, повторите снова.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Введенные адреса email не совпадают, повторите снова.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Необходимо указать имя пользователя.</translation>
     </message>
@@ -3121,73 +2663,58 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
-        <translation>Количество граней:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
-        <translation>Количество кубов:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
-        <translation>Бросить кубик</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
-        <translation>Карты без изменений:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
-        <translation>Карты с изменениями:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
-        <translation>Выделите издания для их включения. Перетаскиваете для изменения их порядка и приоритета. Для карт будут использованы арты с наибольшим приоритетом.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
-        <translation>Очистить информацию об издании</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
-        <translation>Поменять все на предпочтительный</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3201,7 +2728,7 @@ Cockatrice не может корректно работать с испорче
 Вы хотите сменить расположение файла базы карт?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1897"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3215,20 +2742,16 @@ 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/dialogs/dlg_settings.cpp" line="1813"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
 
 Would you like to change your database location setting?</source>
-        <translation>База карт загружена не до конца
-
-Пожалуйста, направьте заявку на https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached с приложенным файлом cards.xml
-
-Вы хотите изменить путь до локальной базы карт?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1909"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3236,7 +2759,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3244,72 +2767,68 @@ 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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
 
 Would you like to change your database location setting?</source>
-        <translation>Неизвестный статус загрузки базы карт
-
-Пожалуйста, отправьте заявку на https://github.com/Cockatrice/Cockatrice/issues
-
-Вы хотите изменить путь до локальной базы карт?</translation>
+        <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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Основные</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>Интерфейс</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
-        <translation>Источник карт</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Горячие клавиши</translation>
     </message>
@@ -3317,59 +2836,57 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
-        <translation>База карт:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/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>Прошло более %2 после последнего обновления базы карт.
-Выберите способ запуска приложения для обновления базы карт.
-Вы сможете изменить выбранный способ позднее во кладке настроке &quot;Основные&quot;.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
-        <translation>Запустить на переднем плане</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
-        <translation>Запустить в фоне</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
-        <translation>Запустить в фоне сейчас и всегда а будущем</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
-        <translation>Не спрашивать снова и не запускать</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
-        <translation>Не запускать в этот раз</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>Следующий</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>Предыдущий</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Совет дня</translation>
     </message>
@@ -3377,40 +2894,40 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Канал актуального обновления</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Переустановить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Отменить загрузку</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Открыть страницу загрузки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
-        <translation>Проверить обновления клиента</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>В Cockatrice нет поддержки SSL и вы не можете обновиться автоматически!
@@ -3418,125 +2935,129 @@ Please visit the download page to update manually.</source>
 Пожалуйста, посетите страницу загрузки для получения обновления.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
-        <translation>Скачивание обновлений: %1</translation>
+        <oldsource>Downloading update...</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Проверка обновлений...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Закончена проверка обновлений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Нет доступных обновлений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Установлена последняя версия Cockatrice!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>Уже установлена последняя версия, доступная в выбранной ветке обновлений.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Текущая версия</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Выбранная ветка обновлений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Обновление доступно</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Доступна новая версия Cockatrice!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Новая версия</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>Выпущена</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Список изменений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Вы хотите обновить сейчас?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
-        <translation>Автообновление не удалось - подходящая версия не найдена. Скачайте новую версию вручную.</translation>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <source>Please check the &lt;a href=&quot;%1&quot;&gt;releases page&lt;/a&gt; on our Github and download the build for your system.</source>
-        <translation>Проверьте &lt;a href=&quot;%1&quot;&gt;страницу релиза&lt;/a&gt; в нашем репозитории на Github и скачайте сборку для своей системы.</translation>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Ошибка при оновлении</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>В процессе проверки обновлений произошла ошибка:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>В процессе загрузки обновления произошла ошибка:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Установка...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
-        <translation>Невозможно открыть установщик.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Попробуйте обновить вручную, закрыв Cockatrice и запустив инсталлятор.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3544,162 +3065,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Очистить лог при закрытии</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
-        <translation>Скопировать в буфер обмена</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Лог</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
-        <translation>в %1 колоде</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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3707,426 +3096,339 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
-        <translation>Card Hoarder</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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
-        <translation>Card Kingdom</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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
-        <translation>Card Market</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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
-        <translation>MTG Stocks</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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
-        <translation>Scg</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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
-        <translation>Tcgl</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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
-        <translation>Tcgplayer</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
-        <translation>%1% Сенергии</translation>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
-        <translation>Комбо</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"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
-        <translation>Средняя сборка</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
-        <translation>Цена:</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
-        <translation>Укажите свой фильтр</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
-        <translation>Подтвердить удаление</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
-        <translation>Вы уверены что хотите удалить фильтр &apos;%1&apos;?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
-        <translation>Не удалось удалить</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
-        <translation>Не удалось удалить фильтр &apos;%1&apos;.</translation>
-    </message>
-</context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation>кикнут из игры хостом или модератором</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation>игрок покинул игру</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation>игрок отсоединился от сервера</translation>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation>причина неизвестна</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Пожалуйста, сперва войдите в соответствующую комнату.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Неверный пароль.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Зрители не допускаются в эту игру.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>Все места уже заняты!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>Эта игра больше не существует.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Доступно только для зарегистрированных.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Доступно только для друзей.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Вы добавлены в игнор-лист данного игрока.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
-        <translation>Присоединиться</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
-        <translation>Наблюдать</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
-        <translation>Информация об игре </translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Присоединиться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>Пожалуйста, сначала присоединитесь к соответствующей комнате.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Фильтр игр</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>О&amp;чистить фильтр</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>&amp;Создать</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>&amp;Присоединиться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>Присоединиться как &amp;зритель</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
+        <location filename="src/game/game_selector.cpp" line="388"/>
+        <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
-        <source>Games shown: %1 / %2</source>
-        <translation>Показано игр: %1 / %2</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Игры</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
-        <translation>&gt; 1 дня</translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
-        <translation><numerusform>%1%2 час</numerusform><numerusform>%1%2 часа</numerusform><numerusform>%1%2 часов</numerusform><numerusform>%1%2 часов</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
-        <translation>создать</translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
-        <translation><numerusform>%1%2 минута</numerusform><numerusform>%1%2 минут</numerusform><numerusform>%1%2 минут</numerusform><numerusform>%1%2 минут</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>пароль</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>только друзья</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>только для зарегистрированных пользователей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation>открыть деклист</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>зрители могут комментировать в чате</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>видеть руки игроков</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>могут видеть руки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>не допускаются</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Комната</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Возраст</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Создатель</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Ограничения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Количество игроков</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Зрители</translation>
     </message>
@@ -4134,609 +3436,205 @@ 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/dialogs/dlg_settings.cpp" line="391"/>
         <source>Reset all paths</source>
-        <translation>Сбросить</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="198"/>
         <source>All paths have been reset</source>
-        <translation>Все пути были сброшены</translation>
+        <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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/dialogs/dlg_settings.cpp" line="365"/>
         <source>Paths (editing disabled in portable mode)</source>
-        <translation>Путь (в портативном режиме редактирование недоступно)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/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/dialogs/dlg_settings.cpp" line="370"/>
         <source>How to help with translations</source>
-        <translation>Как помочь с переводом</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/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/dialogs/dlg_settings.cpp" line="372"/>
         <source>Filters directory:</source>
-        <translation>Фильтровать директории:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/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/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/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/dialogs/dlg_settings.cpp" line="376"/>
         <source>Custom database directory:</source>
-        <translation>Пользовательские сеты:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/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/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/dialogs/dlg_settings.cpp" line="379"/>
         <source>Check for client updates on startup</source>
-        <translation>Проверять обновления при запуске</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="380"/>
         <source>Check for card database updates on startup</source>
-        <translation>Проверять обновления базы карт при запуске</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="381"/>
         <source>Don&apos;t check</source>
-        <translation>Не проверять</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="383"/>
         <source>Prompt for update</source>
-        <translation>Поиск обновлений</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="385"/>
         <source>Always update in the background</source>
-        <translation>Всегда обновлять на фоне</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="386"/>
         <source>Check for card database updates every</source>
-        <translation>Проверять обновления каждые</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="387"/>
         <source> days</source>
-        <translation> дней</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/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/dialogs/dlg_settings.cpp" line="389"/>
         <source>Automatically run Oracle when running a new version of Cockatrice</source>
-        <translation>Автоматически запускать Oracle в новой версии Cockatrice</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="390"/>
         <source>Show tips on startup</source>
-        <translation>Показывать советы при запуске клиента</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
-        <translation>Последнее проверка обновлений была %1 (%2 дней назад)</translation>
-    </message>
-</context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation>Кладбище</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation>Посмотреть кладбище</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation>Переместить кладбище в...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation>Верх библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation>Низ библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation>Всем игрокам</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation>Рука</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation>Изгнание</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation>Показать случайно карту...</translation>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation>Рука</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation>Посмотреть руку</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation>Переместить руку...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top of library</source>
-        <translation>Верх библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
-        <source>&amp;Bottom of library</source>
-        <translation>Низ библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation>Кладбище</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation>Изгнание</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <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"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation>Показать случайную карту...</translation>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation>Создать новую колоду</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation>Посмотреть колоды</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation>Посмотреть базу карт</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation>Посмотреть EDHRec</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation>Посмотреть повтор</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation>Выход</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation>Подключение...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation>Подключиться</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation>Играть</translation>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation>Библиотека</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation>Посмотреть библиотеку</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation>Посмотреть топдек</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation>Посмотреть нижнюю карту библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation>Показать библиотеку...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</source>
-        <translation>Предоставить доступ к библиотеке...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
-        <source>Reveal &amp;top cards to...</source>
-        <translation>Показать топдек...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation>Топдек</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</source>
-        <translation>Низ библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
-        <source>&amp;Always reveal top card</source>
-        <translation>&amp;Всегда показывать верхюю карту</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation>&amp;Всегда смотреть верхнюю карту</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation>Открыть колоду в редакторе</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation>Взять карту</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw cards...</source>
-        <translation>Взять карты</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
-        <source>&amp;Undo last draw</source>
-        <translation>Отменить последнее взятие карты</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation>Перемешать</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</source>
-        <translation>Сыграть топдек</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
-        <source>Play top card &amp;face down</source>
-        <translation>Сыграть топдек лицом вниз</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation>Положить топдек на низ библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation>Положить топдек в кладбище</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation>Положить топдек в изгнание</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <source>Put top cards on stack &amp;until...</source>
-        <translation>Поместить вернюю карту в стек, пока...</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
-        <source>Shuffle top cards...</source>
-        <translation>Перемешать верхние карты</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation>&amp;Взять нижнюю карту</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation>Взять нижнюю карту библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation>Разыграть нижнюю карту библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation>Разыграть нижнюю карту библиотеки лицом вниз</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation>Положить нижнюю карту библиотеки в кладбище</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation>Положить нижнюю карту библиотеки в кладбище</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation>Переместить нижнюю карту на топдек</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <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"/>
-        <source>&amp;All players</source>
-        <translation>Все игроки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation>Показать верхние карты библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation>Количество карт: (макс. %1)</translation>
-    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>Этот сервер достиг максимального количества пользователей, попробуйте позже.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Слишком много одновременных подключений с Вашего адреса.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Забанен модератором</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Ожидаемое время: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>Этот бан не ограничен по времени.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Плановый перерыв в работе сервера.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Неверное имя пользователя.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>Вы вышли из аккаунта, так как был выполнен вход из другого расположения.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Соединение прервано</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>Ваше подключение было прервано сервером.
 Причина: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4751,679 +3649,689 @@ Reason for shutdown: %1</source>
 Причина перезагрузки: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Плановый перерыв в работе сервера</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Успешно</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Регистрация прошла успешно.
 Идет соединение.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Активация аккаунта прошла успешно.
 Идет соединение.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Количество игроков</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Введите количество игроков.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Игрок %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Загрузить повтор</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
-        <translation>Версия</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Страница Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Руководитель проекта:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>Предыдущие руководители проекта:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>Разработчики:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>Наши разработчики</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>Помочь в разработке!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Переводчики:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>Наши переводчики</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>Помочь с переводом!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>Поддержать проект:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>Сообщить о проблеме</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>Устранение неполадок</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>ЧАВо</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Нет связи с сервером</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>Не могу подключиться</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>Ваш клиент не поддерживает некоторые функции, необходимые для соединения с сервером. </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Неверное имя пользователя или пароль. Пожалуйста, уточните регистрационные данные и попробуйте снова.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Пользователь с таким именем уже подключен.
 Пожалуйста, закройте это подключение и войдите заново.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Вы забанены до %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Вы забанены бессрочно.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>На этом сервере требуется регистрация. Вы хотите зарегистрироваться сейчас?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>Активация аккаунта</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>Ваш аккаунт ещё не активирован. Вам нужно предоставить жетон/код активации, полученный по электронной почте.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>Сервер заполнен</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Неизвестная ошибка входа: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 Обычно это означает, что Вы используете устаревшую версию клиента, и тот не отвечает запросам сервера.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>Имя пользователя должно удовлетворять следующим условиям:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>длиной в %1 - %2 символов</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>%1 может содержать строчные буквы</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>НЕ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>%1 может содержать заглавные буквы</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>%1 может содержать цифры</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>Может содержать следующие символы: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>Первый знак %1 может быть знаком пунктуации</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>не может содержать следующие слова: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>не может соответствовать следующим выражениям: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>Имя пользователя может включать только следующие символы: A-Z, a-z, 0-9, &quot;_&quot;, &quot;.&quot; и &quot;-&quot;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>Запрос на регистрацию отклонен</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>Регистрация на данном сервере в настоящий момент недоступна</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>Аккаунт с таким именем уже существует.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>При регистрации необходимо указать действующий e-mail.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>Слишком короткий пароль.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>Регистрация не удалась из-за технических неполадок на сервере.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>Неизвестная ошибка при регистрации: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>Не удалось активировать аккаунт</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Ошибка сокета: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>Вы пытаетесь подключиться к несуществующему серверу. Пожалуйста, обновите Cockatrice или выберите другой сервер.
 Локальная версия %1, удаленная версия %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>Ваш клиент Cockatrice устарел. Пожалуйста, обновите Cockatrice.
 Локальная версия %1, удаленная версия %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Подключение к %1...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>Регистрация на %1 как %2...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Подключение прервано</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Соединение установлено, выполняется вход на %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>Подключение... &amp;С</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>П&amp;рервать подключение</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>&amp;Начать локальную игру...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Смотреть повтор...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>Полный экран &amp;F</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Регистрация на сервере...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;Выход</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>&amp;Действия</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;База карт</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>Открыть папку с изображениями</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>Открыть папку с изданиями</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>Добавить издания/карты</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>О про&amp;грамме</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>База карт</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>Открыть настройки</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <source>New sets found</source>
         <translation>Найдены новые издания</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
         <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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>Просмотреть издания</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>Добро пожаловать</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,863 +4342,669 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation>Загрузить издания/карты</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <source>Selected file cannot be found.</source>
         <translation>Выбранный файл не найден.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation>Запрос активации получен. Вам отправлен код активации. Пожалуйста, проверьте свой e-mail.</translation>
     </message>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="133"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
-        <translation>%1 прикрепляет %2 к %4 под контролем %3.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="137"/>
+        <location filename="src/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>карту</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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>
+        <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation>Игра началась.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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>
+        <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>Орел</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>Решка</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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>
+        <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/server/message_log_widget.cpp" line="620"/>
         <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>
+        <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 отменяет последние взятия (%2).</translation>
     </message>
@@ -6298,206 +5012,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Сообщение:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation>Настройки чата</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <source>Custom alert words</source>
         <translation>Пользовательские предупреждения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1451"/>
         <source>Enable chat mentions</source>
         <translation>Включить упоминания в чате</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1452"/>
         <source>Enable mention completer</source>
         <translation>Включить автозавершение упоминаний</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1453"/>
         <source>In-game message macros</source>
         <translation>Макросы сообщений игрового чата</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1455"/>
         <source>How to use in-game message macros</source>
-        <translation>Как использовать внутриигровые макросы для сообщений</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <source>Invert text color</source>
         <translation>Инвертировать цвет текста</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <source>(Color is hexadecimal)</source>
         <translation>(Шестнадцатеричный цвет)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Разделять слова пробелом, только для букв и цифр</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -6505,17 +5176,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -6523,62 +5194,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -6586,57 +5257,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Заключительный шаг</translation>
     </message>
@@ -6644,213 +5315,703 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>ru</translation>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>Показать верхние карты библиотеки</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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
+        <translation>Количество карт: (макс. %1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>&amp;Посмотреть кладбище</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>По&amp;смотреть карты в изгнании</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>Игрок &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;Кладбище</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;Изгнание</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>&amp;Поместить руку..</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>&amp;на верх библиотеки</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>&amp;вниз библиотеки</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>&amp;Поместить карты кладбища..</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>Р&amp;ука</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>&amp;Поместить карты из изгнания..</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>Просмортеть &amp;библиотеку</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>Посмтореть верхние карт&amp;ы...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>Показать &amp;библиотеку..</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>&amp;Всегда показывать верхнюю карту</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>Просмотреть &amp;сайд</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>В&amp;зять карту</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>Вз&amp;ять карты...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>&amp;Отменить последнее взятие</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>Взять стра&amp;ховку</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>Разыграть верхнюю карту &amp;рубашкой вверх</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>Поместить верхние карты на кладби&amp;ще...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>Поместить верхние карты в и&amp;згнание...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>Поместить верхн&amp;юю карту на дно</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>Показать руку игроку.. &amp;R</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Показать случайную карту игроку...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>&amp;Сайд</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Библиотека</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>&amp;Жетоны</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>&amp;Развернуть все перманенты</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>Бросить &amp;кубик...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>Создать &amp;фишку...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>Создать &amp;еще одну фишку</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>Создать готовый токен </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>&amp;Все игроки</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>Ска&amp;зать</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>Разыграть</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>Скрыть</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>Разыграть рубашкой вверх</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Переключить &amp;разворот как обычно</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>Посмотреть &amp;лицевую сторону</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>&amp;Копировать</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>При&amp;соединить</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>&amp;Открепить</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>&amp;Нарисовать стрелку</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>Увеличить силу</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>Уменьшить силу</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>Увеличить защиту</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>Уменьшить защиту</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>У&amp;величить силу и защиту</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>У&amp;меньшить силу и защиту</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>Установить силу и защиту</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>Добавить пометку</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>&amp;Добавить жетон (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;Удалить жетон (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>&amp;Установить жетоны (%1)...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>Просмотр верхних карт</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
         <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.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <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"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <source>Create tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <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.cpp" line="3188"/>
         <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.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>Взять карты</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>Количество:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>Поместить верхние карты на кладбище</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>Поместить верхние карты в изгнание</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <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.cpp" line="3534"/>
         <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.cpp" line="3653"/>
         <source>Set annotation</source>
-        <translation type="unfinished"/>
+        <translation>Пометка</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player.cpp" line="3654"/>
         <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
+        <translation>Введите текст:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <source>Set counters</source>
         <translation>Установить жетоны</translation>
     </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <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>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</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/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>Код:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>Все фишки</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6858,7 +6019,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"/>
     </message>
@@ -6866,17 +6027,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6884,132 +6045,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>Сервисы</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>Скрыть %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>Скрыть остальные</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>Показать все</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>Параметры...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>Выйти %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>О %1</translation>
     </message>
@@ -7017,162 +6112,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>База карт Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Записи игр Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
-        <translation>Основная колода</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
-        <translation>Сайдборд</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
-        <translation>Фишки</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -7180,17 +6248,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Дата загрузки</translation>
     </message>
@@ -7198,149 +6266,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>Игроки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>Хранение</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>Время начала</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>Длительность (сек)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Комнаты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Присоединиться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Комната</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Пометка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>Разрешения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Игроки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation type="unfinished"/>
     </message>
@@ -7348,27 +6370,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>Включено</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>Установить тип</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>Установить код</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Полное название</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>Дата релиза</translation>
     </message>
@@ -7376,53 +6398,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7430,12 +6452,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -7443,13 +6465,13 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -7458,58 +6480,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>&amp;Причина отключения:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;Время до отключения (в минутах):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>Отключение сервера</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <source>Enable &amp;sounds</source>
         <translation>Включить &amp;звуки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Current sounds theme:</source>
         <translation>Звуковая тема:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Test system sound engine</source>
         <translation>Протестировать системный звук</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation>Настройки звука</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>Громкости</translation>
     </message>
@@ -7517,48 +6526,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -7566,27 +6575,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
-        <translation>По умолчанию</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>Сервер обновлений версии не отвечает.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Ошибка отклика сервера обновлений версии.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>Сервер обновлений меток не отвечает.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Ошибка отклика сервера обновлений меток.</translation>
     </message>
@@ -7594,17 +6603,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -7612,289 +6621,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>Управление</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>Обновить сооб&amp;щения сервера</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;Отключение сервера</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>&amp;Обновить конфигурацию</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Функции администрирования сервера</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>&amp;Разблокировать функции</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>&amp;Заблокировать функции</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation>Информация о карте</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>Колода</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>Фильтры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>Видимый</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>Плавающий</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
         <translation>Сбросить слой</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Колода: %1</translation>
     </message>
@@ -7902,55 +6788,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7958,22 +6857,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7981,139 +6880,139 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>Локальная файловая система</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Хранилище колод на сервере</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Открыть колоду в редакторе</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Загрузить колоду в хранилище</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Загрузить колоду из хранилища</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>Новая папка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Введите название колоды</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>У этой колоды нет названия.
 Пожалуйста, введите имя:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Безымянная колода</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>Удалить файл</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>Название новой папки:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8121,17 +7020,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8139,7 +7038,7 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8147,391 +7046,407 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation>Полоса прокрутки записи</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>&amp;Фазы</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>&amp;Игра</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <source>Next &amp;phase</source>
         <translation>Следующая &amp;фаза</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <source>Next &amp;turn</source>
         <translation>Следующий &amp;ход</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="236"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <source>Game &amp;information</source>
         <translation>Информация &amp;об игре</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation>&amp;Сдаться...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <source>&amp;Leave game</source>
         <translation>Покинуть и&amp;гру</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <source>&amp;Focus Chat</source>
-        <translation>&amp;Установить фокус на чат</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>Ска&amp;зать:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>Видимый</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>Плавающий</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation>Сбросить слой</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>Сдаться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation>Покинуть игру</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation>Кажется, Вы нафлудили. Пожалуйста, подождите пару секунд.</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>игрок покинул игру</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>игрок отсоединился от сервера</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation>причина неизвестна</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>Вы были отключены от игры</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>Логи</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>Время;ИмяОтправителя;IPОтправителя;Сообщение;IDПолучателя;ИмяПолучателя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>Логи Комнаты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>Логи Игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>Логи Чата</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>Вы должны выбрать хотя бы один фильтр</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>Вы должны указать верное количество дней для размещения.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>Имя пользователя:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>IP адрес</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>Имя игры:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>ID Игры:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>Сообщение:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>Основная комната</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>Игровая комната</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>Приватный чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>Последние X Дней:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>Сегодня</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>За последний час</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>Максимальный результат:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>Должен быть как минимум один фильтр.
 Чем больше информации Вы укажете, тем точнее будет результат.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>Получить логи пользователя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>Очистить фильтры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>Фильтры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>Размещение логов</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>Интервал дат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>Максимальный результат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>История сообщений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>Не удалось собрать историю сообщений.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Нет сообщений для указанных фильтров.</translation>
     </message>
@@ -8539,37 +7454,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>Приватный чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;Покинуть</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Приватный чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>Это пользователь добавил Вас в игнор-лист и не видит ваши сообщения в главном чате, а Вы не можете присоединяться к созданным им (ею) играм.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>Личное сообщение от</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 отключился.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 зашел на сервер.</translation>
     </message>
@@ -8577,185 +7492,105 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>Локальная файловая система</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>Хранилище записей игр на сервере</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>Посмотреть повтор</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>Скачать запись игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>Переключить блокировку срока</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>Удалить локальный файл</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>Удалить запись игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -8763,47 +7598,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;Сказать:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;Комната</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Покинуть комнату</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>&amp; Обновить чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>Установки чата</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation>упомянул(а) Вас.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>Нажмите для просмотра</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>Кажется, Вы нафлудили. Пожалуйста, подождите пару секунд.</translation>
     </message>
@@ -8811,35 +7646,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -8847,97 +7682,87 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>Вы уверены?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>У вас все еще есть активные игры. Уверены, что хотите выйти?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>Неопознанное событие</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8948,38 +7773,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 Чтобы обновить клиент, перейдите в Справка-&gt; Проверка обновлений.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation>Исчерпано время бездействия</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Вы были отключены из-за отсутствия активности.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>Повышение</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>Предупрежден</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>Вы получили предупреждение по причине %1. Пожалуйста, воздержитесь от подобных действий, иначе в ваш адрес будут применены дальнейшие меры. При возникновении каких-либо вопросов напишите личное сообщение любому модератору.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>Вы получили сообщение от сервера.
@@ -8989,12 +7814,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -9002,13 +7822,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>Невозможно проанализировать колоду</translation>
     </message>
@@ -9016,13 +7836,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"/>
@@ -9031,42 +7851,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -9074,7 +7894,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>Невозможно открыть файл для чтения.</translation>
     </message>
@@ -9082,206 +7902,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>&amp;Детали пользователя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>&amp;Приватный чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Показать &amp;игры этого пользователя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>Добавить в &amp;список друзей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Удалить из &amp;списка друзей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>Добавить в &amp;игнор-лист</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Удалить из &amp;игнор-листа</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>Выкинуть из &amp;игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>Дать предупреждение пользователю</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Просмотреть &amp;историю предупреждений пользователя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>Забанить на &amp;сервере</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Просмотреть &amp;историю банов пользователя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Повысить пользователя до модератора</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>&amp;Разжаловать пользователя из модератора</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <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 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 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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>Игры %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>История банов</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>ВремяБана;Модератор;ПродолжительностьБана;ПричинаБана;ВидимаяПричина</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>Пользователя никогда не банили.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>История предупреждений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>ВремяПредупреждения;Модератор;ИмяПольозователя;Причина</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>Пользователя никогда не предупреждали.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>Успешно</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>Пользователь успешно повышен.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>Пользователь успешно понижен.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>Не удалось</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>Не удалось повысить пользователя.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>Не удалось понизить пользователя.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -9289,173 +8087,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Местонахождение:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>Возраст учетной записи:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>Редактировать</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>Сменить пароль</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>Сменить аватар</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Администратор</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>Модератор</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Зарегистрированный пользователь</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Рандом</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>Неизвестный</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>Информация о пользователе обновлена.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>Этот сервер не позволяет обновить пользовательскую информацию.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>Пароль изменен.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>Этот сервер не позволяет Вам сменить пароль.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>Новый пароль слишком короткий.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>Предыдущий пароль неверен.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>Аватар изменен.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Этот сервер не позволяет Вам изменить аватар.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>При изменении аватара произошла ошибка.</translation>
     </message>
@@ -9463,394 +8261,224 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <source>General interface settings</source>
         <translation>Основные настройки интерфейса</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <source>&amp;Clicking plays all selected cards (instead of just the clicked card)</source>
-        <translation>&amp;Клик для разыгрывания всех выбранных карт (вместо только выбранной)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <source>Do not delete &amp;arrows inside of subphases</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="877"/>
+        <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="965"/>
-        <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <source>Use tear-off menus, allowing right click menus to persist on screen</source>
-        <translation>Разрешить закрепление контекстных меню на экране</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <source>Enable notifications in taskbar</source>
         <translation>Включить оповещения в панели задач.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <source>Notify in the taskbar when users in your buddy list connect</source>
-        <translation>Уведомлять при заходе в игру друга</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation>Настройки анимации</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <source>Deck editor/storage settings</source>
-        <translation>Редактор колод/Настройки хранилища</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="888"/>
         <source>Open deck in new tab by default</source>
-        <translation>Открывать колоду в новой вкладке</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="889"/>
         <source>Use visual deck storage in game lobby</source>
-        <translation>Использовать графическое представление карт в лобби игры</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="890"/>
         <source>Use selection animation for Visual Deck Storage</source>
-        <translation>Использовать анимацию при выборе карты в графическом хранилище</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <source>always convert to .cod</source>
-        <translation>всегда конвертировать в .cod</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
-        <translation>Время отката назад при нажатии шортката</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation>Добавить по одному каждого жетона</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9858,27 +8486,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9886,7 +8514,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/client/ui/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 +8522,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9914,37 +8542,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9952,93 +8570,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10046,25 +8616,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10072,52 +8663,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10125,7 +8711,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10133,22 +8719,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10156,17 +8742,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10174,43 +8760,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>Какое предупреждение Вы бы хотели отправить?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отменить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>Дать предупреждение пользователю за проступок</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>Поле не может быть пустым. Пожалуйста, уточните имя пользователя для выдачи предупреждения.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>Поле предупреждения не может быть пустым. Пожалуйста, выберите корректную причину.</translation>
     </message>
@@ -10218,133 +8804,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Enable all sets</source>
         <translation>Включить все издания</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="113"/>
         <source>Disable all sets</source>
         <translation>Отключить все издания</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation>Редактор колод</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <source>How to use custom card art</source>
-        <translation>Как использовать кастомный арт для карты</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10352,72 +8938,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>просмотр вразнобой</translation>
     </message>
@@ -10425,7 +9011,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Русский (Russian)</translation>
     </message>
@@ -10433,12 +9019,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -10446,1060 +9032,993 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>Главное окно</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>Редактор колоды</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>Вкладка игры</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
-        <translation>Жетоны на картах</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
-        <translation>Жетоны игрока</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Сила и Выносливость</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Игровые фазы</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>Игровое поле</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Процесс игры</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
-        <translation>Чат</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>Прервать подключение</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>На весь экран</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
-        <translation>Добавить зелёный жетон</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
-        <translation>Удалить зелёный жетон</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
-        <translation>Установить зелёные жетоны</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
-        <translation>Добавить красный жетон</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
-        <translation>Убрать красный жетон</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
-        <translation>Установить кол-во красных жетонов...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
-        <translation>Добавить 1 ед. жизни</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
-        <translation>Добавить жетон (F)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
-        <translation>Удалить жетон (F)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
-        <translation>Установить жетоны (F)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
-        <translation>Добавить жетон (E)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
-        <translation>Удалить жетон (E)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
-        <translation>Установить жетоны (E)...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
-        <translation>Добавить жетон(D)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
-        <translation>Удалить жетон (D)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
-        <translation>Установить жетоны (D)...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
-        <translation>Добавить жетон (C)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
-        <translation>Удалить жетон (C)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
-        <translation>Установить жетоны (C)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
-        <translation>Добавить жетон (B)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
-        <translation>Удалить жетон (B)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
-        <translation>Установить жетоны (B)...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
-        <translation>Добавить жетон (A)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
-        <translation>Удалить жетон (A)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
-        <translation>Установить жетоны (A)...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
-        <translation>Убрать 1 ед. жизни</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
-        <translation>Установить кол-во жизней</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
-        <translation>Добавить белый жетон</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
-        <translation>Убрать белый жетон</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
-        <translation>Установить белые жетоны...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
-        <translation>Добавить синий жетон</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
-        <translation>Убрать синие жетоны</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
-        <translation>Установить синие жетоны...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
-        <translation>Добавить черные жетон</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
-        <translation>Удалить черные жетон</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
-        <translation>Установить черные жетоны...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
-        <translation>Добавить бесцветные жетон</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
-        <translation>Удалить бесцветные жетон</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
-        <translation>Установить бесцветные жетоны</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
-        <translation>Добавить другие жетоны</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
-        <translation>Удалить другие жетоны</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
-        <translation>Установить другие жетоны...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation>Добавить по одному каждого жетона</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>Шаг разворота</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>Шаг поддержки</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>Шаг взятия карты</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>Атака</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>Блок</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>Повреждения</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>Конец хода</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation>Повернуть / развернуть карту</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Библиотека</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>Сайдборд</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
-        <translation>Взять карту с низа библиотеки</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <source>Draw Multiple Cards from Bottom...</source>
-        <translation>Взять несколько карт с низа библиотеки...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>Сдаться</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>Муллиган</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
-        <translation>Взять карту</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
-        <translation>Взять несколько карт</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
-        <translation>Всегда показывать верхнюю карту</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
-        <translation>Всегда смотреть верхнюю карту</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
-        <translation>Убрать фокус с окна ввода</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
-        <translation>Установить фокус на чат</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
-        <translation>Очистить чат</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
-        <translation>Обновить</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
-        <translation>Логи</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/cockatrice/translations/cockatrice_sr.ts b/cockatrice/translations/cockatrice_sr.ts
index c04d16f16..6dff57b0f 100644
--- a/cockatrice/translations/cockatrice_sr.ts
+++ b/cockatrice/translations/cockatrice_sr.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>Podesi brojač...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>Podesi brojač</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nova vrednost za brojač &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,81 +36,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -118,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -131,312 +129,251 @@ 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"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <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/dialogs/dlg_settings.cpp" line="657"/>
         <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/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>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/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
         <translation>Raspored ruke</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <source>Enable left justification</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <source>Table grid layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="692"/>
         <source>Invert vertical coordinate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>zabrani ime igrača</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>zabrani IP adresa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>zabranite ID klijenta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Tip zabrane</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>stalna zabrana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>privremena zabrana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>Dani:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>Sati:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>Minuti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Dužina trajanja zabrane</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Molimo Vas ukucajte razlog zabrane.
 Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene osobe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Molimo Vas ukucajte razlog zabrane koji će biti vidljiv zabranjenoj osobi.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>U redu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Zabranite ulaz korisniku u server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
@@ -444,22 +381,22 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -467,32 +404,32 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Setovi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Cena mane</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Tip karte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Boja (boje)</translation>
     </message>
@@ -500,101 +437,96 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -602,22 +534,22 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +557,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -648,294 +580,172 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>Pomeri na</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>Moć / Izdržljivost</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>njihova ruka</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>Ruka od %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <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/card_zone.cpp" line="68"/>
         <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/card_zone.cpp" line="70"/>
         <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/card_zone.cpp" line="71"/>
         <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="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="76"/>
         <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/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="78"/>
         <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/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>njihovo groblje</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>groblje od %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>njihovo izgnanstvo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>izgnanstvo od %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <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/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -944,7 +754,7 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -952,60 +762,15 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1013,47 +778,47 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,97 +826,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +914,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1177,114 +932,109 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1042,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,227 +1050,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>Broj</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Karta</translation>
     </message>
@@ -1528,12 +1245,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,17 +1258,17 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,7 +1276,7 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,62 +1284,62 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,166 +1347,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>Odgovor od servera nije mogao biti parsovan.</translation>
     </message>
@@ -1813,58 +1472,54 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1872,19 +1527,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1892,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Novi Domaćin</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>Domaćin:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>Ime igrača:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>Lozinka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>Sačuvajte lozinku:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>Automatsko povezivanje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Automatski se poveži na najskoriju prijavu kada se Cockatrice otvori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Prijava</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Upozorenje o povezivanju</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Ime igrača ne može biti prazno.</translation>
     </message>
@@ -2041,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Za&amp;pamti podešavanja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>Igrači:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Tip igre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>Lozinka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Samo prijatelji mogu da se pridruže</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Samo &amp;registrovani korisnici mogu da se pridruže</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Ograničenja pridruživanja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>Posmatrači mogu da gledaju</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Posmatračima &amp;je potrebna lozinka da gledaju</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Posmatrači mogu &amp;da ćaskaju</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Posmatrači mogu da &amp;vide ruke </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Posmatrači</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>Očisti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Započni igru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Informacije o igri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Greška servera.</translation>
     </message>
@@ -2164,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Žeton</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>Boja:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>belo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>plavo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>crno</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>crveno</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>zeleno</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>višebojno</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>bezbojno</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>M/I:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>Anotacija:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>Uništi token kada napusti sto</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Podaci o tokenima</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Prikaži sve tokene</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Prikaži tokene iz ovog špila</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Izaberi token iz liste</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Napravi token</translation>
     </message>
@@ -2262,53 +1907,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2316,40 +1961,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Slika nije izabrana.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Da promenite svoj avatar, izaberite novu sliku
 Da izbrišete vaš sadašnji avatar, potvrdite bez biranja nove slike.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Pretraži...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Promeni avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Otvori sliku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Fajlovi Slika (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Neispravna slika izabrana.</translation>
     </message>
@@ -2357,17 +2002,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2375,38 +2020,38 @@ Da izbrišete vaš sadašnji avatar, potvrdite bez biranja nove slike.</translat
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Stara lozinka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nova lozinka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Potvrdi novu lozinku:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Promeni lozinku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Nove lozinke se ne podudaraju</translation>
     </message>
@@ -2414,93 +2059,93 @@ Da izbrišete vaš sadašnji avatar, potvrdite bez biranja nove slike.</translat
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>Boja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>belo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>plavo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>crno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>crveno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>zeleno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>višebojno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>bezbojno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>M/I:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>Anotacija:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Podaci o tokenima</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Dodaj token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Uklonite token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Molim Vas, ukucajte ime tokena:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation type="unfinished"/>
@@ -2509,27 +2154,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>I-mejl:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Država:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Neodređeno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Pravo ime:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Promenite korisnički profil</translation>
     </message>
@@ -2537,143 +2182,137 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>Opis igre:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>Ime kreatora:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>Tipovi igara</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>barem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>najviše:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Maksimalni broj igrača</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>Ograničenja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Filtriraj igre</translation>
     </message>
@@ -2681,52 +2320,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2734,37 +2373,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2772,86 +2411,86 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation type="unfinished"/>
     </message>
@@ -2859,7 +2498,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -2867,146 +2506,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Učitaj špil</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3014,91 +2570,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>Domaćin:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>Ime igrača:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>Lozinka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Lozinka (ponovo):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>I-mejl:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>I-mejl (ponovo):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Država:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Neodređeno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Pravo ime:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Registruj se na server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Upozorenje o registraciji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Vaše lozinke se ne podudaraju, molim Vas, pokušajte ponovo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Vaše i-mejl adrese se ne podudaraju, molimo Vas, pokušajte ponovo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Ime igrača ne može biti prazno.</translation>
     </message>
@@ -3106,17 +2662,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -3124,55 +2680,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3183,7 +2724,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3194,7 +2735,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2744,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/dialogs/dlg_settings.cpp" line="1819"/>
         <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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3219,7 +2760,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3228,59 +2769,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Podešavanja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Opšto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Izgled</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <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/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Ćaskanje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Zvuk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Prečice</translation>
     </message>
@@ -3288,39 +2829,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3328,17 +2869,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
@@ -3346,164 +2887,168 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Otvori Stranicu Za Preuzimanje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Provera za ažuriranja...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Greška Ažuriranja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Instalacija...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3511,162 +3056,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3674,47 +3087,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3722,44 +3135,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3767,7 +3174,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation type="unfinished"/>
     </message>
@@ -3775,325 +3182,244 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Pogrešna lozinka.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Posmatrači nisu dozvoljeni u ovoj igri.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>Igra je već puna.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>Ova igra više ne postoji.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Ova igra je samo otvorena za registrovane korisnike.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Ova igra je samo otvorena za prijatelje njenog kreatora.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Vi ste ignorisani od strane kreatore ove igre.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Pridruži se igri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Lozinka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>Filtriraj igre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>Očisti filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>Kreiraj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>Pridruži se</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>Pridruži se kao posmatrač</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Igre</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>lozinka</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>samo prijatelji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>samo reg. korisnici</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>može da ćaska</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>vidi ruke</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>može da vidi ruke</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>nije dozvoljeno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Soba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Starost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Kreator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Tip</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Ograničenja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Igrači</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Posmatrači</translation>
     </message>
@@ -4101,1281 +3427,887 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Zabranjen od strane moderatora</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Nevažeće korisničko ime.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Povezanost prekinuta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Uspeh</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
         <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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,862 +4315,668 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/server/message_log_widget.cpp" line="160"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/server/message_log_widget.cpp" line="176"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="179"/>
+        <location filename="src/server/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="184"/>
+        <location filename="src/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="305"/>
         <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <source>%1 exiles %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/server/message_log_widget.cpp" line="710"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/server/message_log_widget.cpp" line="726"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -6246,206 +4984,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1451"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1452"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -6453,17 +5148,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -6471,62 +5166,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -6534,57 +5229,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation type="unfinished"/>
     </message>
@@ -6592,213 +5287,703 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal 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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
-        <source>View bottom cards of library</source>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
-        <source>Shuffle top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
-        <source>Shuffle bottom cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <source>(max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change power/toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change stats to:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
-        <source>Set annotation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
-        <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
-        <source>Set counters</source>
-        <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/player.cpp" line="769"/>
         <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/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
         <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>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</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/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <source>View bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <source>Shuffle top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1276"/>
+        <source>Shuffle bottom cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <source>Which position should this card be placed:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3188"/>
+        <source>(max. %1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change power/toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
+        <source>Change stats to:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3653"/>
+        <source>Set annotation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3654"/>
+        <source>Please enter the new annotation:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Set counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</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/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6806,7 +5991,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"/>
     </message>
@@ -6814,17 +5999,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6832,132 +6017,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6965,162 +6084,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -7128,17 +6220,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation type="unfinished"/>
     </message>
@@ -7146,149 +6238,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SayMenu</name>
-    <message>
-        <location filename="src/game/player/menu/say_menu.cpp" line="16"/>
-        <source>S&amp;ay</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SequenceEdit</name>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation type="unfinished"/>
     </message>
@@ -7296,27 +6342,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -7324,53 +6370,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7378,12 +6424,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -7391,13 +6437,13 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -7406,58 +6452,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -7465,48 +6498,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -7514,27 +6547,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -7542,17 +6575,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -7560,289 +6593,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7850,55 +6760,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7906,22 +6829,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7929,138 +6852,138 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="175"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8068,17 +6991,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8086,7 +7009,7 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8094,390 +7017,406 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <source>Next &amp;phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <source>Next &amp;turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="236"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
-        <source>You have been kicked out of the game.</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
+        <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -8485,37 +7424,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation type="unfinished"/>
     </message>
@@ -8523,185 +7462,105 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -8709,47 +7568,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation type="unfinished"/>
     </message>
@@ -8757,35 +7616,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -8793,97 +7652,87 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8891,38 +7740,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"/>
@@ -8931,12 +7780,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -8944,13 +7788,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation type="unfinished"/>
     </message>
@@ -8958,13 +7802,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"/>
@@ -8973,42 +7817,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -9016,7 +7860,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
@@ -9024,206 +7868,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <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 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 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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -9231,173 +8053,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation type="unfinished"/>
     </message>
@@ -9405,152 +8227,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <source>General interface settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9558,241 +8365,86 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9800,27 +8452,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9828,7 +8480,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/client/ui/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 +8488,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9856,37 +8508,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9894,93 +8536,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -9988,25 +8582,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10014,52 +8629,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10067,7 +8677,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10075,22 +8685,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10098,17 +8708,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10116,43 +8726,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>U redu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"/>
     </message>
@@ -10160,133 +8770,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10294,72 +8904,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -10367,7 +8977,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Srpski (Serbian)</translation>
     </message>
@@ -10375,12 +8985,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -10388,1058 +8998,991 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>Moć i Izdržljivost</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>Faze Igre</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>Izađite</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>Ceo ekran</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>Zatvorite</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>Izvlačenje</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>Napad</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>Kraj</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Špil</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_sv.ts b/cockatrice/translations/cockatrice_sv.ts
index 376b9fe5f..d7fb41fc1 100644
--- a/cockatrice/translations/cockatrice_sv.ts
+++ b/cockatrice/translations/cockatrice_sv.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Placera polett...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation type="unfinished"/>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,81 +36,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -118,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -131,312 +129,251 @@ 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"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>Temainställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>Aktuellt tema:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>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/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation>Kortrendering</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
         <translation>Handlayout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <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/dialogs/dlg_settings.cpp" line="691"/>
         <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/dialogs/dlg_settings.cpp" line="692"/>
         <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/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximal teckenstorlek för information som visas på kort:</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>bannlys användar&amp;namn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>bannlys &amp;IP address</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>förbjuda klienten I &amp; D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>Typ av bannlysning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;permanent bannlysning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;temporär bannlysning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dagar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Timmar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minuter:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>Bannlysningens längd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Vänligen ange anledningen till bannlysningen.
 Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Vänligen ange en anledning för bannlysningen som kommer att visas för den bannlysta personen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Avbryt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>Bannlys användaren från servern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>Du måste välja en namnbaserad, IP-baserad, clientId-baserad eller en kombination av de tre för att lägga ett förbud.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>Du måste ha ett värde i namnförbudet när du markerar kryssrutan för namnförbud.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>Du måste ha ett värde i ip-förbudet när du markerar kryssrutan ip-banan.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>Du måste ha ett värde i clientidförbudet när du markerar kryssrutan för klientidförbud.</translation>
     </message>
@@ -444,22 +381,22 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>Inget svar mottaget från uppdateringsservern.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Ogiltigt svar mottaget från uppdateringsserveren.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>Inget svar mottaget från filuppdateringsservern.</translation>
     </message>
@@ -467,32 +404,32 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>Utgåvor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>Manakostnad</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>Korttyp</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>Färg(er)</translation>
     </message>
@@ -500,101 +437,96 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>OCH</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>ELLER</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>OCH INTE</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>ELLER INTE</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>Färg</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>Manakostnad</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>Raritet</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>Styrka</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>Lojalitet</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -602,22 +534,22 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +557,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -648,294 +580,172 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>Fl&amp;ytta till</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>Po&amp;wer / toughness</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>Deras hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1s hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>Deras lek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1s bibliotek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>av deras lek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>av %1s %1s bibliotek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>Deras lek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1s %1s bibliotek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>deras lek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>%1s lek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>deras lek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1s lek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>deras gravhög</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1s gravhög</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>deras exil</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1s exil</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>deras skänk</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <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"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>deras skänk</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <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/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -944,7 +754,7 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -952,60 +762,15 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1013,47 +778,47 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,97 +826,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +914,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1177,114 +932,109 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1042,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,227 +1050,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>Uppdaterar ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <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/dialogs/dlg_settings.cpp" line="1205"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <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/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Plats:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>Senaste ändring</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <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/dialogs/dlg_settings.cpp" line="1216"/>
         <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/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>Kort</translation>
     </message>
@@ -1528,12 +1245,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,17 +1258,17 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,7 +1276,7 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,62 +1284,62 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,166 +1347,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>Svaret från servern kunde inte tolkas.</translation>
     </message>
@@ -1813,58 +1472,54 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</source>
         <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="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1872,19 +1527,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1892,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>Hämtar ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>Kända värdar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Uppdatera servern listan med kända offentliga servrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>Ny värd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;Värd:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>Spelar&amp;namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>&amp;Lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;Spara lösenord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>Anslut automatiskt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Koppla automatiskt till den senaste inloggningen när Cockatrice öppnas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>Om du har problem med att ansluta eller registrera kontaktar du serverns personal för hjälp!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>Webbsida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>&amp;Ansluta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>Logga in</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>Serverkontakt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>Anslut till servern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>Server webbadress</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>Unikt servernamn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>Anslutningsvarning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>Du måste ange din nya anslutningsprofil.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>Anslutningsvarning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Fältet för spelarnamn kan inte lämnas tomt.</translation>
     </message>
@@ -2041,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>Kom ihåg inställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;Beskrivning:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>&amp;Spelare:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>Allmän</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>Speltyp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;Lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>Endast &amp;vänner kan ansluta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>Endast &amp;registerade användare kan ansluta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>Anslutingsbegränsningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>Åskådare tillåtna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>Åskådare behöver lösenord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>Åskådare kan &amp;chatta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>Åskådare kan se spelares händer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>Åskådare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>Tydlig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>Skapa spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>Spelinformation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>Serverfel.</translation>
     </message>
@@ -2164,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Namn:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Jetong</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Färg:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>vit</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>blå</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>svart</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>röd</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>grön</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multifärgad</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>färglös</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotering:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Förstör jetong när den lämnar bordet</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Jetongdata</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Visa alla &amp;jetonger</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Visa jetonger från denna &amp;lek</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>Välj jetong från lista</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>Skapa jetong</translation>
     </message>
@@ -2262,53 +1907,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2316,40 +1961,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>Ingen bild vald.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>För att ändra din avatar, välj en ny bild.
 För att radera din nuvarande avatar, klicka &quot;bekräfta&quot; utan att välja en ny bild.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>Leta...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>Ändra avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>Öppna bild</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Bildfiler (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>Ogiltigt val av bild.</translation>
     </message>
@@ -2357,17 +2002,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2375,38 +2020,38 @@ För att radera din nuvarande avatar, klicka &quot;bekräfta&quot; utan att väl
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Ditt gamla lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nytt lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Bekräfta ditt nya lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Ändra lösenord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Dina nya lösenord matchar inte.</translation>
     </message>
@@ -2414,93 +2059,93 @@ För att radera din nuvarande avatar, klicka &quot;bekräfta&quot; utan att väl
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;Namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Färg:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>vit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>blå</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>svart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>röd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>grön</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>multifärgad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>färglös</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotering:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>Jetongdata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>Lägg till jetong</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>Ta bort jetong</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>Vänligen ange namnet på jetongen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>Det valda namnet står i konflikt med ett befintligt kort eller token.
@@ -2510,27 +2155,27 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>E-post:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>Land:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>Odefinierat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Riktiga namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Justera användarprofil</translation>
     </message>
@@ -2538,143 +2183,137 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>Spel&amp;beskrivning:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>S&amp;kaparens namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>&amp;Speltyper</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>&amp;Minst:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>M&amp;ax:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>Maximalt antal spelare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>begränsningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>Filtrera spel</translation>
     </message>
@@ -2682,52 +2321,52 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;Värd:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;Hamn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>E-post:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>E-postadressen kan inte vara tom.</translation>
     </message>
@@ -2735,37 +2374,37 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;Värd:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;Hamn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Spelarens namn kan inte vara tomt.</translation>
     </message>
@@ -2773,86 +2412,86 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;Värd:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;Hamn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>Tecken:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>Nytt lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Spelarens namn kan inte vara tomt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>Token kan inte vara tomt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>Det nya lösenordet kan inte vara tomt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>Lösenorden stämmer inte överens.</translation>
     </message>
@@ -2860,7 +2499,7 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -2868,146 +2507,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>Ogiltig leklista.</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>Ladda lek</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -3015,91 +2571,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>Värd:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>Spelarnamn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>Lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>Lösenord (igen):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>E-post:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>E-post (igen):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>Land:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>Odefinierad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>Riktiga namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>Registrera på server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>Registreringsvarning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Dina lösenord matchar inte, var god försök igen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Dina e-postadresser matchar inte, var god försök igen. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Fältet för spelarnamn kan inte lämnas tomt.</translation>
     </message>
@@ -3107,17 +2663,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -3125,55 +2681,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3190,7 +2731,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3207,7 +2748,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2757,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3225,7 +2766,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3234,7 +2775,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3243,59 +2784,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>Utseende</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>Gränssnitt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>Chatt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>Ljud</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>Genvägar</translation>
     </message>
@@ -3303,39 +2844,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3343,17 +2884,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>Nästa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>Tidigare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>Dagens Tips</translation>
     </message>
@@ -3361,165 +2902,169 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>Nuvarande släppkanal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>Installera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>Avbryt Ladda ner</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>Öppna nedladdningssidan</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>Cockatrice byggdes inte med SSL-stöd, därför kan du inte ladda ner uppdateringar automatiskt!
 Besök sidan för nedladdning för att uppdatera manuellt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>Letar efter nya uppdateringar...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>Slutfört efter uppdateringar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>Ingen uppdatering tillgänglig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatris är aktuell!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>Du kör redan den senaste versionen i den valda utgåvan.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>Aktuell version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>Vald utgivningskanal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>Uppdatering tillgänglig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>En ny version av Cockatrice är tillgänglig!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>Ny version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>Släppte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>Ändringslogg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>Vill du uppdatera nu?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>Uppdateringsfel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Ett fel uppstod när du letade efter uppdateringar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Ett fel uppstod när du hämtade en uppdatering:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>Installerar...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice kan inte öppna installatören.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>Försök att uppdatera manuellt genom att stänga Cockatrice och köra installationsprogrammet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>Hämta plats</translation>
     </message>
@@ -3527,162 +3072,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Tydlig logg vid stängning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Felsökningslogg</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3690,47 +3103,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3738,44 +3151,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3783,7 +3190,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>Skriv ditt filter här</translation>
     </message>
@@ -3791,325 +3198,244 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>Vänligen anslut till det lämpliga rummet först.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>Fel lösenord.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Åskådare är ej tillåtna i detta spelet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>Spelet är redan fullt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>Det här spelet finns inte längre.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>Det här spelet är bara öppet för registrerade användare.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Det här spelet är bara öppet för skaparens vänner.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Spelets skapare ignorerar dig.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>Anslut till spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>Lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>Vänligen anslut till respektive rum först.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>Specificera speltyp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>Rensa filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>Skapa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>Anslut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>Anslut som &amp;åskådare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>Spel</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>lösenord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>endast vänner</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>endast reg. användare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>kan chatta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>visa händer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>Tillåts se händer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>ej tillåtna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>Rum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>Ålder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>Skapare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>Begränsningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>Spelare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>Åskådare</translation>
     </message>
@@ -4117,609 +3443,205 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>Servern har nått sin maximala kapacitet för användare, var god försök igen vid ett senare tillfälle.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>Din adress har för många uppkopplingar samtidigt.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>Bannlyst av moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>Förväntad sluttid: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>Denna bannlysning varar för evigt.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>Schemalagd serverstängning.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>Ogiltigt användarnamn.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>Du loggades ut på grund av att du loggade in via en annan plats.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>Uppkoppling avslutad</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>Servern har avslutat din uppkoppling.
 Anledning: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
@@ -4730,1544 +3652,1357 @@ Alla pågående spel kommer att gå förlorade.
 Anledning till nedstängning: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>Schemalagd serverstängning</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>Framgång</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>Registrering lyckad.
 Inloggning påbörjad.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>Aktivering tillåten.
 Inloggning påbörjad.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>Antal spelare</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>Vänligen ange antal spelare.</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>Spelare %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>Ladda repris</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>Om Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>Projektledare:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>Tidigare projektledare:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>utvecklare:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>Våra utvecklare</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>Översättare:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>Server timeout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Det finns redan en aktiv session med det användarnamnet.
 Vänligen stäng den sessionen först och försök igen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>Du är bannlyst till %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>Du är bannlyst för evigt.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>Okänt inloggningsfel: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>Socketfel: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>Du försöker koppla upp dig till en föråldrad server. Vänligen nergradera din version av Cockatrice eller koppla upp dig till en lämplig server.
 Lokal version är %1, avlägsen version är %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>Din version av Cockatrice är föråldrad. Vänligen uppdatera din version av Cockatrice.
 Lokal version är %1, avlägsen version är %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>Ansluter till %1...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>Frånkopplad</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>Uppkopplad, loggar in hos %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Begär att få glömt lösenord skickat till %1 som %2</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Anslut...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Frånkoppla</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>Starta &amp;lokalt spel...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Titta på repris...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Fullskärmsläge</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Inställningar...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>A&amp;vsluta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
-        <translation>&amp;Hantera utgåvor...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
-        <translation>Redigera egna &amp;tokens...</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Om Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
         <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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <source>This server supports additional features that your client doesn't have.
 This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
 To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>Den här servern stöder funktioner din version av Cockatrice inte har.
-Det  behöver inte innebära problem men det kan vara ett tecken på att det finns en ny version av Cockatrice tillgänglig eller att servern kör en anpassad eller förhandsutgiven version.
-
-För att uppdatera din klient, gå till Hjälp -&gt; Leta efter uppdateringar.</translation>
+        <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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
-        <translation>Ladda utgåvor/kort</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <source>Selected file cannot be found.</source>
-        <translation>Den valda filen kunde inte laddas.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1448"/>
+        <location filename="src/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <source>Sets/cards failed to import.</source>
-        <translation>Det gick inte att importera utgåvor/kort.</translation>
+        <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
+        <location filename="src/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="137"/>
+        <location filename="src/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
-        <translation>%1 har ångrat att ge upp spelet.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
+        <location filename="src/server/message_log_widget.cpp" line="160"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
+        <location filename="src/server/message_log_widget.cpp" line="176"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="179"/>
+        <location filename="src/server/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="184"/>
+        <location filename="src/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
+        <location filename="src/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>ett kort</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="305"/>
         <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 sätter %2%3 i exil.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
+        <location filename="src/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <source>%1 turns %2 face-down.</source>
-        <translation>%1 vänder %2 nedåt.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
+        <location filename="src/server/message_log_widget.cpp" line="380"/>
         <source>%1 turns %2 face-up.</source>
-        <translation>%1 vänder %2 uppåt.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
+        <location filename="src/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <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"/>
-        <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/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
-        <translation>%1 blandar sin lek och drar en ny hand.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="476"/>
+        <location filename="src/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
-        <translation>kort</translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
+        <location filename="src/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
+        <location filename="src/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
+        <location filename="src/server/message_log_widget.cpp" line="710"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
+        <location filename="src/server/message_log_widget.cpp" line="726"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
+        <location filename="src/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
+        <location filename="src/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -6275,206 +5010,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>Meddelande:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1451"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1452"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1453"/>
         <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/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -6482,17 +5174,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation type="unfinished"/>
     </message>
@@ -6500,62 +5192,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -6563,57 +5255,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>Slutsteget</translation>
     </message>
@@ -6621,213 +5313,703 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal 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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <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.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>&amp;Titta på kyrkogård</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>&amp;Titta på exil</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>Spelare &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;Kyrkogård</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;Exil</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;Hand</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>&amp;Titta på leken</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>Titta på de &amp;översta korten i leken...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>&amp;Avslöja alltid det översta kortet</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>&amp;Titta på sidbrädan</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;Dra kort</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>D&amp;ra kort...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>&amp;Ångra senaste drag</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>&amp;Mulligan</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>Flytta översta korten till &amp;kyrkogården...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>Flytta översta korten till &amp;exil...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>Placera översta kortet &amp;underst</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>S&amp;idbräda</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;Lek</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>&amp;Poletter</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>Tappa upp alla perma&amp;nenta kort</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>Rulla t&amp;ärning...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>&amp;Skapa jetong...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>S&amp;kapa en till jetong</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>Skapa fördefinierad &amp;jetong</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>A&amp;lla spelare</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>S&amp;äg</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Spela</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>&amp;Göm</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>Växla &amp;normal upptappning</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>Kika på kort&amp;framsida</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>&amp;Klona</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>&amp;Fäst på kort...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>Se&amp;parera</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>&amp;Rita pil...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>&amp;Öka power</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>&amp;Minska power</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>Öka toug&amp;hness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>Minska t&amp;oughness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>Öka power o&amp;ch toughness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>M&amp;inska power och toughness</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>An&amp;ge power och toughness...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>Ang&amp;e annotering...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation>X kort från toppen av biblioteket...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>Titta på de översta korten i leken</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
         <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.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <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.cpp" line="3188"/>
         <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.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>Dra kort</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>Antal:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>Flytta översta korten till kyrkogården</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>Flytta översta korten till exil</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation>Lägg kort X kort från toppen av biblioteket</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <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.cpp" line="3534"/>
         <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.cpp" line="3653"/>
         <source>Set annotation</source>
-        <translation type="unfinished"/>
+        <translation>Ange annotering</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player.cpp" line="3654"/>
         <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
+        <translation>Vänligen ange den nya annoteringen:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <source>Set counters</source>
-        <translation type="unfinished"/>
+        <translation>Placera poletter</translation>
     </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <source>&amp;Counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingDisabledInfoWidget</name>
-    <message>
-        <location filename="src/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>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</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/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</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/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6835,7 +6017,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation type="unfinished"/>
     </message>
@@ -6843,17 +6025,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6861,132 +6043,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6994,162 +6110,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>Alla filer (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatricerepriser (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -7157,17 +6246,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>Uppladdningstidpunkt</translation>
     </message>
@@ -7175,149 +6264,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>Spelare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>Behåll</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>Tid startad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>Varaktighet (sek)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>Rum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Anslut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>Rum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>Spelare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation type="unfinished"/>
     </message>
@@ -7325,27 +6368,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>Långt namna</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -7353,53 +6396,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <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/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <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/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -7407,12 +6450,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -7420,13 +6463,13 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -7435,58 +6478,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>Anledning till &amp;nedstängning:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;Tid till nedstängning (minuter):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>Stäng ned server</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1545"/>
         <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/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -7494,48 +6524,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -7543,27 +6573,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
@@ -7571,17 +6601,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -7589,289 +6619,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>&amp;Uppdatera servermeddelande</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;Stäng ned server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>Serveradministrationsfunktioner</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>&amp;Lås upp funktioner</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>Lås &amp;funktioner</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>Lek: %1</translation>
     </message>
@@ -7879,55 +6786,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7935,22 +6855,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7958,138 +6878,138 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>Lokalt filsystem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>Serverns leklagring</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>Öppna i lekredigeraren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>Ladda upp lek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>Ladda ner lek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>Ny mapp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>Radera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>Ange leknamn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>Denna leklista har inget namn. Vänligen ange ett namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>Namnlös lek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>Radera lokal fil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>Namn på den nya mappen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8097,17 +7017,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8115,7 +7035,7 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8123,390 +7043,406 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>&amp;Faser</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>&amp;Spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <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/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <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/client/tabs/tab_game.cpp" line="236"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <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/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <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/client/tabs/tab_game.cpp" line="257"/>
         <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/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>S&amp;äg:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>Ge upp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
-        <source>You have been kicked out of the game.</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
+        <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -8514,37 +7450,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;Lämna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 har lämnat servern.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 har anslutit sig till servern.</translation>
     </message>
@@ -8552,185 +7488,105 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>Lokalt filsystem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>Serverns reprislagring</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>Titta på repris</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>Radera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>Ladda ner repris</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>Växla utgångslås</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>Radera lokal fil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>Radera avlägsen repris</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -8738,47 +7594,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;Säg:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>Chatt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;Rum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Lämna rum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>Du översvämmar chatten. Var vänlig vänta ett par sekunder.</translation>
     </message>
@@ -8786,35 +7642,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -8822,97 +7678,87 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8920,38 +7766,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation>Servern har skickat dig ett meddelande som din klient inte förstår. Det här meddelandet kan betyda att det finns en ny version av Cockatrice tillgänglig eller så kör den här servern en användarinställd eller förhandsutgiven version. För att uppdatera din klient, gå till Hjälp -&gt; Leta efter uppdateringar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Du kommer snart loggas ut på grund av inaktivitet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>Varnad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"/>
@@ -8960,12 +7806,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -8973,13 +7814,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation type="unfinished"/>
     </message>
@@ -8987,13 +7828,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"/>
@@ -9002,42 +7843,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -9045,7 +7886,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
@@ -9053,206 +7894,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>Användar&amp;detaljer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Visa denna användarens &amp;spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>Lägg till som &amp;vän</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Ta bort som &amp;vän</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>&amp;Ignorera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Sluta &amp;ignorera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>&amp;Sparka från spelet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>&amp;Bannlys från servern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <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 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 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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>%1&apos;s spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -9260,173 +8079,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>Plats:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>Administratör</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>Registrerad användare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>Oregistrerad användare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation type="unfinished"/>
     </message>
@@ -9434,152 +8253,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <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/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <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/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation>Animationsinställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -9587,241 +8391,86 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9829,27 +8478,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9857,7 +8506,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/client/ui/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 +8514,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9885,37 +8534,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9923,93 +8562,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10017,25 +8608,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10043,52 +8655,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10096,7 +8703,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10104,22 +8711,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10127,17 +8734,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10145,43 +8752,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"/>
     </message>
@@ -10189,133 +8796,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <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/dialogs/dlg_manage_sets.cpp" line="113"/>
         <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/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -10323,72 +8930,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -10396,7 +9003,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>Svenska (Swedish)</translation>
     </message>
@@ -10404,12 +9011,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -10417,1058 +9024,991 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>Se</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>Gameplay</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <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/settings/shortcuts_settings.h" line="527"/>
         <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/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>Bibliotek</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>Skänk</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <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/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation>Lämna spelet</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>Medge</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation>Kasta tärning</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <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/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <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/settings/shortcuts_settings.h" line="692"/>
         <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/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation>Visuell Leklagring</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation>Leklagring</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation>Administratör</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation>Loggar</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_tr.ts b/cockatrice/translations/cockatrice_tr.ts
index abda268c8..2ea49584a 100644
--- a/cockatrice/translations/cockatrice_tr.ts
+++ b/cockatrice/translations/cockatrice_tr.ts
@@ -2,442 +2,215 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
         <source>&amp;Set counter...</source>
-        <translation>&amp;Sayaç ayarla</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="199"/>
         <source>Set counter</source>
-        <translation>Sayaç ayarla</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>New value for counter &apos;%1&apos;:</source>
-        <translation>&apos;%1&apos; sayacı için yeni değer:</translation>
-    </message>
-</context>
-<context>
-    <name>AbstractDlgDeckTextEdit</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
-        <source>&amp;Refresh</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
-        <source>Parse Set Name and Number (if available)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AbstractTabDeckEditor</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="247"/>
-        <source>Open in new tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
-        <source>Are you sure?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
-        <source>The decklist has been modified.
-Do you want to save the changes?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <source>Could not open deck at %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <source>Could not save remote deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
-        <source>The deck could not be saved.
-Please check that the directory is writable and try again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
-        <source>Save deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <source>The deck could not be saved.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <source>There are no cards in your deck to be exported</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdminNotesDialog</name>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
-        <source>Update Notes</source>
-        <translation>Notları Güncelle</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
-        <source>Admin Notes for %1</source>
-        <translation>%1 için Yönetici Notları</translation>
-    </message>
-</context>
-<context>
-    <name>AllZonesCardAmountWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
-        <source>Mainboard</source>
-        <translation>Ana kart</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
-        <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="408"/>
         <source>Error</source>
-        <translation>Hata</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="408"/>
         <source>Could not create themes directory at &apos;%1&apos;.</source>
-        <translation>&apos;%1&apos; konumunda temalar dizini oluşturulamadı.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="414"/>
         <source>Theme settings</source>
         <translation>Tema ayarları</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="415"/>
         <source>Current theme:</source>
         <translation>Geçerli Tema</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="416"/>
         <source>Open themes folder</source>
-        <translation>Temalar klasörünü aç</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
-        <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Menu settings</source>
-        <translation>Menü ayarları</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <source>Show keyboard shortcuts in right-click menus</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="418"/>
         <source>Card rendering</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="419"/>
         <source>Display card names on cards having a picture</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>Auto-Rotate cards with sideways layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
-        <source>Bump sets that the deck contains cards from to the top in the printing selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="420"/>
         <source>Scale cards on mouse over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Use rounded card corners</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="422"/>
         <source>Minimum overlap percentage of cards on the stack and in vertical hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
-        <source>Maximum initial height for card view window:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
-        <source> rows</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
-        <source>Maximum expanded height for card view window:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
-        <source>Card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
-        <source>Counter %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="424"/>
         <source>Hand layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="425"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Eli yatay göster (Daha fazla yer kaplar)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="426"/>
         <source>Enable left justification</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="428"/>
         <source>Table grid layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="429"/>
         <source>Invert vertical coordinate</source>
         <translation>Dikey koordinatı ters çevir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="430"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="431"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/server/user/user_list.cpp" line="37"/>
         <source>ban &amp;user name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/server/user/user_list.cpp" line="41"/>
         <source>ban &amp;IP address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/server/user/user_list.cpp" line="45"/>
         <source>ban client I&amp;D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list.cpp" line="59"/>
         <source>Ban type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/server/user/user_list.cpp" line="62"/>
         <source>&amp;permanent ban</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/server/user/user_list.cpp" line="63"/>
         <source>&amp;temporary ban</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/server/user/user_list.cpp" line="66"/>
         <source>&amp;Days:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/server/user/user_list.cpp" line="72"/>
         <source>&amp;Hours:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/server/user/user_list.cpp" line="78"/>
         <source>&amp;Minutes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/server/user/user_list.cpp" line="93"/>
         <source>Duration of the ban</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <location filename="src/server/user/user_list.cpp" line="96"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <location filename="src/server/user/user_list.cpp" line="101"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <location filename="src/server/user/user_list.cpp" line="104"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/server/user/user_list.cpp" line="106"/>
         <source>&amp;OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/server/user/user_list.cpp" line="109"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/server/user/user_list.cpp" line="128"/>
         <source>Ban user from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <location filename="src/server/user/user_list.cpp" line="210"/>
+        <location filename="src/server/user/user_list.cpp" line="218"/>
+        <location filename="src/server/user/user_list.cpp" line="225"/>
+        <location filename="src/server/user/user_list.cpp" line="233"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <location filename="src/server/user/user_list.cpp" line="211"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list.cpp" line="219"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list.cpp" line="226"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <location filename="src/server/user/user_list.cpp" line="234"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
@@ -445,22 +218,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
-        <source>Beta</source>
-        <translation type="unfinished"/>
+        <location filename="src/client/network/release_channel.cpp" line="206"/>
+        <source>Beta Releases</source>
+        <translation>Beta Sürümü</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="232"/>
         <source>No reply received from the release update server.</source>
         <translation>Sürüm güncelleme sunucusundan yanıt alınamadı.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="241"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Sürüm güncelleme sunucusundan geçersiz yanıt alındı.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="274"/>
         <source>No reply received from the file update server.</source>
         <translation>Dosya güncelleme sunucusundan yanıt alınamadı.</translation>
     </message>
@@ -468,32 +241,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="70"/>
         <source>Name</source>
         <translation>İsim</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="72"/>
         <source>Sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="74"/>
         <source>Mana cost</source>
         <translation>Mana bedeli</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="76"/>
         <source>Card type</source>
         <translation>Kart tipi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="78"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="80"/>
         <source>Color(s)</source>
         <translation>Renk(ler)</translation>
     </message>
@@ -501,910 +274,410 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="7"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>VE</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="9"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>VEYA</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="11"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="13"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="23"/>
         <source>Name</source>
         <translation>İsim</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="src/game/filters/filter_card.cpp" line="25"/>
         <source>Type</source>
         <translation>Tür</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="27"/>
         <source>Color</source>
         <translation>Renk</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="29"/>
         <source>Text</source>
         <translation>Yazı</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="31"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="33"/>
         <source>Mana Cost</source>
         <translation>Mana Bedeli</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="35"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="37"/>
         <source>Rarity</source>
         <translation>Enderlik</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="39"/>
         <source>Power</source>
         <translation>Güç</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="41"/>
         <source>Toughness</source>
         <translation>Dayanıklılık</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="43"/>
         <source>Loyalty</source>
         <translation>Sadakat</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="45"/>
         <source>Format</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
-    <name>CardInfoFrameWidget</name>
+    <name>CardFrame</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/game/cards/card_frame.cpp" line="65"/>
         <source>Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/game/cards/card_frame.cpp" line="66"/>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Açıklama</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="71"/>
+        <location filename="src/game/cards/card_frame.cpp" line="67"/>
         <source>Both</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="74"/>
-        <source>View transformation</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
-    <name>CardInfoPictureWidget</name>
+    <name>CardInfoText</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
-        <source>Add card to deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
-        <source>Mainboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
-        <source>Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CardInfoTextWidget</name>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/game/cards/card_info_text.cpp" line="40"/>
         <source>Name:</source>
-        <translation type="unfinished"/>
+        <translation>İsim:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="76"/>
+        <location filename="src/game/cards/card_info_text.cpp" line="53"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/game/cards/card_info_text.cpp" line="70"/>
         <source>Unknown card:</source>
+        <translation>Bilinmeyen kart:</translation>
+    </message>
+</context>
+<context>
+    <name>CardItem</name>
+    <message>
+        <location filename="src/game/cards/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/cards/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
-        <source>&amp;Tap / Untap</source>
-        <extracomment>Turn sideways or back again</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
-        <source>T&amp;urn Over</source>
-        <extracomment>Turn face up/face down</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CardSizeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
-        <source>Card Size</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CardZoneLogic</name>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone.cpp" line="64"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone.cpp" line="64"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone.cpp" line="69"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone.cpp" line="72"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone.cpp" line="75"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="77"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="77"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone.cpp" line="79"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone.cpp" line="79"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone.cpp" line="82"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone.cpp" line="82"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="84"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="84"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone.cpp" line="89"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone.cpp" line="92"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
-        <source>their custom zone &apos;%1&apos;</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
-        <source>%1&apos;s custom zone &apos;%2&apos;</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CockatriceXml3Parser</name>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
-        <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CockatriceXml4Parser</name>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
-        <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardInfoDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
-        <source>Card Info</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorDatabaseDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
-        <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
-        <source>Add card to &amp;maindeck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
-        <source>Add card to &amp;sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorDeckDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
-        <source>Banner Card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
-        <source>Mana Cost</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
-        <source>Colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
-        <source>Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
-        <source>Deck &amp;name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
-        <source>Banner Card/Tags Visibility Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
-        <source>Show banner card selection menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
-        <source>Show tags selection menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
-        <source>&amp;Comments:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
-        <source>Group by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
-        <source>Hash:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
-        <source>&amp;Increment number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
-        <source>&amp;Decrement number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
-        <source>&amp;Remove row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
-        <source>Swap card to/from sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorFilterDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
-        <source>&amp;Clear all filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
-        <source>Delete selected</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorMenu</name>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
-        <source>&amp;Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
-        <source>&amp;New deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
-        <source>&amp;Load deck...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
-        <source>Load recent deck...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
-        <source>Clear</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
-        <source>&amp;Save deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
-        <source>Save deck &amp;as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="159"/>
-        <source>Load deck from cl&amp;ipboard...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="161"/>
-        <source>Edit deck in clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
-        <source>Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
-        <source>Not Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
-        <source>Save deck to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
-        <source>Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
-        <source>Not Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="171"/>
-        <source>&amp;Print deck...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="173"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>&amp;Send deck to online service</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
-        <source>Create decklist (decklist.org)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
-        <source>Create decklist (decklist.xyz)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
-        <source>Analyze deck (deckstats.net)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
-        <source>Analyze deck (tappedout.net)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorPrintingSelectorDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
-        <source>Printing Selector</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="548"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="762"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="694"/>
         <source>Success</source>
         <translation>Başarılı</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="694"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="697"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="697"/>
         <source>One or more downloaded card pictures could not be cleared.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="704"/>
         <source>Add URL</source>
         <translation>URL ekle</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="704"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="724"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="572"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="724"/>
         <source>Edit URL</source>
         <translation>URL&apos;yi düzenle</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="568"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="576"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="751"/>
         <source>Updating...</source>
         <translation>Güncelleniyor...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="781"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="807"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="808"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="809"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="810"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="811"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="812"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="813"/>
         <source>Press the button to manually update without relaunching</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="814"/>
         <source>Do not close settings until manual update is complete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="815"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="816"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="817"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="818"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="819"/>
+        <source>Downloaded images directory size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="820"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="821"/>
+        <source>Picture cache size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="822"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
@@ -1412,238 +685,26 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
-        <source>Count</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
-        <source>Set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="src/deck/deck_list_model.cpp" line="167"/>
         <source>Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
-        <source>Provider ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="src/deck/deck_list_model.cpp" line="169"/>
         <source>Card</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckLoader</name>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
-        <source>Common deck formats (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
-        <source>All files (*.*)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewColorIdentityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
-        <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewDeckTagsDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
-        <source>Edit tags ...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewTagDialog</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
-        <source>Deck Tags Manager</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
-        <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
-        <source>Add a new tag (e.g., Aggro️)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
-        <source>Add Tag</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
-        <source>Filter tags...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
-        <source>Edit default tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
-        <source>Invalid Input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
-        <source>Tag name cannot be empty!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
-        <source>Duplicate Tag</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
-        <source>This tag already exists.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewWidget</name>
-    <message>
-        <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="320"/>
-        <source>Open in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
-        <source>Edit Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
-        <source>Rename Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
-        <source>Save Deck to Clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
-        <source>Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
-        <source>Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
-        <source>Not Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
-        <source>Not Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
-        <source>Rename File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
-        <source>Delete File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
-        <source>Set Banner Card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
-        <source>New name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <source>Rename failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
-        <source>Delete file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
-        <source>Are you sure you want to delete the selected file?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
-        <source>Delete failed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1651,243 +712,181 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="146"/>
         <source>Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="147"/>
         <source>Load remote deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
-        <source>Load from clipboard...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
-        <source>Load from website...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="148"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
-        <source>Force start</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="163"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="165"/>
         <source>Sideboard locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
+        <source>Load deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="287"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="287"/>
         <source>The selected file could not be loaded.</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
-        <source>Deck is greater than maximum file size.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
-        <source>Are you sure you want to force start?
-This will kick all non-ready players from the game.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
-        <source>Cockatrice</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DialogConvertDeckToCodFormat</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
-        <source>Deck Format Conversion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
-        <source>You tried to add a tag to a .txt format deck.
- Tags can only be added to .cod format decks.
- Do you want to convert the deck to the .cod format?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
-        <source>Remember and automatically apply choice in the future</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="79"/>
         <source>Downloading...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="22"/>
         <source>Known Hosts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
-        <source>Delete the currently selected saved server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="29"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="39"/>
         <source>New Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="41"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="46"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="51"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="56"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="61"/>
         <source>P&amp;assword:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>&amp;Save password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="69"/>
         <source>A&amp;uto connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="70"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="85"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="264"/>
         <source>Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="97"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
-        <source>Forgot password?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="101"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="124"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="140"/>
         <source>Login</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="143"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="156"/>
         <source>Connect to Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="278"/>
         <source>Server URL</source>
         <translation>Sunucu URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="281"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="286"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="312"/>
         <source>Connection Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="312"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="328"/>
         <source>Connect Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="328"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -1895,117 +894,102 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="79"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="82"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="98"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="105"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="143"/>
         <source>&amp;Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="149"/>
         <source>Create game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="193"/>
         <source>Game information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="275"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="275"/>
         <source>Server error.</source>
         <translation type="unfinished"/>
     </message>
@@ -2013,248 +997,171 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="30"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="37"/>
         <source>C&amp;olor:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="39"/>
         <source>white</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="40"/>
         <source>blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="41"/>
         <source>black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="43"/>
         <source>green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>multicolor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>&amp;P/T:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;Annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
-        <source>Create face-down (Only hides name)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="72"/>
         <source>Token data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="79"/>
         <source>Show &amp;all tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Show tokens from this &amp;deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="123"/>
         <source>Choose token from list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="141"/>
         <source>Create token</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgDefaultTagsEditor</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="45"/>
-        <source>Edit Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
-        <source>Add</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
-        <source>Confirm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
-        <source>Enter a tag and press Enter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
-        <source>✖</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
-        <source>Invalid Input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
-        <source>Tag name cannot be empty!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
-        <source>Duplicate Tag</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
-        <source>This tag already exists.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgEditDeckInClipboard</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
-        <source>Edit deck in clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
-        <source>Invalid deck list.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation type="unfinished"/>
     </message>
@@ -2262,93 +1169,93 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="34"/>
         <source>white</source>
         <translation>beyaz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>blue</source>
         <translation>mavi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>black</source>
         <translation>siyah</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>red</source>
         <translation>kırmızı</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>green</source>
         <translation>yeşil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>multicolor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="92"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Add token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="157"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="155"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="158"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation type="unfinished"/>
@@ -2357,27 +1264,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation type="unfinished"/>
     </message>
@@ -2385,142 +1292,132 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>no limit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>5 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>10 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>30 minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="24"/>
         <source>1 hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>2 hours</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
-        <source>Hide &apos;buddies only&apos; games</source>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="27"/>
+        <source>Show &apos;&amp;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
-        <source>Hide full games</source>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="30"/>
+        <source>Show &amp;full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
-        <source>Hide games that have started</source>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="33"/>
+        <source>Show games &amp;that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
-        <source>Hide password protected games</source>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="36"/>
+        <source>Show &amp;password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
-        <source>Hide &apos;ignored user&apos; games</source>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="39"/>
+        <source>Hide &apos;&amp;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="47"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="52"/>
         <source>Game &amp;description:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="56"/>
         <source>&amp;Creator name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="66"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="82"/>
         <source>&amp;Game types</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="87"/>
         <source>at &amp;least:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;most:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="107"/>
         <source>Maximum player count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="117"/>
         <source>Restrictions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="120"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="124"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="128"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="171"/>
         <source>Filter games</source>
         <translation type="unfinished"/>
     </message>
@@ -2528,52 +1425,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2581,37 +1478,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2619,300 +1516,211 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="58"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="103"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="111"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="121"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="116"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="121"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="127"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="127"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeck</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
-        <source>Load Deck</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="19"/>
+        <source>&amp;Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="33"/>
         <source>Load deck from clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="70"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="70"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="26"/>
         <source>Load deck</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgMoveTopCardsUntil</name>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
-        <source>Card name (or search expressions):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
-        <source>Number of hits:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
-        <source>Auto play hits</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
-        <source>Put top cards on stack until...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
-        <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
-        <source>Cockatrice</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
-        <source>Invalid filter</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="318"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="353"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="373"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="373"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"/>
     </message>
@@ -2920,58 +1728,30 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgSelectSetForCards</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
-        <source>Unmodified Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
-        <source>Modified Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
-        <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
-        <source>Clear all set information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
-        <source>Set all to preferred</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1414"/>
         <source>Unknown Error loading card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1422"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -2982,7 +1762,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1428"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -2993,7 +1773,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1434"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3002,21 +1782,21 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1440"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1444"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1448"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3025,117 +1805,77 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1456"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1466"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1476"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1467"/>
         <source>The path to your deck directory is invalid. Would you like to go back and set the correct path?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1477"/>
         <source>The path to your card pictures directory is invalid. Would you like to go back and set the correct path?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1489"/>
         <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1491"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1492"/>
         <source>Appearance</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1493"/>
         <source>User Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1494"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1495"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1496"/>
         <source>Sound</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1497"/>
         <source>Shortcuts</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DlgStartupCardCheck</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
-        <source>Card Update Check</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
-        <source>It has been more than %2 days since you last checked your card database for updates.
-Choose how you would like to run the card database updater.
-You can always change this behavior in the &apos;General&apos; settings tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
-        <source>Run in foreground</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
-        <source>Run in background</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
-        <source>Run in background and always from now on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
-        <source>Don&apos;t prompt again and don&apos;t run</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
-        <source>Don&apos;t run this time</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
@@ -3143,164 +1883,164 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="26"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="35"/>
         <source>Reinstall</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Cancel Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Open Download Page</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="204"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="211"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="226"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="64"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
-        <source>Downloading update: %1</source>
+        <location filename="src/dialogs/dlg_update.cpp" line="95"/>
+        <source>Downloading update...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="112"/>
         <source>Checking for updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="123"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="138"/>
         <source>No Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>Cockatrice is up to date!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>Current version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="162"/>
         <source>Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>A new version of Cockatrice is available!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>New version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>Released</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Changelog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
         <source>Do you want to update now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
-        <source>Unfortunately, the automatic updater failed to find a compatible download. 
-You may have to manually download the new version.</source>
+        <location filename="src/dialogs/dlg_update.cpp" line="167"/>
+        <source>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
-        <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>
+        <location filename="src/dialogs/dlg_update.cpp" line="170"/>
+        <source>Please check the download page manually and visit the wiki for instructions on compiling.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="205"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="213"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="227"/>
         <source>Update Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="206"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="219"/>
         <source>Installing...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="228"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3308,292 +2048,126 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="19"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Debug Log</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
-        <source>In %1 decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
-        <source>%1% of %2 decks</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecApiResponseCardPricesDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
-        <source>Card Hoarder</source>
-        <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="58"/>
-        <source>Card Kingdom</source>
-        <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="59"/>
-        <source>Card Market</source>
-        <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"/>
-        <source>Face 2-Face</source>
-        <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="61"/>
-        <source>Mana Pool</source>
-        <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="62"/>
-        <source>MTG Stocks</source>
-        <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="63"/>
-        <source>Scg</source>
-        <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="64"/>
-        <source>Tcgl</source>
-        <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="65"/>
-        <source>Tcgplayer</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
-        <source>%1% Synergy</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
-        <source>Combos</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
-        <source>Average Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
-        <source>Salt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>FilterDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
-        <source>Confirm Delete</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
-        <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
-        <source>Delete Failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
-        <source>Failed to delete filter &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/game/game_selector.cpp" line="217"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="272"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/game/game_selector.cpp" line="217"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Wrong password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Spectators are not allowed in this game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>The game is already full.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game does not exist any more.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>This game is only open to registered users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
-        <source>Join Game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
-        <source>Spectate Game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
-        <source>Game Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/game/game_selector.cpp" line="258"/>
         <source>Join game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/game/game_selector.cpp" line="258"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/game/game_selector.cpp" line="272"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/game/game_selector.cpp" line="315"/>
         <source>&amp;Filter games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/game/game_selector.cpp" line="316"/>
         <source>C&amp;lear filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="318"/>
         <source>C&amp;reate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>&amp;Join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/game/game_selector.cpp" line="320"/>
         <source>J&amp;oin as spectator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/game/game_selector.cpp" line="341"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/game/game_selector.cpp" line="343"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
@@ -3601,105 +2175,100 @@ You may have to manually download the new version.</source>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/game/games_model.cpp" line="48"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/game/games_model.cpp" line="57"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="59"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/game/games_model.cpp" line="62"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/game/games_model.cpp" line="154"/>
         <source>password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/game/games_model.cpp" line="156"/>
         <source>buddies only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="155"/>
+        <location filename="src/game/games_model.cpp" line="158"/>
         <source>reg. users only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <location filename="src/game/games_model.cpp" line="190"/>
+        <location filename="src/game/games_model.cpp" line="195"/>
         <source>can chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>see hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/game/games_model.cpp" line="197"/>
         <source>can see hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/game/games_model.cpp" line="202"/>
         <source>not allowed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/game/games_model.cpp" line="220"/>
         <source>Room</source>
         <translation>Oda</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/game/games_model.cpp" line="224"/>
         <source>Age</source>
         <translation>Yaş</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/game/games_model.cpp" line="232"/>
         <source>Description</source>
         <translation>Açıklama</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/game/games_model.cpp" line="234"/>
         <source>Creator</source>
         <translation>Oluşturan</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/game/games_model.cpp" line="236"/>
         <source>Type</source>
         <translation>Tür</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/game/games_model.cpp" line="238"/>
         <source>Restrictions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/game/games_model.cpp" line="242"/>
         <source>Players</source>
         <translation>Oyuncular</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/game/games_model.cpp" line="250"/>
         <source>Spectators</source>
         <translation>İzleyici</translation>
     </message>
@@ -3707,1242 +2276,805 @@ 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/dialogs/dlg_settings.cpp" line="138"/>
         <source>Reset all paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="140"/>
         <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/dialogs/dlg_settings.cpp" line="201"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="211"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="221"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="241"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="251"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="279"/>
         <source>Personal settings</source>
         <translation>Kişisel ayarlar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="280"/>
         <source>Language:</source>
         <translation>Dil:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
         <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/dialogs/dlg_settings.cpp" line="285"/>
         <source>Paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
-        <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/dialogs/dlg_settings.cpp" line="288"/>
         <source>Decks directory:</source>
         <translation>Deste konumu:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
-        <source>Filters directory:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="289"/>
         <source>Replays directory:</source>
         <translation>Oyun Tekrar konumu:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="290"/>
         <source>Pictures directory:</source>
         <translation>Fotoğrafların Konumu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="291"/>
         <source>Card database:</source>
         <translation>Kart Arşivi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="292"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
         <source>Token database:</source>
         <translation>Token Arşivi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="294"/>
         <source>Update channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
-        <source>Check for client 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
-        <source>Don&apos;t check</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
-        <source>Prompt for update</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
-        <source>Check for card database updates every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
-        <source> days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="295"/>
         <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/dialogs/dlg_settings.cpp" line="296"/>
         <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/dialogs/dlg_settings.cpp" line="297"/>
         <source>Show tips on startup</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
-        <source>Last update check on %1 (%2 days ago)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <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="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>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="214"/>
-        <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>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="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="218"/>
-        <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>Move top cards to &amp;exile...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="221"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="224"/>
-        <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;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>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>Move bottom cards to &amp;graveyard...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="231"/>
-        <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>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="310"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
+        <location filename="src/client/ui/window_main.cpp" line="97"/>
+        <location filename="src/client/ui/window_main.cpp" line="444"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>Bu server kapasitesi dolu,lütfen daha sonra tekrar deneyin.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
+        <location filename="src/client/ui/window_main.cpp" line="100"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
+        <location filename="src/client/ui/window_main.cpp" line="103"/>
         <source>Banned by moderator</source>
         <translation>Moderatör tafarından men edildi.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
+        <location filename="src/client/ui/window_main.cpp" line="106"/>
         <source>Expected end time: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
+        <location filename="src/client/ui/window_main.cpp" line="108"/>
         <source>This ban lasts indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
+        <location filename="src/client/ui/window_main.cpp" line="114"/>
         <source>Scheduled server shutdown.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
+        <location filename="src/client/ui/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="459"/>
         <source>Invalid username.</source>
         <translation>Geçersiz kullanıcı adı</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="125"/>
         <source>Connection closed</source>
         <translation>Bağlantı kapatıldı</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
+        <location filename="src/client/ui/window_main.cpp" line="131"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
+        <location filename="src/client/ui/window_main.cpp" line="136"/>
         <source>Scheduled server shutdown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
+        <location filename="src/client/ui/window_main.cpp" line="175"/>
+        <location filename="src/client/ui/window_main.cpp" line="185"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="175"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
+        <location filename="src/client/ui/window_main.cpp" line="185"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
+        <location filename="src/client/ui/window_main.cpp" line="219"/>
         <source>Number of players</source>
         <translation>Oyuncu sayısı</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
+        <location filename="src/client/ui/window_main.cpp" line="219"/>
         <source>Please enter the number of players.</source>
         <translation>Lütfen oyuncu sayısı girin.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <location filename="src/client/ui/window_main.cpp" line="238"/>
         <source>Player %1</source>
         <translation>Oyuncu %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/client/ui/window_main.cpp" line="250"/>
         <source>Load replay</source>
         <translation>Tekrar yükle</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/client/ui/window_main.cpp" line="307"/>
         <source>About Cockatrice</source>
         <translation>Cockatrice hakkında</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="309"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="310"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice WebSayfası</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="310"/>
         <source>Project Manager:</source>
         <translation>Proje yöneticisi:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="311"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="312"/>
         <source>Developers:</source>
         <translation>Geliştiriciler:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="313"/>
         <source>Our Developers</source>
         <translation>Geliştiricilerimiz:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="314"/>
         <source>Help Develop!</source>
         <translation>Geliştirmemize yardım et!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="315"/>
         <source>Translators:</source>
         <translation>Çevirmenler:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="316"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="317"/>
         <source>Help Translate!</source>
         <translation>Çevirilere yardım edin!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="317"/>
         <source>Support:</source>
         <translation>Destek:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="318"/>
         <source>Report an Issue</source>
         <translation>Sorun Bildir</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>Troubleshooting</source>
         <translation>Sorun Giderme</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/client/ui/window_main.cpp" line="320"/>
         <source>F.A.Q.</source>
         <translation>S.S.S</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/client/ui/window_main.cpp" line="358"/>
+        <location filename="src/client/ui/window_main.cpp" line="386"/>
+        <location filename="src/client/ui/window_main.cpp" line="390"/>
+        <location filename="src/client/ui/window_main.cpp" line="403"/>
+        <location filename="src/client/ui/window_main.cpp" line="407"/>
+        <location filename="src/client/ui/window_main.cpp" line="411"/>
+        <location filename="src/client/ui/window_main.cpp" line="419"/>
+        <location filename="src/client/ui/window_main.cpp" line="424"/>
+        <location filename="src/client/ui/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="557"/>
+        <location filename="src/client/ui/window_main.cpp" line="561"/>
+        <location filename="src/client/ui/window_main.cpp" line="564"/>
+        <location filename="src/client/ui/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="588"/>
+        <location filename="src/client/ui/window_main.cpp" line="594"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
+        <location filename="src/client/ui/window_main.cpp" line="1199"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="358"/>
         <source>Server timeout</source>
         <translation>Server zaman aşımı</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="377"/>
         <source>Failed Login</source>
         <translation>Başarısız Giriş</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="378"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
+        <location filename="src/client/ui/window_main.cpp" line="379"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
+        <location filename="src/client/ui/window_main.cpp" line="387"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>Geçersiz kullanıcı adı veya şifre.Lütfen giriş bilgilerinizi kontrol edin ve tekrar deneyin.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
+        <location filename="src/client/ui/window_main.cpp" line="391"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>Bu hesap hala açık halde.
 Lütfen kapadıktan sonra tekrar giriş yapınız.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
+        <location filename="src/client/ui/window_main.cpp" line="547"/>
         <source>You are banned until %1.</source>
         <translation>%1 e kadar men edildiniz.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
+        <location filename="src/client/ui/window_main.cpp" line="399"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
         <source>You are banned indefinitely.</source>
         <translation>Süresiz men edildiniz.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
+        <location filename="src/client/ui/window_main.cpp" line="412"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>Bu server üyelik gerektirmekte.Hemen üye olmak istermisiniz ?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
+        <location filename="src/client/ui/window_main.cpp" line="420"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="431"/>
         <source>Account activation</source>
         <translation>Hesap Aktivasyonu</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
+        <location filename="src/client/ui/window_main.cpp" line="432"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>Server Full</source>
         <translation>Server dolu</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Unknown login error: %1</source>
         <translation>Bilinmeyen giriş hatası: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
+        <location filename="src/client/ui/window_main.cpp" line="566"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>Your username must respect these rules:</source>
         <translation>Kullanıcı adı bu kurallara uymalı :</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="464"/>
         <source>is %1 - %2 characters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="465"/>
         <source>can %1 contain lowercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
+        <location filename="src/client/ui/window_main.cpp" line="465"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
+        <location filename="src/client/ui/window_main.cpp" line="470"/>
+        <location filename="src/client/ui/window_main.cpp" line="476"/>
         <source>NOT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>can %1 contain uppercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="470"/>
         <source>can %1 contain numeric characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
+        <location filename="src/client/ui/window_main.cpp" line="473"/>
         <source>can contain the following punctuation: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
+        <location filename="src/client/ui/window_main.cpp" line="476"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
+        <location filename="src/client/ui/window_main.cpp" line="493"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
+        <location filename="src/client/ui/window_main.cpp" line="499"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
+        <location filename="src/client/ui/window_main.cpp" line="505"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="515"/>
+        <location filename="src/client/ui/window_main.cpp" line="519"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
+        <location filename="src/client/ui/window_main.cpp" line="531"/>
+        <location filename="src/client/ui/window_main.cpp" line="535"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>Registration denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
+        <location filename="src/client/ui/window_main.cpp" line="516"/>
         <source>Registration is currently disabled on this server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
+        <location filename="src/client/ui/window_main.cpp" line="520"/>
         <source>There is already an existing account with the same user name.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
+        <location filename="src/client/ui/window_main.cpp" line="524"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
+        <location filename="src/client/ui/window_main.cpp" line="536"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>Password too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="561"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>Unknown registration error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="574"/>
         <source>Account activation failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="581"/>
         <source>Socket error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
+        <location filename="src/client/ui/window_main.cpp" line="589"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
+        <location filename="src/client/ui/window_main.cpp" line="605"/>
         <source>Connecting to %1...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
         <source>Registering to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
+        <location filename="src/client/ui/window_main.cpp" line="612"/>
         <source>Disconnected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
         <source>Connected, logging in at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
+        <location filename="src/client/ui/window_main.cpp" line="623"/>
+        <location filename="src/client/ui/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
         <source>&amp;Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="645"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="646"/>
         <source>Start &amp;local game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/client/ui/window_main.cpp" line="647"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="648"/>
+        <source>&amp;Deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/client/ui/window_main.cpp" line="650"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/client/ui/window_main.cpp" line="651"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="652"/>
         <source>&amp;Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>&amp;Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="657"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="659"/>
         <source>&amp;Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="662"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="663"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/client/ui/window_main.cpp" line="664"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
-        <source>Reload card database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
-        <source>Tabs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/client/ui/window_main.cpp" line="673"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
-        <source>Check for Card Updates (Automatic)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
-        <source>Show Status Bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
-        <source>Open Settings Folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/client/ui/window_main.cpp" line="676"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/client/ui/window_main.cpp" line="907"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <location filename="src/client/ui/window_main.cpp" line="908"/>
         <source>Congratulations on updating to Cockatrice %1!
 Oracle will now launch to update your card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/client/ui/window_main.cpp" line="912"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <location filename="src/client/ui/window_main.cpp" line="913"/>
         <source>Congratulations on installing Cockatrice %1!
 Oracle will now launch to install the initial card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1039"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <location filename="src/client/ui/window_main.cpp" line="1041"/>
         <source>Cockatrice is unable to load the card database.
 Do you want to update your card database now?
 If unsure or first time user, choose &quot;Yes&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/client/ui/window_main.cpp" line="1045"/>
+        <location filename="src/client/ui/window_main.cpp" line="1070"/>
         <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/client/ui/window_main.cpp" line="1046"/>
+        <location filename="src/client/ui/window_main.cpp" line="1071"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/client/ui/window_main.cpp" line="1047"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/client/ui/window_main.cpp" line="1062"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <location filename="src/client/ui/window_main.cpp" line="1064"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/client/ui/window_main.cpp" line="1072"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/client/ui/window_main.cpp" line="1091"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/client/ui/window_main.cpp" line="1092"/>
         <source>Hi! It seems like you're running this version of Cockatrice for the first time.
 All the sets in the card database have been enabled.
 Read more about changing the set order or disabling specific sets and consequent effects in the &quot;Manage Sets&quot; dialog.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/client/ui/window_main.cpp" line="1102"/>
+        <location filename="src/client/ui/window_main.cpp" line="1235"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/client/ui/window_main.cpp" line="1102"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/client/ui/window_main.cpp" line="1157"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
-        <source>Card database update running.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1178"/>
+        <source>failed to start.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
-        <source>Failed to start. The file might be missing, or permissions might be incorrect.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1181"/>
+        <source>crashed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
-        <source>The process crashed some time after starting successfully.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
+        <source>timed out.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
-        <source>Timed out. The process took too long to respond. The last waitFor...() function timed out.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1187"/>
+        <source>write error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
-        <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>
+        <location filename="src/client/ui/window_main.cpp" line="1190"/>
+        <source>read error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
-        <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1194"/>
+        <source>unknown error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
-        <source>Unknown error occurred.</source>
+        <location filename="src/client/ui/window_main.cpp" line="1199"/>
+        <source>The card database updater exited with an error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
-        <source>The card database updater exited with an error:
-%1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
+        <location filename="src/client/ui/window_main.cpp" line="1236"/>
         <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.
 
@@ -4950,672 +3082,630 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/client/ui/window_main.cpp" line="1255"/>
+        <location filename="src/client/ui/window_main.cpp" line="1264"/>
+        <location filename="src/client/ui/window_main.cpp" line="1270"/>
+        <location filename="src/client/ui/window_main.cpp" line="1298"/>
+        <location filename="src/client/ui/window_main.cpp" line="1302"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/client/ui/window_main.cpp" line="1264"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/client/ui/window_main.cpp" line="1270"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <location filename="src/client/ui/window_main.cpp" line="1299"/>
         <source>The new sets/cards have been added successfully.
 Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/client/ui/window_main.cpp" line="1302"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
+        <location filename="src/client/ui/window_main.cpp" line="1345"/>
+        <location filename="src/client/ui/window_main.cpp" line="1355"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
+        <location filename="src/client/ui/window_main.cpp" line="1346"/>
         <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/client/ui/window_main.cpp" line="1356"/>
         <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
+        <location filename="src/client/ui/window_main.cpp" line="1365"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaBaseWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
-        <source>Mana Base</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaCurveWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
-        <source>Mana Curve</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDevotionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
-        <source>Mana Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/server/message_log_widget.cpp" line="75"/>
         <source> from play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/server/message_log_widget.cpp" line="77"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/server/message_log_widget.cpp" line="79"/>
         <source> from exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/server/message_log_widget.cpp" line="81"/>
         <source> from their hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/server/message_log_widget.cpp" line="86"/>
         <source>the top card of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/server/message_log_widget.cpp" line="88"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/server/message_log_widget.cpp" line="93"/>
         <source> from the top of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/server/message_log_widget.cpp" line="95"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/server/message_log_widget.cpp" line="101"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/server/message_log_widget.cpp" line="103"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/server/message_log_widget.cpp" line="108"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/server/message_log_widget.cpp" line="110"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/server/message_log_widget.cpp" line="115"/>
         <source> from %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/server/message_log_widget.cpp" line="117"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/server/message_log_widget.cpp" line="121"/>
         <source> from sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/server/message_log_widget.cpp" line="123"/>
         <source> from the stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
-        <source> from custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/server/message_log_widget.cpp" line="149"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <location filename="src/server/message_log_widget.cpp" line="150"/>
         <source>%1 is not revealing the top card %2 any longer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <location filename="src/server/message_log_widget.cpp" line="157"/>
         <source>%1 can now look at top card %2 at any time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <location filename="src/server/message_log_widget.cpp" line="158"/>
         <source>%1 no longer can look at top card %2 at any time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/server/message_log_widget.cpp" line="165"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/server/message_log_widget.cpp" line="175"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/server/message_log_widget.cpp" line="181"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/server/message_log_widget.cpp" line="188"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/server/message_log_widget.cpp" line="192"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/server/message_log_widget.cpp" line="208"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/server/message_log_widget.cpp" line="211"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/server/message_log_widget.cpp" line="215"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/server/message_log_widget.cpp" line="219"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/server/message_log_widget.cpp" line="227"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <location filename="src/server/message_log_widget.cpp" line="230"/>
         <source>%1 points from their %2 to %3&apos;s %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <location filename="src/server/message_log_widget.cpp" line="236"/>
         <source>%1 points from %2&apos;s %3 to their own %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <location filename="src/server/message_log_widget.cpp" line="242"/>
         <source>%1 points from %2&apos;s %3 to %4&apos;s %5.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
-        <source>%1 creates a face down token.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/server/message_log_widget.cpp" line="254"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/server/message_log_widget.cpp" line="263"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <location filename="src/server/message_log_widget.cpp" line="265"/>
         <source>%1 has loaded a deck with %2 sideboard cards (%3).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/server/message_log_widget.cpp" line="275"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/server/message_log_widget.cpp" line="310"/>
         <source>a card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/server/message_log_widget.cpp" line="316"/>
         <source>%1 gives %2 control over %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/server/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/server/message_log_widget.cpp" line="330"/>
         <source>%1 puts %2 into play%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/server/message_log_widget.cpp" line="333"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/server/message_log_widget.cpp" line="335"/>
         <source>%1 exiles %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/server/message_log_widget.cpp" line="337"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/server/message_log_widget.cpp" line="340"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <location filename="src/server/message_log_widget.cpp" line="342"/>
         <source>%1 puts %2%3 onto the bottom of their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/server/message_log_widget.cpp" line="344"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <location filename="src/server/message_log_widget.cpp" line="348"/>
         <source>%1 puts %2%3 into their library %4 cards from the top.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/server/message_log_widget.cpp" line="351"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/server/message_log_widget.cpp" line="354"/>
         <source>%1 plays %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
-        <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/server/message_log_widget.cpp" line="372"/>
         <source>%1 tries to draw from an empty library</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/server/message_log_widget.cpp" line="374"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/server/message_log_widget.cpp" line="384"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
-        <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <location filename="src/server/message_log_widget.cpp" line="389"/>
+        <source>%1 is looking at the top %3 card(s) %2.</source>
         <comment>top card for singular, top %3 cards for plural</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
-        <source>bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
-        <source>top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/server/message_log_widget.cpp" line="400"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/server/message_log_widget.cpp" line="403"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/server/message_log_widget.cpp" line="409"/>
         <source>The game has been closed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/server/message_log_widget.cpp" line="414"/>
         <source>The game has started.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/server/message_log_widget.cpp" line="420"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/server/message_log_widget.cpp" line="426"/>
         <source>%1 is now watching the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/server/message_log_widget.cpp" line="431"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/server/message_log_widget.cpp" line="438"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/server/message_log_widget.cpp" line="444"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <location filename="src/server/message_log_widget.cpp" line="450"/>
         <source>%1 is not ready to start the game any more.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <location filename="src/server/message_log_widget.cpp" line="459"/>
         <source>%1 shuffles their deck and draws a new hand of %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/server/message_log_widget.cpp" line="464"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/server/message_log_widget.cpp" line="470"/>
         <source>You are watching a replay of game #%1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/server/message_log_widget.cpp" line="475"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/server/message_log_widget.cpp" line="501"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <location filename="src/server/message_log_widget.cpp" line="503"/>
         <source>%1 card(s)</source>
         <comment>a card for singular, %1 cards for plural</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/server/message_log_widget.cpp" line="512"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/server/message_log_widget.cpp" line="517"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/server/message_log_widget.cpp" line="523"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/server/message_log_widget.cpp" line="529"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/server/message_log_widget.cpp" line="536"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/server/message_log_widget.cpp" line="542"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/server/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="552"/>
+        <location filename="src/server/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="559"/>
+        <location filename="src/server/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="566"/>
+        <location filename="src/server/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="568"/>
+        <location filename="src/server/message_log_widget.cpp" line="566"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/server/message_log_widget.cpp" line="566"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/server/message_log_widget.cpp" line="574"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/server/message_log_widget.cpp" line="574"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/server/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="581"/>
+        <location filename="src/server/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="588"/>
+        <location filename="src/server/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="598"/>
+        <location filename="src/server/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="626"/>
+        <location filename="src/server/message_log_widget.cpp" line="625"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/server/message_log_widget.cpp" line="631"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/server/message_log_widget.cpp" line="642"/>
+        <source>%1 places %2 %3 on %4 (now %5).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/server/message_log_widget.cpp" line="644"/>
+        <source>%1 removes %2 %3 from %4 (now %5).</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <location filename="src/server/message_log_widget.cpp" line="650"/>
+        <source>red counter(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <location filename="src/server/message_log_widget.cpp" line="653"/>
+        <source>yellow counter(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="src/server/message_log_widget.cpp" line="656"/>
+        <source>green counter(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/server/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/server/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/server/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/server/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <location filename="src/server/message_log_widget.cpp" line="713"/>
         <source>%1 changes the PT of %2 from nothing to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <location filename="src/server/message_log_widget.cpp" line="716"/>
         <source>%1 changes the PT of %2 from %3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/server/message_log_widget.cpp" line="724"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/server/message_log_widget.cpp" line="726"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/server/message_log_widget.cpp" line="744"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/server/message_log_widget.cpp" line="744"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/server/message_log_widget.cpp" line="747"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/server/message_log_widget.cpp" line="747"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/server/message_log_widget.cpp" line="763"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/server/message_log_widget.cpp" line="767"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/server/message_log_widget.cpp" line="772"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/server/message_log_widget.cpp" line="777"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/server/message_log_widget.cpp" line="796"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/server/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/server/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -5623,282 +3713,226 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="865"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="906"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="910"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="914"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1011"/>
         <source>Add message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1011"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1024"/>
         <source>Message:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1024"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1042"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1043"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1044"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1045"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1046"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1048"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1049"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1050"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1051"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1052"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1053"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1055"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1056"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1057"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1058"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="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="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="60"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="62"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>OverlapControlWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
-        <source>Cards to overlap:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
-        <source>Overlap percentage:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
-        <source>Overlap direction:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="17"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="19"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="20"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="21"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="22"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="23"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="24"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="26"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -5906,57 +3940,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="152"/>
         <source>Untap step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="154"/>
         <source>Upkeep step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="156"/>
         <source>Draw step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="158"/>
         <source>First main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="160"/>
         <source>Beginning of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="162"/>
         <source>Declare attackers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="164"/>
         <source>Declare blockers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="166"/>
         <source>Combat damage step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="168"/>
         <source>End of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="170"/>
         <source>Second main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/client/ui/phases_toolbar.cpp" line="172"/>
         <source>End of turn step</source>
         <translation type="unfinished"/>
     </message>
@@ -5964,343 +3998,656 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/client/ui/picture_loader.cpp" line="359"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
-        <source>View top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="652"/>
+        <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game/player/player.cpp" line="653"/>
+        <location filename="src/game/player/player.cpp" line="1100"/>
+        <location filename="src/game/player/player.cpp" line="1178"/>
+        <location filename="src/game/player/player.cpp" line="1203"/>
+        <location filename="src/game/player/player.cpp" line="1275"/>
+        <location filename="src/game/player/player.cpp" line="1307"/>
+        <location filename="src/game/player/player.cpp" line="1459"/>
+        <location filename="src/game/player/player.cpp" line="1491"/>
+        <location filename="src/game/player/player.cpp" line="1552"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
-        <source>View bottom cards of library</source>
+        <location filename="src/game/player/player.cpp" line="744"/>
+        <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
-        <source>Shuffle top cards of library</source>
+        <location filename="src/game/player/player.cpp" line="745"/>
+        <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
-        <source>Shuffle bottom cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
-        <source>Draw cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <source>Create tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
-        <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
-        <source>(max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
-        <source>Change power/toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
-        <source>Change stats to:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
-        <source>Set annotation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
-        <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game/player/player.cpp" line="747"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game/player/player.cpp" line="748"/>
+        <location filename="src/game/player/player.cpp" line="755"/>
+        <location filename="src/game/player/player.cpp" line="768"/>
+        <location filename="src/game/player/player.cpp" line="883"/>
+        <source>&amp;Graveyard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="749"/>
+        <location filename="src/game/player/player.cpp" line="756"/>
+        <location filename="src/game/player/player.cpp" line="762"/>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="752"/>
+        <source>&amp;Move hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="753"/>
+        <location filename="src/game/player/player.cpp" line="759"/>
+        <location filename="src/game/player/player.cpp" line="765"/>
+        <source>&amp;Top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="754"/>
+        <location filename="src/game/player/player.cpp" line="760"/>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;Bottom of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="758"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="761"/>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <location filename="src/game/player/player.cpp" line="882"/>
+        <source>&amp;Hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="764"/>
+        <source>&amp;Move exile to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <source>&amp;View library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <source>&amp;View hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="772"/>
+        <source>View &amp;top cards of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="773"/>
+        <source>Reveal &amp;library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <source>&amp;Always reveal top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <source>&amp;View sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <source>&amp;Draw card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <source>D&amp;raw cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <source>&amp;Undo last draw</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="785"/>
+        <source>Take &amp;mulligan</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Shuffle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <source>Play top card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="791"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>Lend library to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="809"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Reveal random card to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="811"/>
+        <source>&amp;Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>&amp;Untap all permanents</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>R&amp;oll die...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>&amp;Create token...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>C&amp;reate another token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <location filename="src/game/player/player.cpp" line="1051"/>
+        <source>&amp;All players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
         <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="91"/>
-        <source>Display Navigation Buttons</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardOverlayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
-        <source>Preference</source>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
-        <source>Pin Printing</source>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
-        <source>Unpin Printing</source>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardSearchWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
-        <source>Search by set name or set code</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardSelectionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
-        <source>Previous Card in Deck</source>
+        <location filename="src/game/player/player.cpp" line="841"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
-        <source>Bulk Selection</source>
+        <location filename="src/game/player/player.cpp" line="842"/>
+        <source>Toggle &amp;normal untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
-        <source>Next Card in Deck</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardSortingWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
-        <source>Alphabetical</source>
+        <location filename="src/game/player/player.cpp" line="844"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
-        <source>Preference</source>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
-        <source>Release Date</source>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
-        <source>Descending</source>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
-        <source>Ascending</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game/player/player.cpp" line="851"/>
+        <source>&amp;Draw arrow...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game/player/player.cpp" line="853"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game/player/player.cpp" line="854"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game/player/player.cpp" line="855"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game/player/player.cpp" line="856"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game/player/player.cpp" line="857"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game/player/player.cpp" line="858"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game/player/player.cpp" line="859"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game/player/player.cpp" line="860"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game/player/player.cpp" line="861"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="862"/>
+        <source>&amp;Set annotation...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="865"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="866"/>
+        <source>Yellow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="873"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="880"/>
+        <source>X cards from the top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1100"/>
+        <source>View top cards of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2855"/>
+        <source>Which position should this card be placed:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2855"/>
+        <source>(max. %1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1177"/>
+        <source>Draw hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1179"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1203"/>
+        <source>Draw cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1804"/>
+        <location filename="src/game/player/player.cpp" line="3402"/>
+        <source>Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1275"/>
+        <source>Move top cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <source>&amp;Top of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <source>&amp;Bottom of library...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="779"/>
+        <source>&amp;Always look at top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Play top card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>&amp;Draw bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Play bottom card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Selec&amp;ted cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1307"/>
+        <source>Move top cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1459"/>
+        <source>Move bottom cards to grave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1491"/>
+        <source>Move bottom cards to exile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1552"/>
+        <source>Draw bottom cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1657"/>
+        <location filename="src/game/player/player.cpp" line="3811"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1804"/>
+        <source>Create tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2854"/>
+        <source>Place card X cards from top of library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3189"/>
+        <source>Change power/toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3189"/>
+        <source>Change stats to:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3309"/>
+        <source>Set annotation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3310"/>
+        <source>Please enter the new annotation:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3402"/>
+        <source>Set counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3600"/>
+        <source>Re&amp;veal to...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3647"/>
+        <source>View related cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3686"/>
+        <source>Token: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3703"/>
+        <source>All tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="736"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="737"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/client/ui/window_main.cpp" line="738"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/client/ui/window_main.cpp" line="739"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="740"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="741"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="742"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6308,135 +4655,131 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="79"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/client/ui/window_main.cpp" line="80"/>
+        <location filename="src/deck/deck_loader.cpp" line="14"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/client/ui/window_main.cpp" line="252"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="src/deck/deck_loader.cpp" line="13"/>
+        <source>Common deck formats (*.cod *.dec *.dek *.txt *.mwDeck)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../common/decklist.cpp" line="111"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="113"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="115"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
-        <source>Overwrite Existing File?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
-        <source>A .cod version of this deck already exists. Overwrite it?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="745"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="746"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="747"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="748"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="749"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="750"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="751"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="752"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="753"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="754"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="755"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="756"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="757"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/client/ui/window_main.cpp" line="758"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/client/ui/window_main.cpp" line="759"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/client/ui/window_main.cpp" line="760"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/client/ui/window_main.cpp" line="761"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/client/ui/window_main.cpp" line="762"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -6444,17 +4787,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="174"/>
         <source>Upload time</source>
         <translation type="unfinished"/>
     </message>
@@ -6462,108 +4805,70 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Keep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Time started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="161"/>
         <source>Duration (sec)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <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="60"/>
-        <source>&amp;View exile</source>
-        <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;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <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="67"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="56"/>
         <source>Joi&amp;n</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="63"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
@@ -6571,32 +4876,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SequenceEdit</name>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="43"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="49"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="172"/>
+        <source>Shortcut already in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/utility/sequence_edit.cpp" line="175"/>
         <source>Invalid key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
-        <source>Shortcut already in use by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="192"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="193"/>
         <source>Restore default</source>
         <translation type="unfinished"/>
     </message>
@@ -6604,27 +4909,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -6632,80 +4937,72 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1215"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1292"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Do you really want to restore all default shortcuts?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1276"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1277"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
-        <source>Section:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
-        <source>Action:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
-        <source>Shortcut:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
-        <source>How to set custom shortcuts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
-        <source>Clear all shortcuts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
-        <source>Search by shortcut name</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ShortcutTreeView</name>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1284"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1284"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1287"/>
+        <source>Section:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1288"/>
+        <source>Action:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1289"/>
+        <source>Shortcut:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1291"/>
+        <source>How to set custom shortcuts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1293"/>
+        <source>Clear all shortcuts</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="46"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="48"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -6714,58 +5011,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="20"/>
         <source>&amp;Reason for shutdown:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="24"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="43"/>
         <source>Shut down server</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1127"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1128"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1129"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1130"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1131"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -6773,48 +5057,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="100"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="100"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="110"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="117"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="110"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="117"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="138"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="138"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="179"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="179"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -6822,859 +5106,793 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
-        <source>Default</source>
+        <location filename="src/client/network/release_channel.cpp" line="92"/>
+        <source>Stable Releases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="108"/>
         <source>No reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="116"/>
         <source>Invalid reply received from the release update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="172"/>
         <source>No reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="179"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>TabAccount</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
-        <source>Add to Buddy List</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
-        <source>Add to Ignore List</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="53"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="98"/>
         <source>Update server &amp;message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="99"/>
         <source>&amp;Shut down server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="100"/>
         <source>&amp;Reload configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="101"/>
         <source>Server administration functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
-        <source>Server moderator functions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
-        <source>Replay ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
-        <source>Grant Replay Access</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
-        <source>Username to Activate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
-        <source>Force Activate User</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="103"/>
         <source>&amp;Unlock functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="104"/>
         <source>&amp;Lock functions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
-        <source>Success</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <source>Replay access granted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <source>Unable to grant replay access. Replay ID invalid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <source>Unable to grant replay access. Internal error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
-        <source>User successfully activated</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
-        <source>Unable to activate user. Internal error</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="388"/>
+        <source>Search by card name (or search expressions)</source>
+        <oldsource>Search by card name</oldsource>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="478"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="479"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="484"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="637"/>
+        <source>&amp;Clear all filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="638"/>
+        <source>Delete selected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="640"/>
+        <source>Deck &amp;name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="641"/>
+        <source>&amp;Comments:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="642"/>
+        <source>Hash:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="644"/>
+        <source>&amp;New deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="645"/>
+        <source>&amp;Load deck...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="646"/>
+        <source>&amp;Save deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="647"/>
+        <source>Save deck &amp;as...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="648"/>
+        <source>Load deck from cl&amp;ipboard...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="650"/>
+        <source>Save deck to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="651"/>
+        <source>Annotated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="652"/>
+        <source>Not Annotated</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="654"/>
+        <source>&amp;Print deck...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="656"/>
+        <source>&amp;Send deck to online service</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="657"/>
+        <source>Create decklist (decklist.org)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="658"/>
+        <source>Analyze deck (deckstats.net)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="659"/>
+        <source>Analyze deck (tappedout.net)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="661"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="663"/>
+        <source>Add card to &amp;maindeck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="664"/>
+        <source>Add card to &amp;sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="666"/>
+        <source>&amp;Remove row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="668"/>
+        <source>&amp;Increment number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="670"/>
+        <source>&amp;Decrement number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="672"/>
+        <source>&amp;Deck Editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="674"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="679"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="675"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="680"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="676"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="681"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="678"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
-        <source>Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="683"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="686"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="689"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="684"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="687"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="690"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="692"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="116"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="697"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
-        <source>Visual Deck: %1</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="749"/>
+        <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
-        <source>&amp;Visual Deck Editor</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="749"/>
+        <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/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
-        <source>Card Info</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="783"/>
+        <source>Load deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
-        <source>Deck</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="804"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="815"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="836"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="857"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="918"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="930"/>
+        <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="804"/>
+        <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
-        <source>&amp;View</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="815"/>
+        <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
-        <source>Printing</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="837"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="858"/>
+        <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/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
-        <source>Visible</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="843"/>
+        <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
-        <source>Floating</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="918"/>
+        <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
-        <source>Reset layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabDeckEditorVisualTabWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
-        <source>Visual Deck View</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
-        <source>Visual Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
-        <source>Deck Analytics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
-        <source>Sample Hand</source>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="930"/>
+        <source>No deck was selected to be saved.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="57"/>
+        <source>Deck storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="120"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="121"/>
         <source>Server deck storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="123"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="125"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
-        <source>Rename deck or folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="124"/>
         <source>Upload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="126"/>
         <source>Download deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="175"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="127"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="324"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="128"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="129"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="179"/>
-        <source>Open decks folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
-        <source>Rename local folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
-        <source>Rename local file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
-        <source>New name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="187"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="219"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <source>Rename failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="187"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="194"/>
         <source>Enter deck name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="194"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="199"/>
         <source>Unnamed deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="219"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="235"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
-        <source>Are you sure you want to delete the selected files?</source>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="236"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="369"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="380"/>
+        <source>Are you sure you want to delete &quot;%1&quot;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
-        <source>Delete remote decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
-        <source>Are you sure you want to delete the selected decks?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="324"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabDeckStorageVisual</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
-        <source>Visual Deck Storage</source>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="368"/>
+        <source>Delete remote folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
-        <source>Could not open deck at %1</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabEdhRec</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
-        <source>EDHREC: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabEdhRecMain</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
-        <source>&amp;Cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
-        <source>Top Commanders</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
-        <source>Tags</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="379"/>
+        <source>Delete remote deck</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="509"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1385"/>
         <source>Replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="509"/>
         <source>Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="503"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="566"/>
         <source>Player List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="512"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="564"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="513"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="565"/>
         <source>Messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="515"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="578"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="520"/>
         <source>&amp;Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="523"/>
         <source>&amp;Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="525"/>
         <source>Next &amp;phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="528"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="531"/>
         <source>Next &amp;turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="534"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="537"/>
         <source>&amp;Remove all local arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="540"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="543"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="546"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
-        <source>Un&amp;concede</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="548"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="551"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="554"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="557"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="560"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="563"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="568"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="571"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="574"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="579"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="569"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="572"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="575"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="580"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="583"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="663"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="663"/>
         <source>Are you sure you want to concede this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="669"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="670"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="682"/>
         <source>Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="682"/>
         <source>Are you sure you want to leave this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="960"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1204"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1205"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
-        <source>You have been kicked out of the game.</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1216"/>
+        <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
-        <source>Home</source>
+        <location filename="src/client/tabs/tab_game.cpp" line="1219"/>
+        <source>player left the game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1222"/>
+        <source>player disconnected from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1226"/>
+        <source>reason unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1263"/>
+        <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="67"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="31"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="37"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="43"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="48"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="79"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="69"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="79"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="185"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="271"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="277"/>
         <source>Message History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -7682,37 +5900,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="113"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="151"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="168"/>
         <source>%1 has left the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="174"/>
         <source>%1 has joined the server.</source>
         <translation type="unfinished"/>
     </message>
@@ -7720,233 +5938,117 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.h" line="55"/>
+        <source>Game replays</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_replays.cpp" line="116"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="117"/>
         <source>Server replay storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="119"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="121"/>
         <source>Watch replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <source>Rename</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
-        <source>New folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="120"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="124"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
-        <source>Open replays folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="122"/>
         <source>Download replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="123"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
-        <source>Rename local folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
-        <source>Rename local file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
-        <source>New name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
-        <source>Rename failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
-        <source>Name of new folder:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="152"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
-        <source>Are you sure you want to delete the selected files?</source>
+        <location filename="src/client/tabs/tab_replays.cpp" line="153"/>
+        <source>Are you sure you want to delete &quot;%1&quot;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
-        <source>Are you sure you want to delete the selected replays?</source>
+        <location filename="src/client/tabs/tab_replays.cpp" line="202"/>
+        <source>Downloading Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
-        <source>Failed to get code</source>
+        <location filename="src/client/tabs/tab_replays.cpp" line="203"/>
+        <source>Folder download is not yet supported. Please download replays individually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Either this server does not support replay sharing, or does not permit replay sharing for you.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
-        <source>Failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
-        <source>Replay Share Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Others can use this code to add the replay to their list of remote replays:
-%1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="271"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
-        <source>Game Replays</source>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
+        <source>Are you sure you want to delete the replay of game %1?</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>&amp;Leave room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="152"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="153"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="165"/>
         <source> mentioned you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="173"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="216"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation type="unfinished"/>
     </message>
@@ -7954,35 +6056,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="224"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="225"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -7990,92 +6092,32 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
-        <source>Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
-        <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
-        <source>EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
-        <source>&amp;Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
-        <source>Visual Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
-        <source>Game Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
-        <source>Administration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
-        <source>Logs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="174"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="175"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="577"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="605"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="646"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="647"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8083,61 +6125,71 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="652"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="652"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="656"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="657"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="661"/>
         <source>Warned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="662"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="676"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>TabVisualDatabaseDisplay</name>
+    <name>TabUserLists</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
-        <source>Visual Database Display</source>
+        <location filename="src/client/tabs/tab_account.h" line="56"/>
+        <source>Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_account.cpp" line="65"/>
+        <source>Add to Buddy List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_account.cpp" line="75"/>
+        <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation type="unfinished"/>
     </message>
@@ -8145,13 +6197,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation type="unfinished"/>
@@ -8160,42 +6212,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -8203,7 +6255,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
@@ -8211,206 +6263,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="56"/>
         <source>User &amp;details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="57"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="58"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="59"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="60"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="76"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="77"/>
-        <source>View admin notes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <source>This user does not exist.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="93"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="101"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="157"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="180"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="184"/>
         <source>Ban History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="163"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="181"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="213"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="234"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="238"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="195"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="220"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="218"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="235"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="217"/>
         <source>User has never been warned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="247"/>
-        <source>Failed to get admin notes.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="231"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="232"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="247"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="241"/>
         <source>Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="239"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="241"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="316"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="336"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8418,173 +6437,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>Account Age:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="82"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="113"/>
         <source>Administrator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="115"/>
         <source>Moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="117"/>
         <source>Registered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="119"/>
+        <location filename="src/server/user/user_info_box.cpp" line="130"/>
         <source>Unregistered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="122"/>
         <source>Judge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="140"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="313"/>
         <source>The entered password does not match your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="306"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="306"/>
         <source>User information updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="256"/>
+        <location filename="src/server/user/user_info_box.cpp" line="309"/>
+        <location filename="src/server/user/user_info_box.cpp" line="313"/>
+        <location filename="src/server/user/user_info_box.cpp" line="317"/>
+        <location filename="src/server/user/user_info_box.cpp" line="330"/>
+        <location filename="src/server/user/user_info_box.cpp" line="333"/>
+        <location filename="src/server/user/user_info_box.cpp" line="336"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="354"/>
+        <location filename="src/server/user/user_info_box.cpp" line="358"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="70"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="77"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="157"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="215"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="216"/>
         <source>Password verification is required in order to change your email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="257"/>
+        <location filename="src/server/user/user_info_box.cpp" line="318"/>
+        <location filename="src/server/user/user_info_box.cpp" line="341"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="310"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
         <source>Password changed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="330"/>
         <source>This server does not permit you to change your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="333"/>
         <source>The new password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="336"/>
         <source>The old password is incorrect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>Avatar updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="354"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="358"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation type="unfinished"/>
     </message>
@@ -8592,580 +6611,124 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="514"/>
         <source>General interface settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="515"/>
         <source>&amp;Double-click cards to play them (instead of single-click)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
-        <source>&amp;Clicking plays all selected cards (instead of just the clicked card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="516"/>
         <source>&amp;Play all nonlands onto the stack (not the battlefield) by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
-        <source>Close card view window when last card is removed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
-        <source>Auto focus search bar when card view window is opened</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="517"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="518"/>
         <source>Use tear-off menus, allowing right click menus to persist on screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="519"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="520"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="521"/>
         <source>Notify in the taskbar for game events while you are spectating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="522"/>
         <source>Notify in the taskbar when users in your buddy list connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="523"/>
         <source>Animation settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="524"/>
         <source>&amp;Tap/untap animation</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
-        <source>Deck editor/storage settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
-        <source>Open deck in new tab by default</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
-        <source>Use visual deck storage in game lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
-        <source>Use selection animation for Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
-        <source>When adding a tag in the visual deck storage to a .txt deck:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
-        <source>do nothing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
-        <source>ask to convert to .cod</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
-        <source>always convert to .cod</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
-        <source>Default deck editor type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <source>Classic Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
-        <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
-        <source>Replay settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
-        <source>Buffer time for backwards skip via shortcut:</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
-    <name>UserListWidget</name>
+    <name>UserList</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/server/user/user_list.cpp" line="377"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/server/user/user_list.cpp" line="380"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/server/user/user_list.cpp" line="383"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/server/user/user_list.cpp" line="386"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayColorFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
-        <source>Save Filter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
-        <source>Save all currently applied filters to a file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
-        <source>Enter filename...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
-        <source>Do not display card main-types with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
-        <source>Apply all card names in clipboard as exact match name filters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
-    <message>
-        <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>
-</context>
-<context>
-    <name>VisualDatabaseDisplaySetFilterWidget</name>
-    <message>
-        <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="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="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>
-</context>
-<context>
-    <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
-    <message>
-        <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="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="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="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="172"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
-        <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
-        <source>Clear all filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorSampleHandWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
-        <source>Draw a new sample hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
-        <source>Sample hand size</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
-        <source>Quick search and add card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
-        <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageFolderDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageQuickSettingsWidget</name>
-    <message>
-        <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="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="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="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="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="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="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="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="130"/>
-        <source>Filepath</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageSearchWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
-        <source>Search by filename (or search expression)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageSortWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
-        <source>Sort Alphabetically (Deck Name)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
-        <source>Sort Alphabetically (Filename)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
-        <source>Sort by Last Modified</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
-        <source>Sort by Last Loaded</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
-        <source>Refresh loaded files</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
-        <source>Visual Deck Storage Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/server/user/user_list.cpp" line="134"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <location filename="src/server/user/user_list.cpp" line="142"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/server/user/user_list.cpp" line="144"/>
         <source>&amp;OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/server/user/user_list.cpp" line="147"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list.cpp" line="162"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <location filename="src/server/user/user_list.cpp" line="168"/>
+        <location filename="src/server/user/user_list.cpp" line="174"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <location filename="src/server/user/user_list.cpp" line="169"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <location filename="src/server/user/user_list.cpp" line="175"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"/>
     </message>
@@ -9173,133 +6736,128 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WndSets</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="38"/>
         <source>Move selected set to the top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="45"/>
         <source>Move selected set up</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="52"/>
         <source>Move selected set down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="61"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="59"/>
         <source>Move selected set to the bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="67"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="72"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="75"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="73"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="112"/>
+        <location filename="src/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="113"/>
+        <location filename="src/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="114"/>
+        <location filename="src/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="115"/>
+        <location filename="src/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="131"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="134"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="135"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="136"/>
         <source>first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom)</source>
         <comment>%1 is a link to the wiki</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
-        <source>Include cards rebalanced for Alchemy [requires restart]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="135"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="144"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="147"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="151"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="152"/>
         <source>To enable ordering again, click the column header until this message disappears.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="155"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="156"/>
         <source>Sorts the set priority using the same column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9307,72 +6865,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
-        <source>Search by card name (or search expressions)</source>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="140"/>
+        <source>sort by name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
-        <source>Ungrouped</source>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="141"/>
+        <source>sort by type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
-        <source>Group by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
-        <source>Group by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
-        <source>Group by Color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
-        <source>Unsorted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
-        <source>Sort by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
-        <source>Sort by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
-        <source>Sort by Mana Cost</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
-        <source>Sort by Colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
-        <source>Sort by P/T</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
-        <source>Sort by Set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="142"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="143"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -9380,7 +6888,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/settings/cache_settings.cpp" line="170"/>
         <source>English</source>
         <translation>Türkçe (Turkish)</translation>
     </message>
@@ -9388,12 +6896,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="142"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="143"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -9401,1007 +6909,786 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/settings/shortcuts_settings.h" line="39"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
+        <location filename="src/settings/shortcuts_settings.h" line="149"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/settings/shortcuts_settings.h" line="43"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Game Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Playing Area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Gameplay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
-        <source>Tabs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/settings/shortcuts_settings.h" line="143"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="146"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="152"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/settings/shortcuts_settings.h" line="157"/>
         <source>Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="163"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="166"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="169"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
-        <source>Analyze Deck (deckstats.net)</source>
+        <location filename="src/settings/shortcuts_settings.h" line="172"/>
+        <source>Analyze Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
-        <source>Analyze Deck (tappedout.net)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="175"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="178"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/settings/shortcuts_settings.h" line="182"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
-        <source>Export Deck (decklist.org)</source>
+        <location filename="src/settings/shortcuts_settings.h" line="192"/>
+        <source>Export Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
-        <source>Export Deck (decklist.xyz)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="195"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="198"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/settings/shortcuts_settings.h" line="202"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
-        <source>Edit Deck in Clipboard, Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
-        <source>Edit Deck in Clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="205"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/settings/shortcuts_settings.h" line="209"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="212"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="215"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="587"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/settings/shortcuts_settings.h" line="221"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="224"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/settings/shortcuts_settings.h" line="228"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
-        <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/settings/shortcuts_settings.h" line="232"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
-        <source>Save Deck to Clipboard (No Set Info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="235"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="238"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="241"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="257"/>
+        <source>Add Yellow Counter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
+        <source>Remove Yellow Counter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="263"/>
+        <source>Set Yellow Counters...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="272"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="275"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
-        <source>Show Status Bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
-        <source>Unload Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
-        <source>Force Start</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
-        <source>Add Card Counter (F)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
-        <source>Remove Card Counter (F)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
-        <source>Set Card Counters (F)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
-        <source>Add Card Counter (E)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
-        <source>Remove Card Counter (E)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
-        <source>Set Card Counters (E)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
-        <source>Add Card Counter(D)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
-        <source>Remove Card Counter (D)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
-        <source>Set Card Counters (D)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
-        <source>Add Card Counter (C)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
-        <source>Remove Card Counter (C)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
-        <source>Set Card Counters (C)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
-        <source>Add Card Counter (B)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
-        <source>Remove Card Counter (B)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
-        <source>Set Card Counters (B)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
-        <source>Add Card Counter (A)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
-        <source>Remove Card Counter (A)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
-        <source>Set Card Counters (A)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="278"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="281"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/settings/shortcuts_settings.h" line="381"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="384"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="387"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/settings/shortcuts_settings.h" line="391"/>
         <source>Attack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/settings/shortcuts_settings.h" line="393"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="396"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="399"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/settings/shortcuts_settings.h" line="403"/>
         <source>End</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
-        <source>Hide Card in Reveal Window</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Toggle Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="449"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
-        <source>Select All Cards in Zone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
-        <source>Select All Cards in Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
-        <source>Select All Cards in Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/settings/shortcuts_settings.h" line="455"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
+        <location filename="src/settings/shortcuts_settings.h" line="502"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <source>Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/settings/shortcuts_settings.h" line="458"/>
+        <location filename="src/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="517"/>
         <source>Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="528"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="514"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="469"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/settings/shortcuts_settings.h" line="477"/>
         <source>Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="480"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="483"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
-        <source>Bottom Cards of Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="486"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="513"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="520"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
+        <location filename="src/settings/shortcuts_settings.h" line="525"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/settings/shortcuts_settings.h" line="531"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/settings/shortcuts_settings.h" line="534"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/settings/shortcuts_settings.h" line="537"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/settings/shortcuts_settings.h" line="540"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/settings/shortcuts_settings.h" line="548"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/settings/shortcuts_settings.h" line="551"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
-        <source>Shuffle Top Cards of Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
-        <source>Shuffle Bottom Cards of Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/settings/shortcuts_settings.h" line="557"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/settings/shortcuts_settings.h" line="563"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/settings/shortcuts_settings.h" line="566"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/settings/shortcuts_settings.h" line="569"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/settings/shortcuts_settings.h" line="572"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/settings/shortcuts_settings.h" line="575"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/settings/shortcuts_settings.h" line="578"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/settings/shortcuts_settings.h" line="581"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/settings/shortcuts_settings.h" line="584"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/settings/shortcuts_settings.h" line="590"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
-        <source>Skip Forward</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
-        <source>Skip Backward</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
-        <source>Skip Forward by a lot</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
-        <source>Skip Backward by a lot</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/settings/shortcuts_settings.h" line="596"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
-        <source>Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
-        <source>Server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
-        <source>Administration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
-        <source>Logs</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/cockatrice/translations/cockatrice_yue.ts b/cockatrice/translations/cockatrice_yue.ts
index 1f206c1eb..0b507fbba 100644
--- a/cockatrice/translations/cockatrice_yue.ts
+++ b/cockatrice/translations/cockatrice_yue.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;設置指示物</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>設置指示物</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>數值物新價值為 &apos;%1&apos;</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,81 +36,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation>更新後筆記</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation>%1 的管理筆記</translation>
     </message>
@@ -118,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation>主牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation>副牌庫</translation>
     </message>
@@ -131,312 +129,251 @@ 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"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>主題設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>現在主題</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation>打開主題文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation>選單設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>在右擊選單中顯示鍵盤快速鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <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/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation>卡面算繪</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>將打橫佈局卡片自動向上旋轉</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
-        <translation type="unfinished"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
+        <translation>將所有牌面藝術硬性改成本人喜好牌組[須重新啟動客端軟件]</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation>橫列</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
         <translation>手牌佈局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <source>Enable left justification</source>
         <translation>啟用向左對齊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <source>Table grid layout</source>
         <translation>表格布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="692"/>
         <source>Invert vertical coordinate</source>
         <translation>反轉垂直坐標</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>卡牌上顯示的最大字體大小</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>禁用 &amp;用家名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>禁用&amp;IP地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>禁用客户ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>禁用類型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;永久禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;暫時禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;小時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;分鐘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>禁用時間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>請記載禁用原因
 這項只保留為版主, 被禁用戶不能看到.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>請記載被禁用戶能看到的被禁原因.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>將這用戶所有室中打出的訊息完全移除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>把用戶從本伺服器禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>若要對用戶實施禁用,請你選擇以下三種的拼合:名字,IP,或用戶id.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>若用用戶名字施行禁用,必須要填寫姓名.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>若用ip地址施行禁用,必須要寫下IP地址.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>若用用戶ID施行禁用,必須要寫下用戶ID.</translation>
     </message>
@@ -444,22 +381,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation>測試版</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>從發佈更新伺服器收不到回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>從發佈更新伺服器收不到有效的回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>從檔案更新伺服器收不到有效的回覆.</translation>
     </message>
@@ -467,32 +404,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>牌組</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>法力費用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>卡牌類別</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>力量/防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>顏色</translation>
     </message>
@@ -500,101 +437,96 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>和</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>或</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>和不是</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>或不是</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>種類</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>顏色</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>詞語</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>卡組</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>法力費用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>法力數值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>稀有度</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>力量</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>忠诚值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>賽制</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -602,22 +534,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation>卡圖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation>兩個都顯示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +557,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -648,294 +580,172 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation>有關牌名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation>不知名的牌</translation>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;移到</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;力量/防御力</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation>卡牌大小</translation>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它們的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>它們的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>它們的牌庫中</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌庫中</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>它們的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>它們的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它們的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它們的墳場</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的的墳場</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它們的放逐區</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的放逐區</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>它們的備牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的備牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它們的備牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的備牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -944,7 +754,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -952,60 +762,15 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1013,47 +778,47 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,97 +826,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +914,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1177,114 +932,109 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1042,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,227 +1050,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation>更改URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation>圖片網路緩存大小：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation>網路緩處再定向生存時間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation>圖片緩存大小：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
         <translation>添置新 URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation>移除 URL.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation>日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>更新中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation>選擇路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <source>URL Download Priority</source>
         <translation>URL下載優先次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <source>Download Spoilers Automatically</source>
         <translation>自動下載預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation>預覽位置:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>最後變更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <source>Delete Downloaded Images</source>
         <translation>刪除已下載的圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Reset Download URLs</source>
         <translation>重置下載URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>現不在螢光幕上記憶中圖片緩儲</translation>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation>數目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation>牌組</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>號碼</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>卡牌</translation>
     </message>
@@ -1528,12 +1245,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,17 +1258,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,7 +1276,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,62 +1284,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,166 +1347,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>不能分析從伺服器來的回覆</translation>
     </message>
@@ -1813,58 +1472,54 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>準備好</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation>強迫開始</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation>備牌解鎖</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1872,19 +1527,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1892,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>下載中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>已知主辦機</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation>刪除現選儲藏伺服器.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>從已知的伺服器更新伺服器列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>新主辦</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;主辦機:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>&amp;密碼:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;儲存密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>&amp;自動連接</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>當Cockatrice啓動時自動連接到最近的登錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>如在連接或註冊誰中遇到問題,請聯絡伺服器職員尋求援助!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>網頁</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>重設密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation>密碼忘記了?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>連接</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>登錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>伺服器聯絡人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>連接伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>伺服器URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>通信端口</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>獨特伺服器名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>連接警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>你必須將你的連接簡介命名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>連接警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>玩家名稱不能空置</translation>
     </message>
@@ -2041,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>&amp;記住設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;描述:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>玩家:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>遊戲類型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;密碼:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>只容許&amp;好友加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>只容許&amp;註冊用戶加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>加入條件</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>允許觀看者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>觀看者&amp;需要密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>觀看者可以&amp;聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>觀看者可見&amp;手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>以旁觀者的身份創建遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>觀看者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation>開始生命總數</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation>遊戲設定選擇</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;清除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>創建遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>遊戲資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>伺服器出現錯誤.</translation>
     </message>
@@ -2164,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;名稱：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;顏色：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>藍色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>黑色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>紅色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>綠色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;力量/防御力:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;註釋：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;此令牌離場時會被摧毀</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>令牌資料</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>顯示&amp;所有令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>顯示本牌庫所有令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>從清單中選擇令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>派出令牌</translation>
     </message>
@@ -2262,53 +1907,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2316,40 +1961,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>未選擇圖像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>若要改變頭著,請選擇新的圖片.
 若要移除現有頭像, 請不要選擇新的圖片,直接確認.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>瀏覽...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>更改頭像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>打開圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>圖片文件（*.png *.jpg *.bmp格式）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>所選圖片不能使用。</translation>
     </message>
@@ -2357,17 +2002,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2375,38 +2020,38 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>舊密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>新密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>確認新密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>更改密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>你的密碼太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>新舊密碼不一致</translation>
     </message>
@@ -2414,93 +2059,93 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;名稱：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>&amp;顏色：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>藍色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>黑色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>红色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>綠色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;力量/防御力:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;註釋：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>令牌資料</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>添加令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>移除令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>編輯自定令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>請輸入令牌名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>現時選擇的名字跟現有的卡牌或令牌出現衝突.請從&quot;牌組管理&quot;中啟動&apos;令牌牌組&apos;,保持正確顯示.</translation>
@@ -2509,27 +2154,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>電郵：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>國家：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>未定義</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>實名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>更改用戶資料</translation>
     </message>
@@ -2537,143 +2182,137 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>沒有限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5分鐘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10分鐘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30分鐘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1小時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2小時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;新過:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>遊戲 &amp;描述:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;創建者名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>&amp;遊戲類型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>&amp;至少:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>&amp;最多：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>可容納玩家最高數量</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>只顯示容許&amp;觀看者 觀看的遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>顯示有觀看者&amp;密碼保護的遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>只顯示容許觀看者&amp;聊天的遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>只顯示容許觀看者看&amp;手牌 的遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation>觀看者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>篩選遊戲</translation>
     </message>
@@ -2681,52 +2320,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation>重設密碼驗證警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>程序出現故障,請再要求新的密碼.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation>請輸入需要新密碼的伺服器和相關戶口資料.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;主辦機:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>電郵：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation>重設密碼驗證</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation>重設密碼驗證錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>電郵不能空置.</translation>
     </message>
@@ -2734,37 +2373,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation>請輸入需要新密碼的伺服器資料.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;主辦機:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation>重設密碼要求</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation>重設密碼錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>玩家名稱不能空置</translation>
     </message>
@@ -2772,86 +2411,86 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation>重設密碼警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>程序出現故障,請再要求新的密碼.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation>請輸入收到驗證碼和新的密碼,以便定立新的密碼.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;主辦機:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>驗證碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>新密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>重設密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>玩家名稱不能空置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation>重設密碼錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>驗證碼不能為空白</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>新密碼不能為空白</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation>你的新密碼太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>新舊密碼不一致.</translation>
     </message>
@@ -2859,7 +2498,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation>載入牌庫</translation>
     </message>
@@ -2867,146 +2506,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>牌表不能載入</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>載入牌庫</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation>在卡牌資料庫中找不到符合搜尋表達式的卡牌.你想繼續嗎?</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation>篩選無效</translation>
     </message>
@@ -3014,7 +2570,7 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>輸入你, 和你想登記的伺服器的資料.
@@ -3022,85 +2578,85 @@ Your email will be used to verify your account.</source>
 我們會使用你的電郵來核實你的戶口.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;主辦機:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>&amp;密碼:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>(再次)輸入密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>電郵：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>(再次)輸入電郵：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>國家：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>未定義</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>實名：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>註冊加入伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>注册警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>你的密碼太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>兩次輸入的密碼不一致，請重新輸入，</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>兩次輸入的電子郵箱不一致，請重新輸入。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>玩家名稱不能空置</translation>
     </message>
@@ -3108,17 +2664,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation>骰子面數:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation>骰子數目:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation>擲骰</translation>
     </message>
@@ -3126,55 +2682,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3191,7 +2732,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3208,7 +2749,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2762,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3229,7 +2770,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3238,7 +2779,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3254,59 +2795,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>外觀</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>用戶界面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation>卡牌來源</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>聲音</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>快捷键</translation>
     </message>
@@ -3314,39 +2855,39 @@ https://github.com/Cockatrice/Cockatrice/issues
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3354,17 +2895,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>下一個</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>上一個</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>每日提示</translation>
     </message>
@@ -3372,165 +2913,169 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>現在發行渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>重新安裝</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>取消下載</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>打開下載頁面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation>檢查客戶端更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>因為Cockatrice不設立ssl支援,所以你不能自動下載更新!
 請你瀏覽到我們的下載網頁進行人手更新.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>正在檢查更新...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>更新檢查已完成</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>沒有更新可用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice 已經達到最新版本!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>你運行的已經是最新的發行版本了。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>現行版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>現選發行渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>現有更新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Cockatrice有新版本可用！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>已發行</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>變更記載</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>你打算現在更新嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>更新出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>檢測更新時出現錯誤:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>下載更新時出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>安裝中</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice 不能啟動安裝程式</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>請你嘗試人手更新, 關掉cockatrice, 然後重開安裝程式.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>下載位置</translation>
     </message>
@@ -3538,162 +3083,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>關閉時清除紀錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>偵錯紀錄</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3701,47 +3114,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3749,44 +3162,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3794,7 +3201,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>輸入你的篩選類型</translation>
     </message>
@@ -3802,325 +3209,244 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>請先參加合適房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>密碼錯誤.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>這個遊戲不允許觀眾加入.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>這個遊戲已經滿了.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>這個遊戲已經不存在了。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>這個遊戲只開放給註冊用戶.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>這個遊戲只開放給房間主辦的好友。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>你被這個房間的主辦屏蔽了.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>加入遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>密碼:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>請先參加相關的房間.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;篩選遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>&amp;清除篩選項目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>&amp;創建</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>&amp;加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>&amp;作為觀看者加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation>顯示遊戲：%1/%2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>遊戲</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation>＞1日</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 小時</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation>新建</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 分鐘</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>僅限好友</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>僅限註冊用户</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>允許聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>查看手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>允許查看手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>不允許</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>時長</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>描述:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>創建者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>玩家</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>觀看者</translation>
     </message>
@@ -4128,1181 +3454,787 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>伺服器已達到最最高用戶限額，請另外選擇吉時再試.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>你的網路地址擁有太多同時連繫.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>你已被版主禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>預計結束時間: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>這是無限期禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>排期伺服器關機</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>不可用的用戶名。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>因為你已在另外的位置登入, 所以你現有的聯繫已被登出.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>連繫已被關閉</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>伺服器已經中斷你的聯繫/
 原因: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
         <translation><numerusform>伺服器將會在 %n 分鐘內重新啟動. 所有進行中的遊戲都會報銷.伺服器關閉原因: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>排期伺服器關機</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>註冊已成功。
 現在登入。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>戶口啟動已經成功
 現在登入.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>玩家人數</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>請輸入玩家人數</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>玩家 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>載入遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>關於Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice 網頁</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>項目經理：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>前項目經理：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>開發者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>我們的開發者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>協助開發！</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>翻譯者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>翻譯者名單</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>協助翻譯!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>支援:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>報告問題</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>排除故障</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>問答</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>伺服器超時</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>登入失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>你的客戶端似乎脫小本伺服器需要用來達成連繫的功能.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>請去&quot;求助-&gt;檢查客戶端更新&quot; 內更新你的客戶.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>用户名或密碼錯誤。請檢查賬號信息,然後重試。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>已經有在線用户正在使用這用户名.請先關閉連線,然後重新登入.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>你被禁止直到: %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>你已被永久封禁.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>本伺服器要求用戶註冊. 你想不想現在登記?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation>本伺服器要求用戶擁有客戶id. 你的客戶端現在不能造成客戶id,或是你正在使用修改過的客戶端.
 請你關掉現有的客戶端,然後重新啟動, 擇吉日再試。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>因為內部出現故障, 請關閉,重開Cockatrice 然後再次嘗試.
 如果故障繼續出現,請將客戶端軟件升級為最新版本, 有需要時請聯絡軟件開發人士.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>戶口啟動</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>你的戶口還未嘗啟動.
 你需要提供從啟動電郵得來的驗證碼.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>伺服器載滿</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>不知名登入錯誤: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 這通常意味住你的客戶端版本已經過期,引起你的客戶端不能明曉伺服器的回覆.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>您的用戶名字必須遵守以下規則：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>在%1 - %2个字符之间。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>可以 $1 包含細楷/小寫字母</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>並否</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>可以 $1 包含大楷/大寫字母</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>可以 $1 包含數字</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>可以包含以下符號：%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>第一個字符可以 %1 是標點符號</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation>在以下伺服器規矩中,道明不能接受的語言:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>不能含有以下字眼: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>不能含有以下語句: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>你的用戶名字只可以用以下的字符: A-Z, a-z, 0-9, _, ., 和 - .</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>註冊被拒絕</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>這伺服器暫時謝絕登記</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>這個用戶名字已經被使用.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>登記時必要指明合能用的電郵地址.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>你看來好像在本伺服器嘗試申請新戶口, 但是你已經有跟你電郵掛鉤的戶口名字.我們的伺服器限制每用戶在每個地址可以有多少個戶口. 如果需要更多援助或是得取你的登入資料,請聯絡伺服器辦事人.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>密碼太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>由於伺服器出現技術問題, 你的登記暫時失敗.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>不知名登記錯誤: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>戶口啟動失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>接口錯誤: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>你正在嘗試跟過時的伺服器連繫. 請把你的 Cockatrice 版本降級,或是連繫於合適的伺服器. 當地/離線版本維 %1, 遙距/上線版本維 %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>你的 Cockatrice 版本現已過時.請把你的版本更新. 
 當地/離線版本維 %1, 遙距/上線版本維 %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>向 %1 連接中...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>正在用%2的身份登記到%1伺服器...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>已經斷線了</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>連線成功, 在%1登入</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation>正在用%2的身份對%1要求遺忘密碼.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;連線...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;斷線</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>開始&amp;離線遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;觀看遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>&amp;全屏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;註冊加入伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;弄回密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>設置⋯</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;退出</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>&amp;動作</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;卡牌資料庫</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;管理牌組</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>編輯自定 &amp;令牌...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>打開自定圖片文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>打開自定牌组文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>添加自定卡组/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation>刷新卡牌資料庫</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;求助</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;關於Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;每日提示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>檢查客戶端更新</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation>檢查卡牌更新</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation>查看&amp;偵錯紀錄</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation>打開設置文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation>顯示/隱藏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice 已被安裝</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>卡牌資料庫</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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 +4243,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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>打開設置</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <source>New sets found</source>
         <translation>發現新卡组</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5342,17 +4274,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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>查看卡组</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>歡迎</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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 +4293,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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,862 +4362,668 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation>载入卡组/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <source>Selected file cannot be found.</source>
         <translation>找不到選擇的文件。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation>重設密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation>已經收到啟動要求,   請從你的電郵獲取啟動驗證碼.</translation>
     </message>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation> %1 收回在此遊戲降服.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>一張牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation>底部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation>頂部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation>遊戲已開始。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation>逆轉</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation>正常</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>正面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>翻面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation> %1 放回它們最後一張抽到的卡牌(%2).</translation>
     </message>
@@ -6293,206 +5031,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <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/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation>添加新信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation>移除信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation>聊天設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <source>Custom alert words</source>
         <translation>自定通知觸發詞語</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1451"/>
         <source>Enable chat mentions</source>
         <translation>允許聊天中提到某人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1452"/>
         <source>Enable mention completer</source>
         <translation>允許自動完成提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1453"/>
         <source>In-game message macros</source>
         <translation>遊戲內短信速鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <source>Invert text color</source>
         <translation>反轉文本顏色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <source>(Color is hexadecimal)</source>
         <translation>（顏色為16進制）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>將單詞以空格區分，僅支持字母.</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation>卡牌類型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation>法力數值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation>颜色(眾) </translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation>忠誠值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation>卡牌主類型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation>法力費用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation>力量/防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation>正面/底面</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation>佈局</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation>顏色身份</translation>
     </message>
@@ -6500,17 +5195,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation>可重疊卡牌:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation>重疊百分點</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation>重疊方向</translation>
     </message>
@@ -6518,62 +5213,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation>不知名階段</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation>重置步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation>維持步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation>抓牌步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation>第一主階步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation>開戰步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation>宣告進攻步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation>宣告阻擋步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation>戰鬥損害步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation>戰鬥結束步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation>第二主階步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation>結束/清理步</translation>
     </message>
@@ -6581,57 +5276,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>回合完結部</translation>
     </message>
@@ -6639,213 +5334,703 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>顯示牌庫頂牌(眾) </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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
+        <translation>卡牌數目：(最多可以是%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>&amp;查看墳區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>查看放逐區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>玩家 &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;墳區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;放逐區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>&amp;將手牌移到...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>&amp;牌庫頂</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>&amp;牌庫底</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>&amp;將墳場區的牌移到...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;手牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>&amp;將放逐區的卡移到</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>&amp;查看牌库</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation>&amp;查看手牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>檢視牌庫頂的牌(眾) </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>將牌庫展示給...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>&amp;一直展示牌庫頂牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>&amp;查看副牌庫</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;抽牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>&amp;抓牌(眾)⋯</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>&amp;撤銷最後抽牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>洗回手牌&amp;再抽</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>將牌庫頂牌&amp;面朝下使出</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation>將牌庫頂的牌置入&amp;墳墓區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation>將牌庫頂的牌置入&amp;放逐區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>將牌庫頂的牌(眾) 置入&amp;墳墓區...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>將牌庫頂的牌(眾) 置入&amp;放逐區...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>將牌庫頂牌放到牌庫&amp;底</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation>查看牌庫底(眾) 的牌...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation>將牌庫借給...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation>把頂牌放在重疊區, &amp;直到...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>將手牌&amp;展示給</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>將手牌&amp;隨機一張展示給...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation>將手牌隨機一張展示給...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>&amp;副牌庫</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;牌庫</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>&amp;數值物</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>%重置所有永久卡牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>&amp;擲骰子...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>&amp;派出令牌...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>&amp;再派出同一令牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>&amp;派出預定名牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>&amp;所有玩家</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>&amp;説</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation>&amp;全選</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation>&amp;選擇橫行</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation>&amp;選擇直行</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>&amp;使出</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>&amp;隱藏</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>&amp;面朝下使出</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation>&amp;横置/重置</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>切換&amp;正常重置</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation>&amp;反轉</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>&amp;查看卡牌正面</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>&amp;複製</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>&amp;结附到...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>取消&amp;結附</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>&amp;畫箭咀</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>&amp;增加力量</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>&amp;降低力量</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>&amp;增加防禦</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>&amp;降低防禦</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>&amp;增加力量和防御</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>&amp;降低力量和防御</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation>增加力量與降低防御</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation>降低力量與增加防御</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>設置&amp;力量和防禦為...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation>重置&amp;力量和防禦</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>&amp;設置注釋...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>&amp;增加指示物 (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;移除指示物 (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>&amp;設定指示物為(%1)...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation>&amp; 隨機順序置於牌庫頂</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation>牌庫頂下X張牌...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation>&amp; 不分次序地置於牌庫底</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>查看牌庫頂(眾) 的牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
         <source>View bottom cards of library</source>
-        <translation type="unfinished"/>
+        <translation>查看牌庫底(眾) 的牌</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
+        <translation>本卡牌進入戰場時應放哪種位置:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <source>(max. %1)</source>
-        <translation type="unfinished"/>
+        <translation>(最多維 %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation>起手</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation>0或以下的數目是比較於現在手牌數目</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>抓牌(眾)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>數目:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>將牌庫頂的牌(眾)置入墳場</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation>將牌庫&amp;頂牌(眾)展示給...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation>&amp;牌庫頂...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation>&amp;牌庫底...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation>&amp;永遠看到頂牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation>在套牌編輯&amp;打開牌庫檔案</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation>&amp;使出頂牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation>從牌庫底抽牌(單)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation>從牌庫底&amp;抽牌(眾)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation>&amp;使出底牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation>將牌庫底牌&amp;面朝下使出</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation>將牌庫底的牌(單) 置入&amp;墳場區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation>將牌庫底的牌置入&amp;放逐區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation>將牌庫底的牌(眾) 置入&amp;墳場區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation>將牌庫底的牌(眾) 置入&amp;放逐區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation>將牌庫牌底放到牌庫頂</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation>被選卡牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>將牌庫頂的牌(眾) 置入放逐區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation>將牌庫底的牌(眾) 置入墳場區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation>將牌庫底的牌(眾) 置入放逐區</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation>從牌庫底抽牌(眾) </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation>&amp;再派出同一%1令牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation>派出多個令牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation>把卡牌放著牌庫頂下X張牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change power/toughness</source>
-        <translation type="unfinished"/>
+        <translation>更改力量/防禦</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change stats to:</source>
-        <translation type="unfinished"/>
+        <translation>更改力防數據至:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player.cpp" line="3653"/>
         <source>Set annotation</source>
-        <translation type="unfinished"/>
+        <translation>設置注釋</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player.cpp" line="3654"/>
         <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
+        <translation>請輸入新的注釋:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation>設定指示物為</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <source>&amp;Counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingDisabledInfoWidget</name>
-    <message>
-        <location filename="src/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"/>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation>&amp;展示给...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation>查看關聯卡牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>令牌:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>所有令牌</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation>顯示關聯卡牌</translation>
     </message>
@@ -6853,7 +6038,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation>用排組名稱或代碼進行搜尋</translation>
     </message>
@@ -6861,17 +6046,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation>牌庫次序中上一張卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation>牌庫次序中下一張卡牌</translation>
     </message>
@@ -6879,132 +6064,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation>英文字母次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation>喜好</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation>由先倒後</translation>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>服務</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>隐藏 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>隱藏其他</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>全部展示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>喜好...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>退出%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>關於 %1</translation>
     </message>
@@ -7012,162 +6131,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatrice卡牌資料庫 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>所有檔案格式 (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice錄像文件 (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation>主牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation>副牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation>眾令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation>OK/確認</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation>全部保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation>打開</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation>&amp;是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation>&amp;全選是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation>&amp;否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation>&amp;全選否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation>重試</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation>不理</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation>棄牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation>協助</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation>應用</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation>重設</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation>恢復常用認值</translation>
     </message>
@@ -7175,17 +6267,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>上載時間</translation>
     </message>
@@ -7193,149 +6285,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>玩家(眾)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>選用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>開始時間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>維持(秒)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>房間(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>&amp;加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>許可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>玩家(眾)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation>從列表中選擇行動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation>按下以此行動設置的單鍵或組鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation>設置的單鍵或組鍵無效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation>捷鍵已被:&amp;使用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation>恢復常用認值</translation>
     </message>
@@ -7343,27 +6389,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>已啓用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>設置類型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>設置代碼</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>長名</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>發行日期</translation>
     </message>
@@ -7371,53 +6417,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <source>Restore all default shortcuts</source>
         <translation>恢復所有常用快鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <source>Clear all default shortcuts</source>
         <translation>清除所有常用快鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation>部分：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation>行動:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation>快鍵:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation>清除所有快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation>按快鍵名稱搜尋</translation>
     </message>
@@ -7425,12 +6471,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>行動</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>快鍵</translation>
     </message>
@@ -7438,14 +6484,14 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>您的配置檔案含有無效的快捷鍵.
 請檢查您的快捷鍵設定.</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>以下快捷鍵設置已經返回常用狀態：
@@ -7455,58 +6501,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>&amp;關閉原因:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;關閉倒數 (分鐘)：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>關閉伺服器</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <source>Enable &amp;sounds</source>
         <translation>啓用&amp;聲效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Current sounds theme:</source>
         <translation>現前聲效主題：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Test system sound engine</source>
         <translation>測試系統聲效引擎</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation>聲效設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>主音量</translation>
     </message>
@@ -7514,48 +6547,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation>預覽季節已結束</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>現在正刪除spoiler.xml。請啟動Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation>預覽下載出錯</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation>沒有網絡連接</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation>預覽已是最新</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation>沒有添加新預覽</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation>預覽已被更新</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation>最後變更：</translation>
     </message>
@@ -7563,27 +6596,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation>常用</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>從發佈更新伺服器收不到有效的回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>從發佈更新伺服器收不到有效的回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>未收到標籤更新伺服器的回應.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>從標籤更新伺服器收不到有效的回覆.</translation>
     </message>
@@ -7591,17 +6624,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -7609,289 +6642,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>管理</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>更新伺服器&amp;信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;關閉伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>&amp;重新載入設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>伺服器管理功能</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation>錄像ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation>給予遊戲錄像重溫瀏覽權</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation>將要啟動的用戶名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation>強制性啟動用戶</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>功能&amp;解鎖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>功能&amp;鎖定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation>已給予遊戲錄像重溫瀏覽權</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation>不能給予遊戲錄像重溫瀏覽權. Replay id無效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation>不能給予遊戲錄像重溫瀏覽權. 內部故障.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation>用戶已成功啟動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation>不能啟動用戶戶口.用戶名字無效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation>不能啟動用戶戶口.用戶已被啟動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation>不能啟動用戶戶口.內部故障</translation>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation>卡牌資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>篩選項目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>&amp;視圖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation>印刷版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>可見</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>浮動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
         <translation>重置布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>牌庫:%1</translation>
     </message>
@@ -7899,55 +6809,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7955,22 +6878,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7978,138 +6901,138 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>本地檔案系統</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>伺服器牌庫儲藏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>在套牌編輯打開</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>上載牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>下载套牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>新文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation>打開牌庫文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation>無效牌庫檔案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>輸入牌庫名稱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>本牌庫列表未有名稱.請輸入名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>未命名牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation>牌庫上載於伺服器時失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>删除本地檔案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>你確定要刪除被選檔案(眾)嗎 ？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <source>Delete remote decks</source>
         <translation>刪除伺服器上的牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>新建文件夾名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8117,17 +7040,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8135,7 +7058,7 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8143,391 +7066,407 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation>錄像時間線</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>階段</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <source>Next &amp;phase</source>
         <translation>下個&amp;階段</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <source>Next &amp;turn</source>
         <translation>下個&amp;回合</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="236"/>
         <source>Reverse turn order</source>
         <translation>逆轉回合次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <source>Game &amp;information</source>
         <translation>遊戲&amp;資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation>&amp;投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <source>&amp;Leave game</source>
         <translation>&amp;離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;聚焦聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>&amp;説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>&amp;視圖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>可見</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>浮動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation>重置布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation>撤銷投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation>你正在刷屏。請稍等幾秒鐘。</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>被遊戲主機或版主踢出</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>玩家已經離開遊戲</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>玩家與伺服器斷線</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation>原因不明</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出遊戲。</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>時間；發送者姓名；發送者IP；信息；目標ID；目標姓名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>房間記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>遊戲記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>聊天記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>您必須選擇至少一個過濾項.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>您必須選擇一個可用的日數來作為定位.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>用戶名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>IP地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>遊戲名稱：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>遊戲ID：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>主房</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>遊戲房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>私人聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>過去 X 天：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>今天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>1小時前</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>最多結果:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>至少需要1個篩選項。
 您輸入的信息越多，找到結果越準確。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>獲取用戶記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>清除篩選項目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>篩選項目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>記錄位置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>日期範圍</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>最多結果</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>信息歷史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>不能獲取信息歷史消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>沒有符合篩選條件的信息。</translation>
     </message>
@@ -8535,37 +7474,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>私人&amp;聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;離開</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - 私人聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>你已被這用戶屏蔽, 它們不能再主聊天室看見你的信息,你亦不能參加它們的遊戲.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>私人信息信到, 来自</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 已離開伺服器.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 已加入伺服器.</translation>
     </message>
@@ -8573,185 +7512,105 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>本地檔案系統</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>伺服器錄像倉庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>觀看遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation>改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation>新文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation>打開錄像文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>下載遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>過期鎖定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation>本地檔案夾改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation>本地檔案改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation>新名稱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation>出錯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation>改名不成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation>新建文件夾名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>刪除本地檔案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>你確定要剷除所有被選的檔案嗎?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>你確定要刪除被選錄像檔案嗎 ？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>刪除伺服器錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -8759,47 +7618,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>&amp;離開房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>&amp;清除聊天記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>聊天設置...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation>提到了你。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>點擊查看</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>你正在刷屏。請稍等幾秒鐘。</translation>
     </message>
@@ -8807,35 +7666,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation>加入伺服器房間失敗：在本伺服器上這房間並不存在。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation>伺服器認為你在房間內, 但Cockatrice無法顯示。請重新啓動Cockatrice。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation>你未被允許進入該房間。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation>因為以下不知名的錯誤,所以不能參入伺服器房間: %1.</translation>
     </message>
@@ -8843,97 +7702,87 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>你確定嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>遊戲還在繼續, 你確定要退出嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation>點擊查看</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>你的好友%1已登錄!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>不知名事件</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8944,38 +7793,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 要升級你的客户端，請點擊“幫助”-&gt;“檢查更新”</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation>閒置超時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>你即將因為長時間沒有活動而被退出。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>升級</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation>你已被升級.請登出然後再登入讓本更改生效.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>被警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>你由於$1 原因,現在接受警告. 請避免繼續本行為, 否則你將有可能會接受進一步的警誡或懲罰. 若有任何疑問, 請私信我們門下的版主.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>你收到松本伺服器發出的以下訊息(類似本信息的自定訊息可能未經翻譯)</translation>
@@ -8984,12 +7833,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -8997,13 +7841,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>不能分析本牌庫.</translation>
     </message>
@@ -9011,14 +7855,14 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>檔案並不存在.
 </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>不能開啟檔案.
@@ -9028,42 +7872,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>生命值</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>藍色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>黑色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>紅色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>綠色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>其他</translation>
     </message>
@@ -9071,7 +7915,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>無法打開文件。</translation>
     </message>
@@ -9079,206 +7923,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>用户&amp;詳細信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>私人&amp;聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>顯示這個用户的&amp;遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>加入到&amp;好友列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>從&amp;好友列表移除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>加入到&amp;屏蔽列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>從&amp;屏蔽列表移除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>從&amp;遊戲中踢出</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>警告用戶</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>查看用户警告记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>把用戶從&amp;伺服器禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>查看用户&amp;禁止記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>升$用戶作為版主</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>把&amp;用戶從版主降級</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation>把&amp;用戶升級成裁判</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation>把&amp;用戶從裁判降級</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation>閱讀管理筆記</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <source>This user does not exist.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>%1 的遊戲(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>禁用歷史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>禁止時間；版主；禁止時長；禁止理由；可見理由</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>用戶從未被禁</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation>不能獲取禁用訊息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>警告歷史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>警告時間；版主；用戶名稱；理由</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>用戶從未接收警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation>不能獲取警告信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation>不能獲取管理筆記</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>用戶升級成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>用戶降級成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>用戶升級失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>用戶降級失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation>把哈希覆印到用戶剪貼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation>移除這用戶訊息</translation>
     </message>
@@ -9286,173 +8108,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>位置：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>帳戶年齡</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>更改</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>更改密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>更改頭像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>管理員</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>版主</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>登記用戶</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>未登記用戶</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation>裁判</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>不知名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation>輸入密碼跟你戶口不匹配</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>用戶資訊已更新。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation>用戶資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation>實名：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation>用戶等級:</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation><numerusform>%n年(眾) ，</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation><numerusform>%10%n日(眾)  %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>輸入密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation>要核實密碼才能更改你的電郵地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation>在嘗試更新你的用戶信息時出現錯誤.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>本伺服器不容許你更新你的用戶資訊.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>密碼已更改</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>本伺服器不容許你更改密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>新的密碼太短</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>舊的密碼不正確</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>頭像已更新。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>本伺服器不容許你更新你的頭像.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>在更新你頭像時出現錯誤</translation>
     </message>
@@ -9460,152 +8282,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <source>General interface settings</source>
         <translation>一般通用接口設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation>通告設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <source>Enable notifications in taskbar</source>
         <translation>開啓任務欄通告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation>動畫設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation>重播設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>用速鍵啟動向後跳的緩衝時間:</translation>
     </message>
@@ -9613,241 +8420,86 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9855,27 +8507,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9883,7 +8535,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/client/ui/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 +8543,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9911,37 +8563,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9949,93 +8591,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10043,25 +8637,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10069,52 +8684,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10122,7 +8732,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10130,22 +8740,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10153,17 +8763,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10171,43 +8781,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>你想發出那種警告？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>把這用戶在所有房間留下的訊息刪除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>&amp;確認</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>對行為不當的用戶發出警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>接收警告的用戶名稱不能空白.請定好要接收警告的用戶名字.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>警告名稱不能留空. 請選擇有效的警告.</translation>
     </message>
@@ -10215,133 +8825,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation>常用次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Enable all sets</source>
         <translation>啟用所有牌組</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="113"/>
         <source>Disable all sets</source>
         <translation>禁用所有卡组</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation>牌庫編輯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation>卡牌藝術</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation>筆記</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation>管理牌組</translation>
     </message>
@@ -10349,72 +8959,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>棟疊觀看</translation>
     </message>
@@ -10422,7 +9032,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation type="unfinished"/>
     </message>
@@ -10430,12 +9040,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation>啟動時自動連接</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation>偵錯紀錄寫進檔案</translation>
     </message>
@@ -10443,1058 +9053,991 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>主視窗</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>牌庫編輯</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>遊戲廳堂</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation>牌指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation>玩家指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>力量和防御力</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>遊戲階段</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>遊戲區域</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation>移動所選牌張</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>查看</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation>移動頂牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation>移動底牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation>抽牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation>聊天室</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation>遊戲視窗</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation>從剪貼板載入牌庫</translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation>遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation>檢查卡牌更新</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation>連線</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>斷開連線</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>全屏</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation>註冊...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation>設定...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation>開始離線遊戲</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation>觀看錄像</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation>清除所有篩選項目</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation>清除所選的篩選項目</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation>移除卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation>管理牌組</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation>編輯自定眾令牌...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation>添加卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation>載入牌庫...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation>從剪貼板載入牌庫</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation>創建新牌庫</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation>打開自定圖片文件夾</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation>印刷牌庫</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation>刪除卡牌</translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation>重置佈局</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>保存牌庫</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation>牌庫另存為</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>從剪貼板儲藏牌庫, 帶注釋</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation>從剪貼板儲藏牌庫</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation>從自身檔案載入牌庫</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation>載入伺服器上的牌庫...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation>設定準備開始</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation>切換副牌庫鎖</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation>增加綠色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation>移除綠色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation>設定綠色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation>增加红色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation>移除紅色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation>設定紅色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation>增加生命指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation>移除生命指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation>設定生命指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation>增加白色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation>移除白色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation>設定白色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation>增加藍色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation>移除藍色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation>設定藍色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation>增加黑色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation>移除黑色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation>設定黑色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation>增加無色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation>移除無色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation>設定無色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation>增加其他指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation>移除其他指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation>設定其他指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation>增加力量(+1/+0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation>削減力量(-1/-0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>防禦移到力量（+1/-1）</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>增加防御(+0/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>削減防御(-0/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>力量移到防禦（-1/+1）</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>增加力量和防御(+1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>削減力量和防御(-1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation>設置力量和防禦</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation>重置力量和防御</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>重置</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>維持</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>抽牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation>第一主階段</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation>開始戰鬥</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>攻擊</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>擋格</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>計算損害</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation>戰鬥结束</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation>第二主階段</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>完結</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation>下個階段</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation>下個行動階段</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation>下一回合</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation>從揭露視窗中隱藏這牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation>横置/重置這牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation>重置全牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
+        <translation>鎖定重置狀態</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation>反轉本牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation>查看卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation>使出本牌</translation>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation>结附牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation>解除牌结附</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation>複製卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation>派出令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
         <translation>派出所有相關令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
         <translation>再做另外令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation>記下註解</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <source>Select All Cards in Zone</source>
         <translation>選擇所有在區域的牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="527"/>
         <source>Select All Cards in Row</source>
         <translation>選擇所有橫行牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation>選擇所有直行牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation>牌庫頂</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation>戰場，面朝下</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation>戰場</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>牌庫</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>副牌庫</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation>排副多張頂牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation>排副多張底牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation>關閉最近查看</translation>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation>找到以下牌前全送疊區</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
         <translation>從牌庫底抽一張牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>從牌庫底抽超過一張牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation>畫箭咀</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation>清除自設箭咀</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation>擲骰</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation>洗牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>再調度</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
         <translation>抽一張牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
         <translation>抽超過一張牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation>撤銷抽牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
         <translation>永遠顯示頂牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
         <translation>永遠看到頂牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
         <translation>視角順時針轉</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
         <translation>視角逆時針轉</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
         <translation>取消聚焦文本框</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation>聚焦聊天</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation>掃清聊天</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation>刷新</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation>跳前</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation>跳後</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <source>Skip Forward by a lot</source>
         <translation>向前大跳</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/settings/shortcuts_settings.h" line="692"/>
         <source>Skip Backward by a lot</source>
         <translation>向後大跳</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation>播放/暫停</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation>切換快進</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <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..55092bab7 100644
--- a/cockatrice/translations/cockatrice_zh-Hans.ts
+++ b/cockatrice/translations/cockatrice_zh-Hans.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;设置指示物</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
         <source>Set counter</source>
         <translation>设置指示物</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>数值物新价值为 &apos;%1&apos;</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,81 +36,79 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="244"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="273"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="274"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="358"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="380"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="327"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="359"/>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="381"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="365"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="394"/>
         <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/client/tabs/abstract_tab_deck_editor.cpp" line="479"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
+        <location filename="src/client/tabs/abstract_tab_deck_editor.cpp" line="491"/>
+        <source>No deck was selected to be exported.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="293"/>
         <source>Update Notes</source>
         <translation>更新后笔记</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="306"/>
         <source>Admin Notes for %1</source>
         <translation>%1 的管理笔记</translation>
     </message>
@@ -118,12 +116,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="37"/>
         <source>Mainboard</source>
         <translation>主牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
+        <location filename="src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="40"/>
         <source>Sideboard</source>
         <translation>副牌库</translation>
     </message>
@@ -131,312 +129,251 @@ 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"/>
-        <source> seconds</source>
-        <translation>秒</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="618"/>
         <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/dialogs/dlg_settings.cpp" line="656"/>
         <source>Theme settings</source>
         <translation>主题设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="657"/>
         <source>Current theme:</source>
         <translation>现在主题</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="658"/>
         <source>Open themes folder</source>
         <translation>打开主题文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="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/dialogs/dlg_settings.cpp" line="660"/>
         <source>Menu settings</source>
         <translation>选单设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="661"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>在右击选单中显示键盘快速键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <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/dialogs/dlg_settings.cpp" line="663"/>
         <source>Card rendering</source>
         <translation>卡面算绘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="664"/>
         <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/dialogs/dlg_settings.cpp" line="665"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>将打横佈局卡片自动向上旋转</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
-        <translation type="unfinished"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="667"/>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]</source>
+        <translation>将所有牌面艺术硬性改成本人喜好牌组[须重新啟动客端软件]</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="670"/>
         <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/dialogs/dlg_settings.cpp" line="671"/>
         <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/dialogs/dlg_settings.cpp" line="672"/>
         <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/dialogs/dlg_settings.cpp" line="674"/>
         <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/dialogs/dlg_settings.cpp" line="675"/>
         <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/dialogs/dlg_settings.cpp" line="676"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="678"/>
         <source> rows</source>
         <translation>横列</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="677"/>
         <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/dialogs/dlg_settings.cpp" line="680"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="684"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="687"/>
         <source>Hand layout</source>
         <translation>手牌佈局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="688"/>
         <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/dialogs/dlg_settings.cpp" line="689"/>
         <source>Enable left justification</source>
         <translation>啟用向左对齐</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="691"/>
         <source>Table grid layout</source>
         <translation>表格布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="692"/>
         <source>Invert vertical coordinate</source>
         <translation>反转垂直坐标</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="693"/>
         <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/dialogs/dlg_settings.cpp" line="694"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>卡牌上显示的最大字体大小</translation>
     </message>
 </context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation>卡牌主题</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation>随机卡牌：艺术取料</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="38"/>
         <source>ban &amp;user name</source>
         <translation>禁用 &amp;用家名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="42"/>
         <source>ban &amp;IP address</source>
         <translation>禁用&amp;IP地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="46"/>
         <source>ban client I&amp;D</source>
         <translation>禁用客户ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="60"/>
         <source>Ban type</source>
         <translation>禁用类型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="63"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;永久禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="64"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;暂时禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="67"/>
         <source>&amp;Days:</source>
         <translation>&amp;日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="73"/>
         <source>&amp;Hours:</source>
         <translation>&amp;小时</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="79"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;分鐘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="94"/>
         <source>Duration of the ban</source>
         <translation>禁用时间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="97"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>请记载禁用原因
 这项只保留为版主, 被禁用户不能看到.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="102"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>请记载被禁用户能看到的被禁原因.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="105"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>将这用户所有室中打出的讯息完全移除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="107"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="110"/>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="129"/>
         <source>Ban user from server</source>
         <translation>把用户从本伺服器禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="219"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="226"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="234"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="212"/>
         <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
         <translation>若要对用户实施禁用,请你选择以下叁种的拼合:名字,IP,或用户id.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation>若用用户名字施行禁用,必须要填写姓名.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="227"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation>若用ip地址施行禁用,必须要写下IP地址.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="235"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation>若用用户ID施行禁用,必须要写下用户ID.</translation>
     </message>
@@ -444,22 +381,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/release_channel.cpp" line="210"/>
         <source>Beta</source>
         <translation>测试版</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/release_channel.cpp" line="236"/>
         <source>No reply received from the release update server.</source>
         <translation>从发佈更新伺服器收不到回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/release_channel.cpp" line="245"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>从发佈更新伺服器收不到有效的回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/release_channel.cpp" line="278"/>
         <source>No reply received from the file update server.</source>
         <translation>从档案更新伺服器收不到有效的回覆.</translation>
     </message>
@@ -467,32 +404,32 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="71"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="73"/>
         <source>Sets</source>
         <translation>牌组</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="75"/>
         <source>Mana cost</source>
         <translation>法力费用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="77"/>
         <source>Card type</source>
         <translation>卡牌类别</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="79"/>
         <source>P/T</source>
         <translation>力量/防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
+        <location filename="src/game/cards/card_database_model.cpp" line="81"/>
         <source>Color(s)</source>
         <translation>顏色</translation>
     </message>
@@ -500,101 +437,96 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
+        <location filename="src/game/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>和</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
+        <location filename="src/game/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>或</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
+        <location filename="src/game/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>和不是</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
+        <location filename="src/game/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>或不是</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
+        <location filename="src/game/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
+        <location filename="src/game/filters/filter_card.cpp" line="64"/>
         <source>Type</source>
         <translation>种类</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
+        <location filename="src/game/filters/filter_card.cpp" line="66"/>
         <source>Color</source>
         <translation>顏色</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
+        <location filename="src/game/filters/filter_card.cpp" line="68"/>
         <source>Text</source>
         <translation>词语</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
+        <location filename="src/game/filters/filter_card.cpp" line="70"/>
         <source>Set</source>
         <translation>卡组</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
+        <location filename="src/game/filters/filter_card.cpp" line="72"/>
         <source>Mana Cost</source>
         <translation>法力费用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
+        <location filename="src/game/filters/filter_card.cpp" line="74"/>
         <source>Mana Value</source>
         <translation>法力数值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
+        <location filename="src/game/filters/filter_card.cpp" line="76"/>
         <source>Rarity</source>
         <translation>稀有度</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
+        <location filename="src/game/filters/filter_card.cpp" line="78"/>
         <source>Power</source>
         <translation>力量</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
+        <location filename="src/game/filters/filter_card.cpp" line="80"/>
         <source>Toughness</source>
         <translation>防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
+        <location filename="src/game/filters/filter_card.cpp" line="82"/>
         <source>Loyalty</source>
         <translation>忠诚值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
+        <location filename="src/game/filters/filter_card.cpp" line="84"/>
         <source>Format</source>
         <translation>赛制</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
+        <location filename="src/game/filters/filter_card.cpp" line="86"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
+        <location filename="src/game/filters/filter_card.cpp" line="88"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -602,22 +534,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoFrameWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="70"/>
         <source>Image</source>
         <translation>卡图</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="71"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="72"/>
         <source>Both</source>
         <translation>两个都显示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
+        <location filename="src/client/ui/widgets/cards/card_info_frame_widget.cpp" line="75"/>
         <source>View transformation</source>
         <translation type="unfinished"/>
     </message>
@@ -625,22 +557,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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="372"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <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/client/ui/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
+        <location filename="src/client/ui/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -648,294 +580,172 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardInfoTextWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="39"/>
         <source>Name:</source>
         <translation>名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="52"/>
         <source>Related cards:</source>
         <translation>有关牌名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/cards/card_info_text_widget.cpp" line="69"/>
         <source>Unknown card:</source>
         <translation>不知名的牌</translation>
     </message>
 </context>
 <context>
-    <name>CardMenu</name>
+    <name>CardItem</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="87"/>
+        <source>&amp;Move to</source>
+        <translation>&amp;移到</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </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 type="unfinished"/>
-    </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"/>
-        <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"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/board/card_item.cpp" line="88"/>
+        <source>&amp;Power / toughness</source>
+        <translation>&amp;力量/防御力</translation>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
+        <location filename="src/client/ui/widgets/cards/card_size_widget.cpp" line="21"/>
         <source>Card Size</source>
         <translation>卡牌大小</translation>
     </message>
 </context>
 <context>
-    <name>CardZoneLogic</name>
+    <name>CardZone</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它们的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
+        <location filename="src/game/zones/card_zone.cpp" line="63"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone.cpp" line="67"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>它们的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
+        <location filename="src/game/zones/card_zone.cpp" line="68"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
+        <location filename="src/game/zones/card_zone.cpp" line="70"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>它们的牌库中</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
+        <location filename="src/game/zones/card_zone.cpp" line="71"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌库中</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
+        <location filename="src/game/zones/card_zone.cpp" line="73"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>它们的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone.cpp" line="74"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>它们的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
+        <location filename="src/game/zones/card_zone.cpp" line="76"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它们的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone.cpp" line="78"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它们的坟场</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone.cpp" line="81"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的的坟场</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它们的放逐区</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <location filename="src/game/zones/card_zone.cpp" line="83"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的放逐区</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone.cpp" line="87"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>它们的备牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone.cpp" line="88"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的备牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
+        <location filename="src/game/zones/card_zone.cpp" line="90"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它们的备牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <location filename="src/game/zones/card_zone.cpp" line="91"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的备牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
+        <location filename="src/game/zones/card_zone.cpp" line="96"/>
         <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/card_zone.cpp" line="97"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -944,7 +754,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_3.cpp" line="69"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -952,60 +762,15 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
+        <location filename="src/game/cards/card_database_parser/cockatrice_xml_4.cpp" line="71"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -1013,47 +778,47 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="36"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="194"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="195"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="196"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="198"/>
+        <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"/>
-        <source>Show on EDHRec (Card)</source>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="202"/>
+        <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="247"/>
         <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/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="248"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1061,97 +826,87 @@ 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"/>
-        <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="93"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="112"/>
         <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/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="572"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="589"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="591"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="592"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="593"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="594"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="595"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="596"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="597"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="600"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
+        <location filename="src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1159,17 +914,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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <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/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1177,114 +932,109 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="147"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="148"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="149"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="150"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="151"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="153"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="155"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="157"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="158"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="162"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="159"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="164"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="161"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="163"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="165"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="167"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="169"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="170"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="171"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="172"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="173"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <location filename="src/client/menus/deck_editor/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1292,7 +1042,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/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1300,227 +1050,194 @@ 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/dialogs/dlg_settings.cpp" line="1160"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1223"/>
         <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/dialogs/dlg_settings.cpp" line="1054"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1090"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1054"/>
         <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/dialogs/dlg_settings.cpp" line="1090"/>
         <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/dialogs/dlg_settings.cpp" line="1093"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1093"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
         <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/dialogs/dlg_settings.cpp" line="1100"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1120"/>
         <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/dialogs/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1225"/>
         <source>Edit URL</source>
         <translation>更改URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1217"/>
         <source>Network Cache Size:</source>
         <translation>图片网路缓存大小：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1219"/>
         <source>Redirect Cache TTL:</source>
         <translation>网路缓处再定向生存时间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1220"/>
         <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/dialogs/dlg_settings.cpp" line="1221"/>
         <source>Picture Cache Size:</source>
         <translation>图片缓存大小：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1224"/>
         <source>Add New URL</source>
         <translation>添置新 URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1226"/>
         <source>Remove URL</source>
         <translation>移除 URL.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1227"/>
         <source>Day(s)</source>
         <translation>日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1149"/>
         <source>Updating...</source>
         <translation>更新中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1179"/>
         <source>Choose path</source>
         <translation>选择路径</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1205"/>
         <source>URL Download Priority</source>
         <translation>URL下载优先次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1206"/>
         <source>Spoilers</source>
         <translation>预览</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1207"/>
         <source>Download Spoilers Automatically</source>
         <translation>自动下载预览</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1208"/>
         <source>Spoiler Location:</source>
         <translation>预览位置:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1209"/>
         <source>Last Change</source>
         <translation>最后变更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1210"/>
         <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/dialogs/dlg_settings.cpp" line="1211"/>
         <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/dialogs/dlg_settings.cpp" line="1212"/>
         <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/dialogs/dlg_settings.cpp" line="1213"/>
         <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/dialogs/dlg_settings.cpp" line="1214"/>
         <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/dialogs/dlg_settings.cpp" line="1215"/>
         <source>Delete Downloaded Images</source>
         <translation>删除已下载的图片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1216"/>
         <source>Reset Download URLs</source>
         <translation>重置下载URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1218"/>
         <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/dialogs/dlg_settings.cpp" line="1222"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation>现不在萤光幕上记忆中图片缓储</translation>
     </message>
 </context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
+        <location filename="src/deck/deck_list_model.cpp" line="199"/>
         <source>Count</source>
         <translation>数目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
+        <location filename="src/deck/deck_list_model.cpp" line="203"/>
         <source>Set</source>
         <translation>牌组</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
+        <location filename="src/deck/deck_list_model.cpp" line="205"/>
         <source>Number</source>
         <translation>号码</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
+        <location filename="src/deck/deck_list_model.cpp" line="207"/>
         <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="src/deck/deck_list_model.cpp" line="201"/>
         <source>Card</source>
         <translation>卡牌</translation>
     </message>
@@ -1528,12 +1245,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/deck/deck_loader.cpp" line="22"/>
         <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/deck/deck_loader.cpp" line="22"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,17 +1258,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1559,7 +1276,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"/>
     </message>
@@ -1567,62 +1284,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
         <source>Deck Tags Manager</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -1630,166 +1347,108 @@ 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/client/ui/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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="321"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="324"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="331"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="333"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="335"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="337"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="339"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="341"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="346"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="348"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="363"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="381"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="401"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="414"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="428"/>
         <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/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="436"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="23"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
+        <location filename="src/deck/deck_stats_interface.cpp" line="35"/>
         <source>The reply from the server could not be parsed.</source>
         <translation>不能分析从伺服器来的回覆</translation>
     </message>
@@ -1813,58 +1472,54 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
+        <source>Unload deck</source>
+        <oldsource>Unload deck...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>準备好</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Force start</source>
         <translation>强迫开始</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="194"/>
         <source>Sideboard unlocked</source>
         <translation>备牌解锁</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="196"/>
         <source>Sideboard locked</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="279"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="265"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="277"/>
         <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="265"/>
         <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="277"/>
         <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="329"/>
         <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="331"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1872,19 +1527,19 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DialogConvertDeckToCodFormat</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
         <source>Deck Format Conversion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
         <source>You tried to add a tag to a .txt format deck.
  Tags can only be added to .cod format decks.
  Do you want to convert the deck to the .cod format?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"/>
     </message>
@@ -1892,148 +1547,148 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgConnect</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
+        <location filename="src/dialogs/dlg_connect.h" line="74"/>
         <source>Downloading...</source>
         <translation>下载中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation>已知主办机</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation>删除现选储藏伺服器.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="34"/>
         <source>Refresh the server list with known public servers</source>
         <translation>从已知的伺服器更新伺服器列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation>新主办</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation>名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation>&amp;主办机:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation>&amp;密码:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation>&amp;储存密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</source>
         <translation>&amp;自动连接</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="76"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>当Cockatrice启动时自动连接到最近的登录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="92"/>
         <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
         <translation>如在连接或註册谁中遇到问题,请联络伺服器职员寻求援助!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="289"/>
         <source>Webpage</source>
         <translation>网页</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>重设密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation>密码忘记了?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation>连接</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation>登录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation>伺服器联络人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation>连接伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="303"/>
         <source>Server URL</source>
         <translation>伺服器URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="306"/>
         <source>Communication Port</source>
         <translation>通信端口</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="311"/>
         <source>Unique Server Name</source>
         <translation>独特伺服器名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>Connection Warning</source>
         <translation>连接警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="337"/>
         <source>You need to name your new connection profile.</source>
         <translation>你必须将你的连接简介命名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>Connect Warning</source>
         <translation>连接警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
+        <location filename="src/dialogs/dlg_connect.cpp" line="352"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>玩家名称不能空置</translation>
     </message>
@@ -2041,122 +1696,112 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateGame</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="25"/>
         <source>Re&amp;member settings</source>
         <translation>&amp;记住设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="26"/>
         <source>&amp;Description:</source>
         <translation>&amp;描述:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="31"/>
         <source>P&amp;layers:</source>
         <translation>玩家:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="43"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="56"/>
         <source>Game type</source>
         <translation>游戏类型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="59"/>
         <source>&amp;Password:</source>
         <translation>&amp;密码:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="64"/>
         <source>Only &amp;buddies can join</source>
         <translation>只容许&amp;好友加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="65"/>
         <source>Only &amp;registered users can join</source>
         <translation>只容许&amp;註册用户加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="79"/>
         <source>Joining restrictions</source>
         <translation>加入条件</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="82"/>
         <source>&amp;Spectators can watch</source>
         <translation>允许观看者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="85"/>
         <source>Spectators &amp;need a password to watch</source>
         <translation>观看者&amp;需要密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="86"/>
         <source>Spectators can &amp;chat</source>
         <translation>观看者可以&amp;聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="87"/>
         <source>Spectators can see &amp;hands</source>
         <translation>观看者可见&amp;手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="88"/>
         <source>Create game as spectator</source>
         <translation>以旁观者的身份创建游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="95"/>
         <source>Spectators</source>
         <translation>观看者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="98"/>
         <source>Starting life total:</source>
         <translation>开始生命总数</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="108"/>
         <source>Game setup options</source>
         <translation>游戏设定选择</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="158"/>
         <source>&amp;Clear</source>
         <translation>&amp;清除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="164"/>
         <source>Create game</source>
         <translation>创建游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="209"/>
         <source>Game information</source>
         <translation>游戏资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
+        <location filename="src/dialogs/dlg_create_game.cpp" line="295"/>
         <source>Server error.</source>
         <translation>伺服器出现错误.</translation>
     </message>
@@ -2164,97 +1809,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;名称：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;顏色：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>蓝色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>黑色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>红色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>绿色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>无色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;力量/防御力:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;註释：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;此令牌离场时会被摧毁</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>令牌资料</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>显示&amp;所有令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>显示本牌库所有令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="132"/>
         <source>Choose token from list</source>
         <translation>从清单中选择令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
+        <location filename="src/dialogs/dlg_create_token.cpp" line="150"/>
         <source>Create token</source>
         <translation>派出令牌</translation>
     </message>
@@ -2262,53 +1907,53 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="46"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="71"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="119"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="118"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="90"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_default_tags_editor.cpp" line="101"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2316,40 +1961,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>No image chosen.</source>
         <translation>未选择图像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>若要改变头着,请选择新的图片.
 若要移除现有头像, 请不要选择新的图片,直接确认.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="24"/>
         <source>Browse...</source>
         <translation>瀏览...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="41"/>
         <source>Change avatar</source>
         <translation>更改头像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Open Image</source>
         <translation>打开图片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>图片文件（*.png *.jpg *.bmp格式）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_edit_avatar.cpp" line="65"/>
         <source>Invalid image chosen.</source>
         <translation>所选图片不能使用。</translation>
     </message>
@@ -2357,17 +2002,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/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2375,38 +2020,38 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>旧密码：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>新密码：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>确认新密码：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>更改密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>你的密码太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
+        <location filename="src/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>新旧密码不一致</translation>
     </message>
@@ -2414,93 +2059,93 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation>&amp;名称：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</source>
         <translation>&amp;顏色：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="35"/>
         <source>white</source>
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="36"/>
         <source>blue</source>
         <translation>蓝色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="37"/>
         <source>black</source>
         <translation>黑色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="38"/>
         <source>red</source>
         <translation>红色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="39"/>
         <source>green</source>
         <translation>绿色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation>无色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation>&amp;力量/防御力:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;註释：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation>令牌资料</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation>添加令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation>移除令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation>编辑自定令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation>请输入令牌名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="156"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
+        <location filename="src/dialogs/dlg_edit_tokens.cpp" line="157"/>
         <source>The chosen name conflicts with an existing card or token.
 Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
         <translation>现时选择的名字跟现有的卡牌或令牌出现衝突.请从&quot;牌组管理&quot;中啟动&apos;令牌牌组&apos;,保持正确显示.</translation>
@@ -2509,27 +2154,27 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgEditUser</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="14"/>
         <source>Email:</source>
         <translation>电邮：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="20"/>
         <source>Country:</source>
         <translation>国家：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="23"/>
         <source>Undefined</source>
         <translation>未定义</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>实名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>更改用户资料</translation>
     </message>
@@ -2537,143 +2182,137 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgFilterGames</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="18"/>
         <source>no limit</source>
         <translation>没有限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="19"/>
         <source>5 minutes</source>
         <translation>5分鐘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="20"/>
         <source>10 minutes</source>
         <translation>10分鐘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="21"/>
         <source>30 minutes</source>
         <translation>30分鐘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="22"/>
         <source>1 hour</source>
         <translation>1小时</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="23"/>
         <source>2 hours</source>
         <translation>2小时</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="25"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="28"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="31"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="34"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="37"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="40"/>
+        <source>Hide games not created by buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="48"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;新过:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>Game &amp;description:</source>
         <translation>游戏 &amp;描述:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="57"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;创建者名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="67"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="83"/>
         <source>&amp;Game types</source>
         <translation>&amp;游戏类型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>at &amp;least:</source>
         <translation>&amp;至少:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="95"/>
         <source>at &amp;most:</source>
         <translation>&amp;最多：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="108"/>
         <source>Maximum player count</source>
         <translation>可容纳玩家最高数量</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="119"/>
         <source>Restrictions</source>
         <translation>限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="122"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>只显示容许&amp;观看者 观看的游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="127"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>显示有观看者&amp;密码保护的游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>只显示容许观看者&amp;聊天的游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="131"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>只显示容许观看者看&amp;手牌 的游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="141"/>
         <source>Spectators</source>
         <translation>观看者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/dialogs/dlg_filter_games.cpp" line="174"/>
         <source>Filter games</source>
         <translation>筛选游戏</translation>
     </message>
@@ -2681,52 +2320,52 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordChallenge</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="31"/>
         <source>Reset Password Challenge Warning</source>
         <translation>重设密码验证警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>程序出现故障,请再要求新的密码.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="37"/>
         <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
         <translation>请输入需要新密码的伺服器和相关户口资料.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="40"/>
         <source>&amp;Host:</source>
         <translation>&amp;主办机:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="45"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="50"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="55"/>
         <source>Email:</source>
         <translation>电邮：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="89"/>
         <source>Reset Password Challenge</source>
         <translation>重设密码验证</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>Reset Password Challenge Error</source>
         <translation>重设密码验证错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
+        <location filename="src/dialogs/dlg_forgot_password_challenge.cpp" line="97"/>
         <source>The email address can&apos;t be empty.</source>
         <translation>电邮不能空置.</translation>
     </message>
@@ -2734,37 +2373,37 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordRequest</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="30"/>
         <source>Enter the information of the server you&apos;d like to request a new password for.</source>
         <translation>请输入需要新密码的伺服器资料.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="33"/>
         <source>&amp;Host:</source>
         <translation>&amp;主办机:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="38"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="43"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="66"/>
         <source>Reset Password Request</source>
         <translation>重设密码要求</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>Reset Password Error</source>
         <translation>重设密码错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
+        <location filename="src/dialogs/dlg_forgot_password_request.cpp" line="74"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>玩家名称不能空置</translation>
     </message>
@@ -2772,86 +2411,86 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgForgotPasswordReset</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="31"/>
         <source>Reset Password Warning</source>
         <translation>重设密码警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="32"/>
         <source>A problem has occurred. Please try to request a new password again.</source>
         <translation>程序出现故障,请再要求新的密码.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="36"/>
         <source>Enter the received token and the new password in order to set your new password.</source>
         <translation>请输入收到验证码和新的密码,以便定立新的密码.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="39"/>
         <source>&amp;Host:</source>
         <translation>&amp;主办机:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="44"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="49"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="54"/>
         <source>Token:</source>
         <translation>验证码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="59"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="65"/>
         <source>New Password:</source>
         <translation>新密码：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="104"/>
         <source>Reset Password</source>
         <translation>重设密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>玩家名称不能空置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="112"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>Reset Password Error</source>
         <translation>重设密码错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="117"/>
         <source>The token can&apos;t be empty.</source>
         <translation>验证码不能为空白</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="122"/>
         <source>The new password can&apos;t be empty.</source>
         <translation>新密码不能为空白</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="128"/>
         <source>Your password is too short.</source>
         <translation>你的新密码太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_forgot_password_reset.cpp" line="131"/>
         <source>The passwords do not match.</source>
         <translation>新旧密码不一致.</translation>
     </message>
@@ -2859,7 +2498,7 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
+        <location filename="src/dialogs/dlg_load_deck.cpp" line="6"/>
         <source>Load Deck</source>
         <translation>载入牌库</translation>
     </message>
@@ -2867,146 +2506,63 @@ 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/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
         <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/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
+        <location filename="src/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
         <source>Invalid deck list.</source>
         <translation>牌表不能载入</translation>
     </message>
 </context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_load_remote_deck.cpp" line="27"/>
         <source>Load deck</source>
         <translation>载入牌库</translation>
     </message>
 </context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
         <translation>在卡牌资料库中找不到符合搜寻表达式的卡牌.你想继续吗?</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
+        <location filename="src/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <source>Invalid filter</source>
         <translation>筛选无效</translation>
     </message>
@@ -3014,7 +2570,7 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="18"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>输入你, 和你想登记的伺服器的资料.
@@ -3022,85 +2578,85 @@ Your email will be used to verify your account.</source>
 我们会使用你的电邮来核实你的户口.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="22"/>
         <source>&amp;Host:</source>
         <translation>&amp;主办机:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="27"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="32"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="37"/>
         <source>P&amp;assword:</source>
         <translation>&amp;密码:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="43"/>
         <source>Password (again):</source>
         <translation>(再次)输入密码：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="49"/>
         <source>Email:</source>
         <translation>电邮：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="54"/>
         <source>Email (again):</source>
         <translation>(再次)输入电邮：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="59"/>
         <source>Country:</source>
         <translation>国家：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="62"/>
         <source>Undefined</source>
         <translation>未定义</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="319"/>
         <source>Real name:</source>
         <translation>实名：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="354"/>
         <source>Register to server</source>
         <translation>註册加入伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>Registration Warning</source>
         <translation>注册警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="363"/>
         <source>Your password is too short.</source>
         <translation>你的密码太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="366"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>两次输入的密码不一致，请重新输入，</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="370"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>两次输入的电子邮箱不一致，请重新输入。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
+        <location filename="src/dialogs/dlg_register.cpp" line="374"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>玩家名称不能空置</translation>
     </message>
@@ -3108,17 +2664,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="13"/>
         <source>Number of sides:</source>
         <translation>骰子面数:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="20"/>
         <source>Number of dice:</source>
         <translation>骰子数目:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/dialogs/dlg_roll_dice.cpp" line="41"/>
         <source>Roll Dice</source>
         <translation>掷骰</translation>
     </message>
@@ -3126,55 +2682,40 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
+        <location filename="src/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1793"/>
         <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/dialogs/dlg_settings.cpp" line="1801"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -3191,7 +2732,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/dialogs/dlg_settings.cpp" line="1807"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -3208,7 +2749,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/dialogs/dlg_settings.cpp" line="1813"/>
         <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 +2762,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/dialogs/dlg_settings.cpp" line="1819"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
@@ -3229,7 +2770,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/dialogs/dlg_settings.cpp" line="1823"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3238,7 +2779,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/dialogs/dlg_settings.cpp" line="1827"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3254,59 +2795,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/dialogs/dlg_settings.cpp" line="1835"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1845"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1855"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1846"/>
         <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/dialogs/dlg_settings.cpp" line="1856"/>
         <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/dialogs/dlg_settings.cpp" line="1868"/>
         <source>Settings</source>
         <translation>设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1870"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1871"/>
         <source>Appearance</source>
         <translation>外观</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1872"/>
         <source>User Interface</source>
         <translation>用户界面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1873"/>
         <source>Card Sources</source>
         <translation>卡牌来源</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1874"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1875"/>
         <source>Sound</source>
         <translation>声音</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1876"/>
         <source>Shortcuts</source>
         <translation>快捷键</translation>
     </message>
@@ -3314,39 +2855,39 @@ https://github.com/Cockatrice/Cockatrice/issues
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="17"/>
         <source>It has been more than %2 days since you last checked your card database for updates.
 Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
+        <location filename="src/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3354,17 +2895,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgTipOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
         <source>Next</source>
         <translation>下一个</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="67"/>
         <source>Previous</source>
         <translation>上一个</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
+        <location filename="src/dialogs/dlg_tip_of_the_day.cpp" line="90"/>
         <source>Tip of the Day</source>
         <translation>每日提示</translation>
     </message>
@@ -3372,165 +2913,169 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="27"/>
         <source>Current release channel</source>
         <translation>现在发行渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="36"/>
         <source>Reinstall</source>
         <translation>重新安装</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="37"/>
         <source>Cancel Download</source>
         <translation>取消下载</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="38"/>
         <source>Open Download Page</source>
         <translation>打开下载页面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="57"/>
         <source>Check for Client Updates</source>
         <translation>检查客户端更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="65"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="229"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="66"/>
         <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</source>
         <translation>鸡蛇不支持建立SSL连接，因此你不能自动下载更新！
 请访问下载页面以手动更新。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="92"/>
         <source>Downloading update: %1</source>
+        <oldsource>Downloading update...</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="109"/>
         <source>Checking for updates...</source>
         <translation>正在检查更新...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="124"/>
         <source>Finished checking for updates</source>
         <translation>更新检查已完成</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="139"/>
         <source>No Update Available</source>
         <translation>没有更新可用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="140"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice 已经达到最新版本!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="141"/>
         <source>You are already running the latest version available in the chosen release channel.</source>
         <translation>你运行的已经是最新的发行版本了。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="142"/>
         <source>Current version</source>
         <translation>现行版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="143"/>
         <source>Selected release channel</source>
         <translation>现选发行渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="152"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="163"/>
         <source>Update Available</source>
         <translation>现有更新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>A new version of Cockatrice is available!</source>
         <translation>Cockatrice有新版本可用！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="164"/>
         <source>New version</source>
         <translation>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation>已发行</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="155"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="166"/>
         <source>Changelog</source>
         <translation>变更记载</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="156"/>
         <source>Do you want to update now?</source>
         <translation>你打算现在更新吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="168"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
+        <oldsource>Unfortunately there are no download packages available for your operating system. 
+You may have to build from source yourself.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="171"/>
         <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>
+        <oldsource>Please check the download page manually and visit the wiki for instructions on compiling.</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="208"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="216"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="230"/>
         <source>Update Error</source>
         <translation>更新出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="209"/>
         <source>An error occurred while checking for updates:</source>
         <translation>检测更新时出现错误:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="217"/>
         <source>An error occurred while downloading an update:</source>
         <translation>下载更新时出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="222"/>
         <source>Installing...</source>
         <translation>安装中</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="231"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice 不能啟动安装程式</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="232"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation>请你尝试人手更新, 关掉cockatrice, 然后重开安装程式.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/dialogs/dlg_update.cpp" line="233"/>
         <source>Download location</source>
         <translation>下载位置</translation>
     </message>
@@ -3538,162 +3083,30 @@ You may have to manually download the new version.</source>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>关闭时清除纪录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <location filename="src/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>侦错纪录</translation>
     </message>
 </context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
         <translation type="unfinished"/>
     </message>
@@ -3701,47 +3114,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardPricesDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
         <source>Card Hoarder</source>
         <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="58"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="58"/>
         <source>Card Kingdom</source>
         <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="59"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
         <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"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
         <source>Face 2-Face</source>
         <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="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="61"/>
         <source>Mana Pool</source>
         <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="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="62"/>
         <source>MTG Stocks</source>
         <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="63"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="63"/>
         <source>Scg</source>
         <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="64"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="64"/>
         <source>Tcgl</source>
         <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="65"/>
+        <location filename="src/client/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
         <translation type="unfinished"/>
     </message>
@@ -3749,44 +3162,38 @@ You may have to manually download the new version.</source>
 <context>
     <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
+        <location filename="src/client/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
+        <location filename="src/client/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="59"/>
         <source>Salt: </source>
         <translation type="unfinished"/>
     </message>
@@ -3794,7 +3201,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/game/filters/filter_builder.cpp" line="28"/>
         <source>Type your filter here</source>
         <translation>输入你的筛选类型</translation>
     </message>
@@ -3802,325 +3209,244 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Failed to delete filter &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/game/game_selector.cpp" line="220"/>
         <source>Please join the appropriate room first.</source>
         <translation>请先参加合适房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/game/game_selector.cpp" line="223"/>
         <source>Wrong password.</source>
         <translation>密码错误.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/game/game_selector.cpp" line="226"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>这个游戏不允许观眾加入.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/game/game_selector.cpp" line="229"/>
         <source>The game is already full.</source>
         <translation>这个游戏已经满了.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/game/game_selector.cpp" line="232"/>
         <source>The game does not exist any more.</source>
         <translation>这个游戏已经不存在了。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/game/game_selector.cpp" line="235"/>
         <source>This game is only open to registered users.</source>
         <translation>这个游戏只开放给註册用户.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/game/game_selector.cpp" line="238"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>这个游戏只开放给房间主办的好友。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/game/game_selector.cpp" line="241"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>你被这个房间的主办屏蔽了.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
+        <location filename="src/game/game_selector.cpp" line="264"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
+        <location filename="src/game/game_selector.cpp" line="267"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
+        <location filename="src/game/game_selector.cpp" line="270"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Join game</source>
         <translation>加入游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
+        <location filename="src/game/game_selector.cpp" line="304"/>
         <source>Password:</source>
         <translation>密码:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/game/game_selector.cpp" line="319"/>
         <source>Please join the respective room first.</source>
         <translation>请先参加相关的房间.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
+        <location filename="src/game/game_selector.cpp" line="362"/>
         <source>&amp;Filter games</source>
         <translation>&amp;筛选游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
+        <location filename="src/game/game_selector.cpp" line="363"/>
         <source>C&amp;lear filter</source>
         <translation>&amp;清除筛选项目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
+        <location filename="src/game/game_selector.cpp" line="365"/>
         <source>C&amp;reate</source>
         <translation>&amp;创建</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
+        <location filename="src/game/game_selector.cpp" line="366"/>
         <source>&amp;Join</source>
         <translation>&amp;加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
+        <location filename="src/game/game_selector.cpp" line="367"/>
         <source>J&amp;oin as spectator</source>
         <translation>&amp;作为观看者加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
+        <location filename="src/game/game_selector.cpp" line="388"/>
         <source>Games shown: %1 / %2</source>
         <translation>显示游戏：%1/%2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
+        <location filename="src/game/game_selector.cpp" line="390"/>
         <source>Games</source>
         <translation>游戏</translation>
     </message>
 </context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
+        <location filename="src/game/games_model.cpp" line="41"/>
         <source>&gt;1 day</source>
         <translation>＞1日</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
+        <location filename="src/game/games_model.cpp" line="50"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 小时</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
+        <location filename="src/game/games_model.cpp" line="52"/>
         <source>new</source>
         <translation>新建</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/game/games_model.cpp" line="55"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 分鐘</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
+        <location filename="src/game/games_model.cpp" line="151"/>
         <source>password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
+        <location filename="src/game/games_model.cpp" line="153"/>
         <source>buddies only</source>
         <translation>仅限好友</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
+        <location filename="src/game/games_model.cpp" line="155"/>
         <source>reg. users only</source>
         <translation>仅限註册用户</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/game/games_model.cpp" line="187"/>
+        <location filename="src/game/games_model.cpp" line="192"/>
         <source>can chat</source>
         <translation>允许聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
+        <location filename="src/game/games_model.cpp" line="189"/>
         <source>see hands</source>
         <translation>查看手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
+        <location filename="src/game/games_model.cpp" line="194"/>
         <source>can see hands</source>
         <translation>允许查看手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
+        <location filename="src/game/games_model.cpp" line="199"/>
         <source>not allowed</source>
         <translation>不允许</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
+        <location filename="src/game/games_model.cpp" line="217"/>
         <source>Room</source>
         <translation>房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
+        <location filename="src/game/games_model.cpp" line="221"/>
         <source>Age</source>
         <translation>时长</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
+        <location filename="src/game/games_model.cpp" line="229"/>
         <source>Description</source>
         <translation>描述:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
+        <location filename="src/game/games_model.cpp" line="231"/>
         <source>Creator</source>
         <translation>创建者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
+        <location filename="src/game/games_model.cpp" line="233"/>
         <source>Type</source>
         <translation>类型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
+        <location filename="src/game/games_model.cpp" line="235"/>
         <source>Restrictions</source>
         <translation>限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
+        <location filename="src/game/games_model.cpp" line="239"/>
         <source>Players</source>
         <translation>玩家</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
+        <location filename="src/game/games_model.cpp" line="247"/>
         <source>Spectators</source>
         <translation>观看者</translation>
     </message>
@@ -4128,1181 +3454,787 @@ 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/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/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/dialogs/dlg_settings.cpp" line="273"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="283"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="293"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="303"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="313"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="323"/>
+        <location filename="src/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/dialogs/dlg_settings.cpp" line="399"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/client/ui/window_main.cpp" line="109"/>
+        <location filename="src/client/ui/window_main.cpp" line="462"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation>伺服器已达到最最高用户限额，请另外选择吉时再试.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
+        <location filename="src/client/ui/window_main.cpp" line="112"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation>你的网路地址拥有太多同时连繫.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
+        <location filename="src/client/ui/window_main.cpp" line="115"/>
         <source>Banned by moderator</source>
         <translation>你已被版主禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
+        <location filename="src/client/ui/window_main.cpp" line="118"/>
         <source>Expected end time: %1</source>
         <translation>预计结束时间: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
+        <location filename="src/client/ui/window_main.cpp" line="120"/>
         <source>This ban lasts indefinitely.</source>
         <translation>这是无限期禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
+        <location filename="src/client/ui/window_main.cpp" line="126"/>
         <source>Scheduled server shutdown.</source>
         <translation>排期伺服器关机</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
+        <location filename="src/client/ui/window_main.cpp" line="129"/>
+        <location filename="src/client/ui/window_main.cpp" line="477"/>
         <source>Invalid username.</source>
         <translation>不可用的用户名。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
+        <location filename="src/client/ui/window_main.cpp" line="132"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation>因为你已在另外的位置登入, 所以你现有的联繫已被登出.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
+        <location filename="src/client/ui/window_main.cpp" line="137"/>
         <source>Connection closed</source>
         <translation>连繫已被关闭</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/client/ui/window_main.cpp" line="138"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation>伺服器已经中断你的联繫/
 原因: %1</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
+        <location filename="src/client/ui/window_main.cpp" line="143"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
         <translation><numerusform>伺服器将会在 %n 分鐘内重新啟动. 所有进行中的游戏都会报销.伺服器关闭原因: %1</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
+        <location filename="src/client/ui/window_main.cpp" line="148"/>
         <source>Scheduled server shutdown</source>
         <translation>排期伺服器关机</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/client/ui/window_main.cpp" line="187"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation>註册已成功。
 现在登入。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
+        <location filename="src/client/ui/window_main.cpp" line="197"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation>户口啟动已经成功
 现在登入.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Number of players</source>
+        <translation>玩家人数</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="231"/>
+        <source>Please enter the number of players.</source>
+        <translation>请输入玩家人数</translation>
+    </message>
+    <message>
+        <location filename="src/client/ui/window_main.cpp" line="248"/>
+        <location filename="src/client/ui/window_main.cpp" line="255"/>
         <source>Player %1</source>
         <translation>玩家 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
+        <location filename="src/client/ui/window_main.cpp" line="267"/>
         <source>Load replay</source>
         <translation>载入游戏录像</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
+        <location filename="src/client/ui/window_main.cpp" line="319"/>
         <source>About Cockatrice</source>
         <translation>关於Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
+        <location filename="src/client/ui/window_main.cpp" line="321"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice 网页</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/client/ui/window_main.cpp" line="322"/>
         <source>Project Manager:</source>
         <translation>项目经理：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/client/ui/window_main.cpp" line="323"/>
         <source>Past Project Managers:</source>
         <translation>前项目经理：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/client/ui/window_main.cpp" line="324"/>
         <source>Developers:</source>
         <translation>开发者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/client/ui/window_main.cpp" line="325"/>
         <source>Our Developers</source>
         <translation>我们的开发者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/client/ui/window_main.cpp" line="326"/>
         <source>Help Develop!</source>
         <translation>协助开发！</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/client/ui/window_main.cpp" line="327"/>
         <source>Translators:</source>
         <translation>翻译者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/client/ui/window_main.cpp" line="328"/>
         <source>Our Translators</source>
         <translation>翻译者名单</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Help Translate!</source>
         <translation>协助翻译!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/client/ui/window_main.cpp" line="329"/>
         <source>Support:</source>
         <translation>支援:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/client/ui/window_main.cpp" line="330"/>
         <source>Report an Issue</source>
         <translation>报告问题</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/client/ui/window_main.cpp" line="331"/>
         <source>Troubleshooting</source>
         <translation>排除故障</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/client/ui/window_main.cpp" line="332"/>
         <source>F.A.Q.</source>
         <translation>问答</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
+        <location filename="src/client/ui/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="421"/>
+        <location filename="src/client/ui/window_main.cpp" line="425"/>
+        <location filename="src/client/ui/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="571"/>
+        <location filename="src/client/ui/window_main.cpp" line="575"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="585"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
+        <location filename="src/client/ui/window_main.cpp" line="609"/>
+        <location filename="src/client/ui/window_main.cpp" line="615"/>
+        <location filename="src/client/ui/window_main.cpp" line="1258"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/client/ui/window_main.cpp" line="376"/>
         <source>Server timeout</source>
         <translation>伺服器超时</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
+        <location filename="src/client/ui/window_main.cpp" line="395"/>
         <source>Failed Login</source>
         <translation>登入失败</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/client/ui/window_main.cpp" line="396"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation>你的客户端似乎脱小本伺服器需要用来达成连繫的功能.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/client/ui/window_main.cpp" line="397"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation>请去&quot;求助-&gt;检查客户端更新&quot; 内更新你的客户.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
+        <location filename="src/client/ui/window_main.cpp" line="405"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation>用户名或密码错误。请检查账号信息,然后重试。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
+        <location filename="src/client/ui/window_main.cpp" line="409"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation>已经有在线用户正在使用这用户名.请先关闭连线,然后重新登入.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/client/ui/window_main.cpp" line="415"/>
+        <location filename="src/client/ui/window_main.cpp" line="565"/>
         <source>You are banned until %1.</source>
         <translation>你被禁止直到: %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
+        <location filename="src/client/ui/window_main.cpp" line="417"/>
+        <location filename="src/client/ui/window_main.cpp" line="567"/>
         <source>You are banned indefinitely.</source>
         <translation>你已被永久封禁.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
+        <location filename="src/client/ui/window_main.cpp" line="430"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation>本伺服器要求用户註册. 你想不想现在登记?</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
+        <location filename="src/client/ui/window_main.cpp" line="438"/>
         <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
 Please close and reopen your client to try again.</source>
         <translation>本伺服器要求用户拥有客户id. 你的客户端现在不能造成客户id,或是你正在使用修改过的客户端.
 请你关掉现有的客户端,然后重新啟动, 择吉日再试。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
+        <location filename="src/client/ui/window_main.cpp" line="443"/>
         <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
 If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
         <translation>因为内部出现故障, 请关闭,重开Cockatrice 然后再次尝试.
 如果故障继续出现,请将客户端软件升级为最新版本, 有需要时请联络软件开发人士.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
+        <location filename="src/client/ui/window_main.cpp" line="449"/>
         <source>Account activation</source>
         <translation>户口啟动</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/client/ui/window_main.cpp" line="450"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation>你的户口还未尝啟动.
 你需要提供从啟动电邮得来的验证码.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
+        <location filename="src/client/ui/window_main.cpp" line="461"/>
         <source>Server Full</source>
         <translation>伺服器载满</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
+        <location filename="src/client/ui/window_main.cpp" line="467"/>
         <source>Unknown login error: %1</source>
         <translation>不知名登入错误: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/client/ui/window_main.cpp" line="468"/>
+        <location filename="src/client/ui/window_main.cpp" line="587"/>
         <source>
 This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
         <translation>
 这通常意味住你的客户端版本已经过期,引起你的客户端不能明晓伺服器的回覆.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
+        <location filename="src/client/ui/window_main.cpp" line="480"/>
         <source>Your username must respect these rules:</source>
         <translation>您的用户名字必须遵守以下规则：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
+        <location filename="src/client/ui/window_main.cpp" line="482"/>
         <source>is %1 - %2 characters long</source>
         <translation>在%1 - %2个字符之间。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
         <source>can %1 contain lowercase characters</source>
         <translation>可以 $1 包含细楷/小写字母</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="483"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>NOT</source>
         <translation>并否</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/client/ui/window_main.cpp" line="485"/>
         <source>can %1 contain uppercase characters</source>
         <translation>可以 $1 包含大楷/大写字母</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/client/ui/window_main.cpp" line="488"/>
         <source>can %1 contain numeric characters</source>
         <translation>可以 $1 包含数字</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
+        <location filename="src/client/ui/window_main.cpp" line="491"/>
         <source>can contain the following punctuation: %1</source>
         <translation>可以包含以下符号：%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
+        <location filename="src/client/ui/window_main.cpp" line="494"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation>第一个字符可以 %1 是标点符号</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
+        <location filename="src/client/ui/window_main.cpp" line="501"/>
         <source>no unacceptable language as specified by these server rules:</source>
         <comment>note that the following lines will not be translated</comment>
         <translation>在以下伺服器规矩中,道明不能接受的语言:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
+        <location filename="src/client/ui/window_main.cpp" line="511"/>
         <source>can not contain any of the following words: %1</source>
         <translation>不能含有以下字眼: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
+        <location filename="src/client/ui/window_main.cpp" line="517"/>
         <source>can not match any of the following expressions: %1</source>
         <translation>不能含有以下语句: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
+        <location filename="src/client/ui/window_main.cpp" line="523"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation>你的用户名字只可以用以下的字符: A-Z, a-z, 0-9, _, ., 和 - .</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="541"/>
+        <location filename="src/client/ui/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="553"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Registration denied</source>
         <translation>註册被拒绝</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
+        <location filename="src/client/ui/window_main.cpp" line="534"/>
         <source>Registration is currently disabled on this server</source>
         <translation>这伺服器暂时谢绝登记</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
+        <location filename="src/client/ui/window_main.cpp" line="538"/>
         <source>There is already an existing account with the same user name.</source>
         <translation>这个用户名字已经被使用.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
+        <location filename="src/client/ui/window_main.cpp" line="542"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation>登记时必要指明合能用的电邮地址.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
+        <location filename="src/client/ui/window_main.cpp" line="554"/>
         <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
         <translation>你看来好像在本伺服器尝试申请新户口, 但是你已经有跟你电邮掛鉤的户口名字.我们的伺服器限制每用户在每个地址可以有多少个户口. 如果需要更多援助或是得取你的登入资料,请联络伺服器办事人.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
+        <location filename="src/client/ui/window_main.cpp" line="560"/>
         <source>Password too short.</source>
         <translation>密码太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/client/ui/window_main.cpp" line="579"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation>由於伺服器出现技术问题, 你的登记暂时失败.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/client/ui/window_main.cpp" line="582"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
+        <location filename="src/client/ui/window_main.cpp" line="586"/>
         <source>Unknown registration error: %1</source>
         <translation>不知名登记错误: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/client/ui/window_main.cpp" line="595"/>
         <source>Account activation failed</source>
         <translation>户口啟动失败</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/client/ui/window_main.cpp" line="602"/>
         <source>Socket error: %1</source>
         <translation>接口错误: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
+        <location filename="src/client/ui/window_main.cpp" line="610"/>
         <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
 Local version is %1, remote version is %2.</source>
         <translation>你正在尝试跟过时的伺服器连繫. 请把你的 Cockatrice 版本降级,或是连繫於合适的伺服器. 当地/离线版本维 %1, 遥距/上线版本维 %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
+        <location filename="src/client/ui/window_main.cpp" line="616"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation>你的 Cockatrice 版本现已过时.请把你的版本更新.
 当地/离线版本维 %1, 遥距/上线版本维 %2.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
+        <location filename="src/client/ui/window_main.cpp" line="626"/>
         <source>Connecting to %1...</source>
         <translation>向 %1 连接中...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
+        <location filename="src/client/ui/window_main.cpp" line="630"/>
         <source>Registering to %1 as %2...</source>
         <translation>正在用%2的身份登记到%1伺服器...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
+        <location filename="src/client/ui/window_main.cpp" line="633"/>
         <source>Disconnected</source>
         <translation>已经断线了</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
+        <location filename="src/client/ui/window_main.cpp" line="636"/>
         <source>Connected, logging in at %1</source>
         <translation>连线成功, 在%1登入</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="644"/>
+        <location filename="src/client/ui/window_main.cpp" line="649"/>
+        <location filename="src/client/ui/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation>正在用%2的身份对%1要求遗忘密码.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
+        <location filename="src/client/ui/window_main.cpp" line="665"/>
         <source>&amp;Connect...</source>
         <translation>&amp;连线...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
+        <location filename="src/client/ui/window_main.cpp" line="666"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;断线</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
+        <location filename="src/client/ui/window_main.cpp" line="667"/>
         <source>Start &amp;local game...</source>
         <translation>开始&amp;离线游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
+        <location filename="src/client/ui/window_main.cpp" line="668"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;观看游戏录像</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
+        <location filename="src/client/ui/window_main.cpp" line="669"/>
         <source>&amp;Full screen</source>
         <translation>&amp;全屏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/client/ui/window_main.cpp" line="670"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;註册加入伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/client/ui/window_main.cpp" line="671"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;弄回密码</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/client/ui/window_main.cpp" line="672"/>
         <source>&amp;Settings...</source>
         <translation>设置⋯</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/client/ui/window_main.cpp" line="674"/>
         <source>&amp;Exit</source>
         <translation>&amp;退出</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/client/ui/window_main.cpp" line="677"/>
         <source>A&amp;ctions</source>
         <translation>&amp;动作</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/client/ui/window_main.cpp" line="679"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/client/ui/window_main.cpp" line="682"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;卡牌资料库</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
+        <location filename="src/client/ui/window_main.cpp" line="683"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;管理牌组</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/client/ui/window_main.cpp" line="684"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>编辑自定 &amp;令牌...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
+        <location filename="src/client/ui/window_main.cpp" line="685"/>
         <source>Open custom image folder</source>
         <translation>打开自定图片文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
+        <location filename="src/client/ui/window_main.cpp" line="686"/>
         <source>Open custom sets folder</source>
         <translation>打开自定牌组文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/client/ui/window_main.cpp" line="687"/>
         <source>Add custom sets/cards</source>
         <translation>添加自定卡组/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/client/ui/window_main.cpp" line="688"/>
         <source>Reload card database</source>
         <translation>刷新卡牌资料库</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/client/ui/window_main.cpp" line="690"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/client/ui/window_main.cpp" line="692"/>
         <source>&amp;Help</source>
         <translation>&amp;求助</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/client/ui/window_main.cpp" line="693"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;关於Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
+        <location filename="src/client/ui/window_main.cpp" line="694"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;每日提示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/client/ui/window_main.cpp" line="695"/>
         <source>Check for Client Updates</source>
         <translation>检查客户端更新</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
+        <location filename="src/client/ui/window_main.cpp" line="696"/>
         <source>Check for Card Updates...</source>
         <translation>检查卡牌更新</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/client/ui/window_main.cpp" line="697"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/client/ui/window_main.cpp" line="698"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/client/ui/window_main.cpp" line="699"/>
         <source>View &amp;Debug Log</source>
         <translation>查看&amp;侦错纪录</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/client/ui/window_main.cpp" line="700"/>
         <source>Open Settings Folder</source>
         <translation>打开设置文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/client/ui/window_main.cpp" line="702"/>
         <source>Show/Hide</source>
         <translation>显示/隐藏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
+        <location filename="src/client/ui/window_main.cpp" line="998"/>
         <source>New Version</source>
         <translation>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
+        <location filename="src/client/ui/window_main.cpp" line="999"/>
         <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/client/ui/window_main.cpp" line="1003"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice 已被安装</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
+        <location filename="src/client/ui/window_main.cpp" line="1004"/>
         <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/client/ui/window_main.cpp" line="1131"/>
         <source>Card database</source>
         <translation>卡牌资料库</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
+        <location filename="src/client/ui/window_main.cpp" line="1133"/>
         <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 +4243,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/client/ui/window_main.cpp" line="1137"/>
+        <location filename="src/client/ui/window_main.cpp" line="1162"/>
         <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/client/ui/window_main.cpp" line="1138"/>
+        <location filename="src/client/ui/window_main.cpp" line="1163"/>
         <source>No</source>
         <translation>否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
+        <location filename="src/client/ui/window_main.cpp" line="1139"/>
         <source>Open settings</source>
         <translation>打开设置</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
+        <location filename="src/client/ui/window_main.cpp" line="1154"/>
         <source>New sets found</source>
         <translation>发现新卡组</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
+        <location filename="src/client/ui/window_main.cpp" line="1156"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -5342,17 +4274,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/client/ui/window_main.cpp" line="1164"/>
         <source>View sets</source>
         <translation>查看卡组</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
+        <location filename="src/client/ui/window_main.cpp" line="1183"/>
         <source>Welcome</source>
         <translation>欢迎</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1184"/>
         <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 +4293,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/client/ui/window_main.cpp" line="1204"/>
+        <location filename="src/client/ui/window_main.cpp" line="1364"/>
         <source>Information</source>
         <translation>资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/client/ui/window_main.cpp" line="1204"/>
         <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/client/ui/window_main.cpp" line="1259"/>
         <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/client/ui/window_main.cpp" line="1268"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
+        <location filename="src/client/ui/window_main.cpp" line="1286"/>
         <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/client/ui/window_main.cpp" line="1289"/>
         <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/client/ui/window_main.cpp" line="1293"/>
         <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/client/ui/window_main.cpp" line="1296"/>
         <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/client/ui/window_main.cpp" line="1300"/>
         <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/client/ui/window_main.cpp" line="1305"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
+        <location filename="src/client/ui/window_main.cpp" line="1310"/>
         <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/client/ui/window_main.cpp" line="1365"/>
         <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,862 +4362,668 @@ 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/client/ui/window_main.cpp" line="1384"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
+        <location filename="src/client/ui/window_main.cpp" line="1427"/>
+        <location filename="src/client/ui/window_main.cpp" line="1431"/>
         <source>Load sets/cards</source>
         <translation>载入卡组/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/client/ui/window_main.cpp" line="1393"/>
         <source>Selected file cannot be found.</source>
         <translation>找不到选择的文件。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/client/ui/window_main.cpp" line="1399"/>
         <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/client/ui/window_main.cpp" line="1428"/>
         <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/client/ui/window_main.cpp" line="1431"/>
         <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/client/ui/window_main.cpp" line="1482"/>
+        <location filename="src/client/ui/window_main.cpp" line="1492"/>
+        <location filename="src/client/ui/window_main.cpp" line="1501"/>
         <source>Reset Password</source>
         <translation>重设密码</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
+        <location filename="src/client/ui/window_main.cpp" line="1483"/>
         <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/client/ui/window_main.cpp" line="1493"/>
         <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/client/ui/window_main.cpp" line="1502"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation>已经收到啟动要求,   请从你的电邮获取啟动验证码.</translation>
     </message>
 </context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
+        <location filename="src/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/message_log_widget.cpp" line="143"/>
         <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/server/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation> %1 收回在此游戏降服.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
+        <location filename="src/server/message_log_widget.cpp" line="156"/>
         <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/server/message_log_widget.cpp" line="160"/>
         <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/server/message_log_widget.cpp" line="176"/>
         <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/server/message_log_widget.cpp" line="179"/>
         <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/server/message_log_widget.cpp" line="183"/>
         <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/server/message_log_widget.cpp" line="187"/>
         <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/server/message_log_widget.cpp" line="195"/>
         <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/server/message_log_widget.cpp" line="198"/>
         <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/server/message_log_widget.cpp" line="204"/>
         <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/server/message_log_widget.cpp" line="210"/>
         <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/server/message_log_widget.cpp" line="223"/>
         <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/server/message_log_widget.cpp" line="225"/>
         <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/server/message_log_widget.cpp" line="235"/>
         <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/server/message_log_widget.cpp" line="237"/>
         <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/server/message_log_widget.cpp" line="247"/>
         <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/server/message_log_widget.cpp" line="282"/>
         <source>a card</source>
         <translation>一张牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
+        <location filename="src/server/message_log_widget.cpp" line="288"/>
         <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/server/message_log_widget.cpp" line="300"/>
         <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/server/message_log_widget.cpp" line="302"/>
         <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/server/message_log_widget.cpp" line="305"/>
         <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"/>
+        <location filename="src/server/message_log_widget.cpp" line="307"/>
         <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/server/message_log_widget.cpp" line="309"/>
         <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/server/message_log_widget.cpp" line="312"/>
         <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/server/message_log_widget.cpp" line="314"/>
         <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/server/message_log_widget.cpp" line="316"/>
         <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/server/message_log_widget.cpp" line="320"/>
         <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/server/message_log_widget.cpp" line="323"/>
         <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/server/message_log_widget.cpp" line="326"/>
         <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/server/message_log_widget.cpp" line="329"/>
         <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/server/message_log_widget.cpp" line="348"/>
         <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/server/message_log_widget.cpp" line="350"/>
         <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/server/message_log_widget.cpp" line="360"/>
         <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/server/message_log_widget.cpp" line="365"/>
         <source>%1 is looking at the %4 %3 card(s) %2.</source>
+        <oldsource>%1 is looking at the top %3 card(s) %2.</oldsource>
         <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/server/message_log_widget.cpp" line="369"/>
         <source>bottom</source>
         <translation>底部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
+        <location filename="src/server/message_log_widget.cpp" line="369"/>
         <source>top</source>
         <translation>顶部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
+        <location filename="src/server/message_log_widget.cpp" line="377"/>
         <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/server/message_log_widget.cpp" line="380"/>
         <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/server/message_log_widget.cpp" line="386"/>
         <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/server/message_log_widget.cpp" line="391"/>
         <source>The game has started.</source>
         <translation>游戏已开始。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
+        <location filename="src/server/message_log_widget.cpp" line="397"/>
         <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/server/message_log_widget.cpp" line="403"/>
         <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/server/message_log_widget.cpp" line="408"/>
         <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/server/message_log_widget.cpp" line="415"/>
         <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/server/message_log_widget.cpp" line="421"/>
         <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/server/message_log_widget.cpp" line="427"/>
         <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/server/message_log_widget.cpp" line="436"/>
         <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/server/message_log_widget.cpp" line="441"/>
         <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/server/message_log_widget.cpp" line="447"/>
         <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/server/message_log_widget.cpp" line="452"/>
         <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/server/message_log_widget.cpp" line="478"/>
         <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/server/message_log_widget.cpp" line="480"/>
         <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/server/message_log_widget.cpp" line="489"/>
         <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/server/message_log_widget.cpp" line="494"/>
         <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/server/message_log_widget.cpp" line="500"/>
         <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/server/message_log_widget.cpp" line="506"/>
         <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/server/message_log_widget.cpp" line="513"/>
         <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/server/message_log_widget.cpp" line="519"/>
         <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/server/message_log_widget.cpp" line="521"/>
         <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/server/message_log_widget.cpp" line="527"/>
         <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/server/message_log_widget.cpp" line="534"/>
         <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/server/message_log_widget.cpp" line="541"/>
         <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/server/message_log_widget.cpp" line="543"/>
         <source>reversed</source>
         <translation>逆转</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
+        <location filename="src/server/message_log_widget.cpp" line="543"/>
         <source>normal</source>
         <translation>正常</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Heads</source>
         <translation>正面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
+        <location filename="src/server/message_log_widget.cpp" line="551"/>
         <source>Tails</source>
         <translation>翻面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
+        <location filename="src/server/message_log_widget.cpp" line="552"/>
         <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/server/message_log_widget.cpp" line="556"/>
         <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/server/message_log_widget.cpp" line="563"/>
         <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/server/message_log_widget.cpp" line="573"/>
         <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/server/message_log_widget.cpp" line="601"/>
         <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/server/message_log_widget.cpp" line="607"/>
         <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/server/message_log_widget.cpp" line="618"/>
         <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/server/message_log_widget.cpp" line="620"/>
         <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/server/message_log_widget.cpp" line="638"/>
         <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/server/message_log_widget.cpp" line="650"/>
         <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/server/message_log_widget.cpp" line="652"/>
         <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/server/message_log_widget.cpp" line="671"/>
         <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/server/message_log_widget.cpp" line="676"/>
         <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/server/message_log_widget.cpp" line="679"/>
         <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/server/message_log_widget.cpp" line="687"/>
         <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/server/message_log_widget.cpp" line="689"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="707"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="710"/>
         <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/server/message_log_widget.cpp" line="726"/>
         <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/server/message_log_widget.cpp" line="730"/>
         <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/server/message_log_widget.cpp" line="735"/>
         <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/server/message_log_widget.cpp" line="740"/>
         <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/server/message_log_widget.cpp" line="756"/>
         <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/server/message_log_widget.cpp" line="762"/>
         <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/server/message_log_widget.cpp" line="765"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation> %1 放回它们最后一张抽到的卡牌(%2).</translation>
     </message>
@@ -6293,206 +5031,163 @@ 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/dialogs/dlg_settings.cpp" line="1466"/>
         <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/dialogs/dlg_settings.cpp" line="1467"/>
         <source>Add New Message</source>
         <translation>添加新信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1468"/>
         <source>Edit Message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1469"/>
         <source>Remove Message</source>
         <translation>移除信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1418"/>
         <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/dialogs/dlg_settings.cpp" line="1418"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Message:</source>
         <translation>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1431"/>
         <source>Edit message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1449"/>
         <source>Chat settings</source>
         <translation>聊天设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1450"/>
         <source>Custom alert words</source>
         <translation>自定通知触发词语</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1451"/>
         <source>Enable chat mentions</source>
         <translation>允许聊天中提到某人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1452"/>
         <source>Enable mention completer</source>
         <translation>允许自动完成提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1453"/>
         <source>In-game message macros</source>
         <translation>游戏内短信速键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1455"/>
         <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/dialogs/dlg_settings.cpp" line="1456"/>
         <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/dialogs/dlg_settings.cpp" line="1457"/>
         <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/dialogs/dlg_settings.cpp" line="1458"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1459"/>
         <source>Invert text color</source>
         <translation>反转文本顏色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1460"/>
         <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/dialogs/dlg_settings.cpp" line="1461"/>
         <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/dialogs/dlg_settings.cpp" line="1462"/>
         <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/dialogs/dlg_settings.cpp" line="1463"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1464"/>
         <source>(Color is hexadecimal)</source>
         <translation>（顏色为16进制）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1465"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>将单词以空格区分，仅支持字母.</translation>
     </message>
 </context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>Mtg</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
+        <location filename="src/game/game_specific_terms.h" line="29"/>
         <source>Card Type</source>
         <translation>卡牌类型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="src/game/game_specific_terms.h" line="31"/>
         <source>Mana Value</source>
         <translation>法力数值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="src/game/game_specific_terms.h" line="33"/>
         <source>Color(s)</source>
         <translation>颜色(眾) </translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="src/game/game_specific_terms.h" line="35"/>
         <source>Loyalty</source>
         <translation>忠诚值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="src/game/game_specific_terms.h" line="37"/>
         <source>Main Card Type</source>
         <translation>卡牌主类型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="src/game/game_specific_terms.h" line="39"/>
         <source>Mana Cost</source>
         <translation>法力费用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="src/game/game_specific_terms.h" line="41"/>
         <source>P/T</source>
         <translation>力量/防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="src/game/game_specific_terms.h" line="43"/>
         <source>Side</source>
         <translation>正面/底面</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="src/game/game_specific_terms.h" line="45"/>
         <source>Layout</source>
         <translation>佈局</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="src/game/game_specific_terms.h" line="47"/>
         <source>Color Identity</source>
         <translation>顏色身份</translation>
     </message>
@@ -6500,17 +5195,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>OverlapControlWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
         <translation>可重迭卡牌:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
         <translation>重迭百分点</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
+        <location filename="src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
         <translation>重迭方向</translation>
     </message>
@@ -6518,62 +5213,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="47"/>
+        <location filename="src/game/phase.cpp" line="25"/>
         <source>Unknown Phase</source>
         <translation>不知名阶段</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="49"/>
+        <location filename="src/game/phase.cpp" line="27"/>
         <source>Untap</source>
         <translation>重置步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="50"/>
+        <location filename="src/game/phase.cpp" line="28"/>
         <source>Upkeep</source>
         <translation>维持步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="51"/>
+        <location filename="src/game/phase.cpp" line="29"/>
         <source>Draw</source>
         <translation>抓牌步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="52"/>
+        <location filename="src/game/phase.cpp" line="30"/>
         <source>First Main</source>
         <translation>第一主阶步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="53"/>
+        <location filename="src/game/phase.cpp" line="31"/>
         <source>Beginning of Combat</source>
         <translation>开战步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="54"/>
+        <location filename="src/game/phase.cpp" line="32"/>
         <source>Declare Attackers</source>
         <translation>宣告进攻步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="55"/>
+        <location filename="src/game/phase.cpp" line="33"/>
         <source>Declare Blockers</source>
         <translation>宣告阻挡步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="56"/>
+        <location filename="src/game/phase.cpp" line="34"/>
         <source>Combat Damage</source>
         <translation>战斗损害步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="57"/>
+        <location filename="src/game/phase.cpp" line="35"/>
         <source>End of Combat</source>
         <translation>战斗结束步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="58"/>
+        <location filename="src/game/phase.cpp" line="36"/>
         <source>Second Main</source>
         <translation>第二主阶步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="59"/>
+        <location filename="src/game/phase.cpp" line="37"/>
         <source>End/Cleanup</source>
         <translation>结束/清理步</translation>
     </message>
@@ -6581,57 +5276,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/phases_toolbar.cpp" line="174"/>
         <source>End of turn step</source>
         <translation>回合完结部</translation>
     </message>
@@ -6639,213 +5334,703 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
+        <location filename="src/client/ui/picture_loader/picture_to_load.cpp" line="244"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>zhs</translation>
     </message>
 </context>
 <context>
-    <name>PlayerActions</name>
+    <name>Player</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="674"/>
+        <source>Reveal top cards of library</source>
+        <translation>显示牌库顶牌(眾) </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.cpp" line="675"/>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <location filename="src/game/player/player.cpp" line="1175"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
+        <location filename="src/game/player/player.cpp" line="1277"/>
+        <location filename="src/game/player/player.cpp" line="1311"/>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <location filename="src/game/player/player.cpp" line="1759"/>
         <source>Number of cards: (max. %1)</source>
+        <translation>卡牌数目：(最多可以是%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="766"/>
+        <source>&amp;View graveyard</source>
+        <translation>&amp;查看坟区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="767"/>
+        <source>&amp;View exile</source>
+        <translation>查看放逐区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="769"/>
+        <source>Player &quot;%1&quot;</source>
+        <translation>玩家 &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="770"/>
+        <location filename="src/game/player/player.cpp" line="777"/>
+        <location filename="src/game/player/player.cpp" line="790"/>
+        <location filename="src/game/player/player.cpp" line="917"/>
+        <source>&amp;Graveyard</source>
+        <translation>&amp;坟区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="771"/>
+        <location filename="src/game/player/player.cpp" line="778"/>
+        <location filename="src/game/player/player.cpp" line="784"/>
+        <location filename="src/game/player/player.cpp" line="918"/>
+        <source>&amp;Exile</source>
+        <translation>&amp;放逐区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="774"/>
+        <source>&amp;Move hand to...</source>
+        <translation>&amp;将手牌移到...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="775"/>
+        <location filename="src/game/player/player.cpp" line="781"/>
+        <location filename="src/game/player/player.cpp" line="787"/>
+        <source>&amp;Top of library</source>
+        <translation>&amp;牌库顶</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="776"/>
+        <location filename="src/game/player/player.cpp" line="782"/>
+        <location filename="src/game/player/player.cpp" line="788"/>
+        <source>&amp;Bottom of library</source>
+        <translation>&amp;牌库底</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="780"/>
+        <source>&amp;Move graveyard to...</source>
+        <translation>&amp;将坟场区的牌移到...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="783"/>
+        <location filename="src/game/player/player.cpp" line="789"/>
+        <location filename="src/game/player/player.cpp" line="833"/>
+        <location filename="src/game/player/player.cpp" line="916"/>
+        <source>&amp;Hand</source>
+        <translation>&amp;手牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="786"/>
+        <source>&amp;Move exile to...</source>
+        <translation>&amp;将放逐区的卡移到</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="792"/>
+        <source>&amp;View library</source>
+        <translation>&amp;查看牌库</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="793"/>
+        <source>&amp;View hand</source>
+        <translation>&amp;查看手牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="794"/>
+        <source>View &amp;top cards of library...</source>
+        <translation>检视牌库顶的牌(眾) </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="796"/>
+        <source>Reveal &amp;library to...</source>
+        <translation>将牌库展示给...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="801"/>
+        <source>&amp;Always reveal top card</source>
+        <translation>&amp;一直展示牌库顶牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="804"/>
+        <source>&amp;View sideboard</source>
+        <translation>&amp;查看副牌库</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="805"/>
+        <source>&amp;Draw card</source>
+        <translation>&amp;抽牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="806"/>
+        <source>D&amp;raw cards...</source>
+        <translation>&amp;抓牌(眾)⋯</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="807"/>
+        <source>&amp;Undo last draw</source>
+        <translation>&amp;撤销最后抽牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="808"/>
+        <source>Take &amp;mulligan</source>
+        <translation>洗回手牌&amp;再抽</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="813"/>
+        <source>Play top card &amp;face down</source>
+        <translation>将牌库顶牌&amp;面朝下使出</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="815"/>
+        <source>Move top card to grave&amp;yard</source>
+        <translation>将牌库顶的牌置入&amp;坟墓区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="816"/>
+        <source>Move top card to e&amp;xile</source>
+        <translation>将牌库顶的牌置入&amp;放逐区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="817"/>
+        <source>Move top cards to &amp;graveyard...</source>
+        <translation>将牌库顶的牌(眾) 置入&amp;坟墓区...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="818"/>
+        <source>Move top cards to &amp;exile...</source>
+        <translation>将牌库顶的牌(眾) 置入&amp;放逐区...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="814"/>
+        <source>Put top card on &amp;bottom</source>
+        <translation>将牌库顶牌放到牌库&amp;底</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="795"/>
+        <source>View bottom cards of library...</source>
+        <translation>查看牌库底(眾) 的牌...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="797"/>
+        <source>Lend library to...</source>
+        <translation>将牌库借给...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="810"/>
+        <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
+        <location filename="src/game/player/player.cpp" line="819"/>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
+        <translation>把顶牌放在重迭区, &amp;直到...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="820"/>
+        <source>Shuffle top cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="831"/>
+        <source>Shuffle bottom cards...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="834"/>
+        <source>&amp;Reveal hand to...</source>
+        <translation>将手牌&amp;展示给</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="835"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>将手牌&amp;随机一张展示给...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="836"/>
+        <source>Reveal random card to...</source>
+        <translation>将手牌随机一张展示给...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="837"/>
+        <source>&amp;Sideboard</source>
+        <translation>&amp;副牌库</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="838"/>
+        <source>&amp;Library</source>
+        <translation>&amp;牌库</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="839"/>
+        <source>&amp;Counters</source>
+        <translation>&amp;数值物</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="840"/>
+        <source>C&amp;ustom Zones</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="843"/>
+        <location filename="src/game/player/player.cpp" line="2806"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="846"/>
+        <source>&amp;Untap all permanents</source>
+        <translation>%重置所有永久卡牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="847"/>
+        <source>R&amp;oll die...</source>
+        <translation>&amp;掷骰子...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="848"/>
+        <source>&amp;Create token...</source>
+        <translation>&amp;派出令牌...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="849"/>
+        <source>C&amp;reate another token</source>
+        <translation>&amp;再派出同一令牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="850"/>
+        <source>Cr&amp;eate predefined token</source>
+        <translation>&amp;派出预定名牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="852"/>
+        <source>Ca&amp;rd counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="860"/>
+        <location filename="src/game/player/player.cpp" line="1113"/>
+        <source>&amp;All players</source>
+        <translation>&amp;所有玩家</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="867"/>
+        <source>S&amp;ay</source>
+        <translation>&amp;説</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="870"/>
+        <source>&amp;Select All</source>
+        <translation>&amp;全选</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="871"/>
+        <source>S&amp;elect Row</source>
+        <translation>&amp;选择横行</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="872"/>
+        <source>S&amp;elect Column</source>
+        <translation>&amp;选择直行</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="874"/>
+        <source>&amp;Play</source>
+        <translation>&amp;使出</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="875"/>
+        <source>&amp;Hide</source>
+        <translation>&amp;隐藏</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="876"/>
+        <source>Play &amp;Face Down</source>
+        <translation>&amp;面朝下使出</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="878"/>
+        <source>&amp;Tap / Untap</source>
+        <extracomment>Turn sideways or back again</extracomment>
+        <translation>&amp;横置/重置</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="879"/>
+        <source>Toggle &amp;normal untapping</source>
+        <translation>切换&amp;正常重置</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="881"/>
+        <source>T&amp;urn Over</source>
+        <extracomment>Turn face up/face down</extracomment>
+        <translation>&amp;反转</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="884"/>
+        <source>&amp;Peek at card face</source>
+        <translation>&amp;查看卡牌正面</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="885"/>
+        <source>&amp;Clone</source>
+        <translation>&amp;复製</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="886"/>
+        <source>Attac&amp;h to card...</source>
+        <translation>&amp;结附到...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="887"/>
+        <source>Unattac&amp;h</source>
+        <translation>取消&amp;结附</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="888"/>
+        <source>&amp;Draw arrow...</source>
+        <translation>&amp;画箭咀</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="889"/>
+        <source>&amp;Increase power</source>
+        <translation>&amp;增加力量</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="890"/>
+        <source>&amp;Decrease power</source>
+        <translation>&amp;降低力量</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="891"/>
+        <source>I&amp;ncrease toughness</source>
+        <translation>&amp;增加防御</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="892"/>
+        <source>D&amp;ecrease toughness</source>
+        <translation>&amp;降低防御</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="893"/>
+        <source>In&amp;crease power and toughness</source>
+        <translation>&amp;增加力量和防御</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="894"/>
+        <source>Dec&amp;rease power and toughness</source>
+        <translation>&amp;降低力量和防御</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="895"/>
+        <source>Increase power and decrease toughness</source>
+        <translation>增加力量与降低防御</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="896"/>
+        <source>Decrease power and increase toughness</source>
+        <translation>降低力量与增加防御</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="897"/>
+        <source>Set &amp;power and toughness...</source>
+        <translation>设置&amp;力量和防御为...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="898"/>
+        <source>Reset p&amp;ower and toughness</source>
+        <translation>重置&amp;力量和防御</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="899"/>
+        <source>&amp;Set annotation...</source>
+        <translation>&amp;设置注释...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="904"/>
+        <source>&amp;Add counter (%1)</source>
+        <translation>&amp;增加指示物 (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="907"/>
+        <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;移除指示物 (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="910"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>&amp;设定指示物为(%1)...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="913"/>
+        <source>&amp;Top of library in random order</source>
+        <translation>&amp; 随机顺序置於牌库顶</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="914"/>
+        <source>X cards from the top of library...</source>
+        <translation>牌库顶下X张牌...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="915"/>
+        <source>&amp;Bottom of library in random order</source>
+        <translation>&amp; 不分次序地置於牌库底</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1162"/>
+        <source>View top cards of library</source>
+        <translation>查看牌库顶(眾) 的牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1175"/>
         <source>View bottom cards of library</source>
-        <translation type="unfinished"/>
+        <translation>查看牌库底(眾) 的牌</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
+        <location filename="src/game/player/player.cpp" line="1248"/>
         <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.cpp" line="1276"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
+        <translation>本卡牌进入战场时应放哪种位置:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
+        <location filename="src/game/player/player.cpp" line="3188"/>
         <source>(max. %1)</source>
-        <translation type="unfinished"/>
+        <translation>(最多维 %1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player.cpp" line="1310"/>
+        <source>Draw hand</source>
+        <translation>起手</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1312"/>
+        <source>0 and lower are in comparison to current hand size</source>
+        <translation>0或以下的数目是比较於现在手牌数目</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1336"/>
+        <source>Draw cards</source>
+        <translation>抓牌(眾)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
+        <source>Number:</source>
+        <translation>数目:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1408"/>
+        <source>Move top cards to grave</source>
+        <translation>将牌库顶的牌(眾)置入坟场</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="798"/>
+        <source>Reveal &amp;top cards to...</source>
+        <translation>将牌库&amp;顶牌(眾)展示给...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="799"/>
+        <source>&amp;Top of library...</source>
+        <translation>&amp;牌库顶...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="800"/>
+        <source>&amp;Bottom of library...</source>
+        <translation>&amp;牌库底...</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="802"/>
+        <source>&amp;Always look at top card</source>
+        <translation>&amp;永远看到顶牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="803"/>
+        <source>&amp;Open deck in deck editor</source>
+        <translation>在套牌编辑&amp;打开牌库档案</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="812"/>
+        <source>&amp;Play top card</source>
+        <translation>&amp;使出顶牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="822"/>
+        <source>&amp;Draw bottom card</source>
+        <translation>从牌库底抽牌(单)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="823"/>
+        <source>D&amp;raw bottom cards...</source>
+        <translation>从牌库底&amp;抽牌(眾)</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="824"/>
+        <source>&amp;Play bottom card</source>
+        <translation>&amp;使出底牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="825"/>
+        <source>Play bottom card &amp;face down</source>
+        <translation>将牌库底牌&amp;面朝下使出</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="826"/>
+        <source>Move bottom card to grave&amp;yard</source>
+        <translation>将牌库底的牌(单) 置入&amp;坟场区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="827"/>
+        <source>Move bottom card to e&amp;xile</source>
+        <translation>将牌库底的牌置入&amp;放逐区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="828"/>
+        <source>Move bottom cards to &amp;graveyard...</source>
+        <translation>将牌库底的牌(眾) 置入&amp;坟场区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="829"/>
+        <source>Move bottom cards to &amp;exile...</source>
+        <translation>将牌库底的牌(眾) 置入&amp;放逐区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="830"/>
+        <source>Put bottom card on &amp;top</source>
+        <translation>将牌库牌底放到牌库顶</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="864"/>
+        <source>Selec&amp;ted cards</source>
+        <translation>被选卡牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1440"/>
+        <source>Move top cards to exile</source>
+        <translation>将牌库顶的牌(眾) 置入放逐区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1611"/>
+        <source>Move bottom cards to grave</source>
+        <translation>将牌库底的牌(眾) 置入坟场区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1643"/>
+        <source>Move bottom cards to exile</source>
+        <translation>将牌库底的牌(眾) 置入放逐区</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1759"/>
+        <source>Draw bottom cards</source>
+        <translation>从牌库底抽牌(眾) </translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="1862"/>
+        <location filename="src/game/player/player.cpp" line="4269"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation>&amp;再派出同一%1令牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="2011"/>
+        <source>Create tokens</source>
+        <translation>派出多个令牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3187"/>
+        <source>Place card X cards from top of library</source>
+        <translation>把卡牌放着牌库顶下X张牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change power/toughness</source>
-        <translation type="unfinished"/>
+        <translation>更改力量/防御</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
+        <location filename="src/game/player/player.cpp" line="3534"/>
         <source>Change stats to:</source>
-        <translation type="unfinished"/>
+        <translation>更改力防数据至:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
+        <location filename="src/game/player/player.cpp" line="3653"/>
         <source>Set annotation</source>
-        <translation type="unfinished"/>
+        <translation>设置注释</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
+        <location filename="src/game/player/player.cpp" line="3654"/>
         <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
+        <translation>请输入新的注释:</translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
+        <location filename="src/game/player/player.cpp" line="3747"/>
         <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation>设定指示物为</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <source>&amp;Counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingDisabledInfoWidget</name>
-    <message>
-        <location filename="src/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"/>
+        <location filename="src/game/player/player.cpp" line="4023"/>
+        <source>Re&amp;veal to...</source>
+        <translation>&amp;展示给...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
-        <source>Enable printings again</source>
-        <translation type="unfinished"/>
+        <location filename="src/game/player/player.cpp" line="4093"/>
+        <source>View related cards</source>
+        <translation>查看关联卡牌</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4141"/>
+        <source>Token: </source>
+        <translation>令牌:</translation>
+    </message>
+    <message>
+        <location filename="src/game/player/player.cpp" line="4158"/>
+        <source>All tokens</source>
+        <translation>所有令牌</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="109"/>
         <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>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector.cpp" line="113"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; You appear to be using custom card art, which has known bugs when also using the printing selector in this version of Cockatrice.</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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="170"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="178"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="184"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="192"/>
         <source>Show Related cards</source>
         <translation>显示关联卡牌</translation>
     </message>
@@ -6853,7 +6038,7 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
         <translation>用排组名称或代码进行搜寻</translation>
     </message>
@@ -6861,17 +6046,17 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
         <source>Previous Card in Deck</source>
         <translation>牌库次序中上一张卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Next Card in Deck</source>
         <translation>牌库次序中下一张卡牌</translation>
     </message>
@@ -6879,132 +6064,66 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
         <source>Alphabetical</source>
         <translation>英文字母次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Preference</source>
         <translation>喜好</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Release Date</source>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
+        <location filename="src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <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/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
         <source>Ascending</source>
         <translation>由先倒后</translation>
     </message>
 </context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
+        <location filename="src/client/ui/window_main.cpp" line="770"/>
         <source>Services</source>
         <translation>服务</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
+        <location filename="src/client/ui/window_main.cpp" line="771"/>
         <source>Hide %1</source>
         <translation>隐藏 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/client/ui/window_main.cpp" line="772"/>
         <source>Hide Others</source>
         <translation>隐藏其他</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/client/ui/window_main.cpp" line="773"/>
         <source>Show All</source>
         <translation>全部展示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
+        <location filename="src/client/ui/window_main.cpp" line="774"/>
         <source>Preferences...</source>
         <translation>喜好...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/client/ui/window_main.cpp" line="775"/>
         <source>Quit %1</source>
         <translation>退出%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/client/ui/window_main.cpp" line="776"/>
         <source>About %1</source>
         <translation>关於 %1</translation>
     </message>
@@ -7012,162 +6131,135 @@ This setting means you'll only see the default printing for each card, instead o
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
+        <location filename="src/client/ui/window_main.cpp" line="86"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatrice卡牌资料库 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/client/ui/window_main.cpp" line="87"/>
         <source>All files (*.*)</source>
         <translation>所有档案格式 (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
+        <location filename="src/client/ui/window_main.cpp" line="269"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice录像文件 (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../common/decklist.cpp" line="117"/>
         <source>Maindeck</source>
         <translation>主牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../common/decklist.cpp" line="119"/>
         <source>Sideboard</source>
         <translation>副牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../common/decklist.cpp" line="121"/>
         <source>Tokens</source>
         <translation>眾令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
         <source>A .cod version of this deck already exists. Overwrite it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/client/ui/window_main.cpp" line="779"/>
         <source>OK</source>
         <translation>OK/确认</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/client/ui/window_main.cpp" line="780"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/client/ui/window_main.cpp" line="781"/>
         <source>Save All</source>
         <translation>全部保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
+        <location filename="src/client/ui/window_main.cpp" line="782"/>
         <source>Open</source>
         <translation>打开</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
+        <location filename="src/client/ui/window_main.cpp" line="783"/>
         <source>&amp;Yes</source>
         <translation>&amp;是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/client/ui/window_main.cpp" line="784"/>
         <source>Yes to &amp;All</source>
         <translation>&amp;全选是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/client/ui/window_main.cpp" line="785"/>
         <source>&amp;No</source>
         <translation>&amp;否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/client/ui/window_main.cpp" line="786"/>
         <source>N&amp;o to All</source>
         <translation>&amp;全选否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/client/ui/window_main.cpp" line="787"/>
         <source>Abort</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/client/ui/window_main.cpp" line="788"/>
         <source>Retry</source>
         <translation>重试</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/client/ui/window_main.cpp" line="789"/>
         <source>Ignore</source>
         <translation>不理</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/client/ui/window_main.cpp" line="790"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/client/ui/window_main.cpp" line="791"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/client/ui/window_main.cpp" line="792"/>
         <source>Discard</source>
         <translation>弃牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/client/ui/window_main.cpp" line="793"/>
         <source>Help</source>
         <translation>协助</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/client/ui/window_main.cpp" line="794"/>
         <source>Apply</source>
         <translation>应用</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/client/ui/window_main.cpp" line="795"/>
         <source>Reset</source>
         <translation>重设</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/client/ui/window_main.cpp" line="796"/>
         <source>Restore Defaults</source>
         <translation>恢復常用认值</translation>
     </message>
@@ -7175,17 +6267,17 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="169"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="171"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/server/remote/remote_decklist_tree_widget.cpp" line="173"/>
         <source>Upload time</source>
         <translation>上载时间</translation>
     </message>
@@ -7193,149 +6285,103 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="149"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="151"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="153"/>
         <source>Players</source>
         <translation>玩家(眾)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="155"/>
         <source>Keep</source>
         <translation>选用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="157"/>
         <source>Time started</source>
         <translation>开始时间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
+        <location filename="src/server/remote/remote_replay_list_tree_widget.cpp" line="159"/>
         <source>Duration (sec)</source>
         <translation>维持(秒)</translation>
     </message>
 </context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="54"/>
         <source>Rooms</source>
         <translation>房间(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="55"/>
         <source>Joi&amp;n</source>
         <translation>&amp;加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="58"/>
         <source>Room</source>
         <translation>房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="59"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="60"/>
         <source>Permissions</source>
         <translation>许可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="61"/>
         <source>Players</source>
         <translation>玩家(眾)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="62"/>
         <source>Games</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>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/utility/sequence_edit.cpp" line="44"/>
         <source>Choose an action from the table</source>
         <translation>从列表中选择行动</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/utility/sequence_edit.cpp" line="51"/>
         <source>Hit the key/combination of keys you want to set for this action</source>
         <translation>按下以此行动设置的单键或组键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
+        <location filename="src/utility/sequence_edit.cpp" line="176"/>
         <source>Invalid key</source>
         <translation>设置的单键或组键无效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/utility/sequence_edit.cpp" line="183"/>
         <source>Shortcut already in use by:</source>
         <translation>捷键已被:&amp;使用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/utility/sequence_edit.cpp" line="217"/>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/utility/sequence_edit.cpp" line="218"/>
         <source>Restore default</source>
         <translation>恢復常用认值</translation>
     </message>
@@ -7343,27 +6389,27 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="src/client/network/sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="src/client/network/sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation>设置类型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="src/client/network/sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation>设置代码</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="src/client/network/sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation>长名</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="src/client/network/sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation>发行日期</translation>
     </message>
@@ -7371,53 +6417,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/dialogs/dlg_settings.cpp" line="1641"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1664"/>
         <source>Restore all default shortcuts</source>
         <translation>恢復所有常用快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1642"/>
         <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/dialogs/dlg_settings.cpp" line="1649"/>
         <source>Clear all default shortcuts</source>
         <translation>清除所有常用快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1650"/>
         <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/dialogs/dlg_settings.cpp" line="1659"/>
         <source>Section:</source>
         <translation>部分：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1660"/>
         <source>Action:</source>
         <translation>行动:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1661"/>
         <source>Shortcut:</source>
         <translation>快键:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1663"/>
         <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/dialogs/dlg_settings.cpp" line="1665"/>
         <source>Clear all shortcuts</source>
         <translation>清除所有快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1666"/>
         <source>Search by shortcut name</source>
         <translation>按快键名称搜寻</translation>
     </message>
@@ -7425,12 +6471,12 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>行动</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>快键</translation>
     </message>
@@ -7438,14 +6484,14 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>您的配置档案含有无效的快捷键.
 请检查您的快捷键设定.</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>以下快捷键设置已经返回常用状态：
@@ -7455,58 +6501,45 @@ Please check your shortcut settings!</source>
 <context>
     <name>ShutdownDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="21"/>
         <source>&amp;Reason for shutdown:</source>
         <translation>&amp;关闭原因:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="25"/>
         <source>&amp;Time until shutdown (minutes):</source>
         <translation>&amp;关闭倒数 (分鐘)：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="44"/>
         <source>Shut down server</source>
         <translation>关闭伺服器</translation>
     </message>
 </context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1543"/>
         <source>Enable &amp;sounds</source>
         <translation>启用&amp;声效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1544"/>
         <source>Current sounds theme:</source>
         <translation>现前声效主题：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1545"/>
         <source>Test system sound engine</source>
         <translation>测试系统声效引擎</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Sound settings</source>
         <translation>声效设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Master volume</source>
         <translation>主音量</translation>
     </message>
@@ -7514,48 +6547,48 @@ Please check your shortcut settings!</source>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Spoilers season has ended</source>
         <translation>预览季节已结束</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="101"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>现在正删除spoiler.xml。请啟动Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Spoilers download failed</source>
         <translation>预览下载出错</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="111"/>
         <source>No internet connection</source>
         <translation>没有网络连接</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="118"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>Spoilers already up to date</source>
         <translation>预览已是最新</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="139"/>
         <source>No new spoilers added</source>
         <translation>没有添加新预览</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Spoilers have been updated!</source>
         <translation>预览已被更新</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
+        <location filename="src/client/network/spoiler_background_updater.cpp" line="184"/>
         <source>Last change:</source>
         <translation>最后变更：</translation>
     </message>
@@ -7563,27 +6596,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/release_channel.cpp" line="104"/>
         <source>Default</source>
         <translation>常用</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/release_channel.cpp" line="120"/>
         <source>No reply received from the release update server.</source>
         <translation>从发佈更新伺服器收不到有效的回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
+        <location filename="src/client/network/release_channel.cpp" line="128"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>从发佈更新伺服器收不到有效的回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/release_channel.cpp" line="176"/>
         <source>No reply received from the tag update server.</source>
         <translation>未收到标籤更新伺服器的回应.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/release_channel.cpp" line="183"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>从标籤更新伺服器收不到有效的回覆.</translation>
     </message>
@@ -7591,17 +6624,17 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/client/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <location filename="src/client/tabs/tab_account.h" line="53"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
@@ -7609,289 +6642,166 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabAdmin</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
+        <location filename="src/client/tabs/tab_admin.h" line="61"/>
         <source>Administration</source>
         <translation>管理</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="131"/>
         <source>Update server &amp;message</source>
         <translation>更新伺服器&amp;信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="132"/>
         <source>&amp;Shut down server</source>
         <translation>&amp;关闭伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="133"/>
         <source>&amp;Reload configuration</source>
         <translation>&amp;重新载入设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="134"/>
         <source>Server administration functions</source>
         <translation>伺服器管理功能</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="135"/>
         <source>Server moderator functions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="137"/>
         <source>Replay ID</source>
         <translation>录像ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="138"/>
         <source>Grant Replay Access</source>
         <translation>给予游戏录像重温瀏览权</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="140"/>
         <source>Username to Activate</source>
         <translation>将要啟动的用户名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="141"/>
         <source>Force Activate User</source>
         <translation>强制性啟动用户</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="143"/>
         <source>&amp;Unlock functions</source>
         <translation>功能&amp;解锁</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="144"/>
         <source>&amp;Lock functions</source>
         <translation>功能&amp;锁定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="209"/>
         <source>Replay access granted</source>
         <translation>已给予游戏录像重温瀏览权</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="212"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
         <translation>不能给予游戏录像重温瀏览权. Replay id无效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="215"/>
         <source>Unable to grant replay access. Internal error</source>
         <translation>不能给予游戏录像重温瀏览权. 内部故障.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="224"/>
         <source>User successfully activated</source>
         <translation>用户已成功啟动</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="227"/>
         <source>Unable to activate user. Username invalid</source>
         <translation>不能啟动用户户口.用户名字无效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="230"/>
         <source>Unable to activate user. User already active</source>
         <translation>不能啟动用户户口.用户已被啟动</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
+        <location filename="src/client/tabs/tab_admin.cpp" line="233"/>
         <source>Unable to activate user. Internal error</source>
         <translation>不能啟动用户户口.内部故障</translation>
     </message>
 </context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="125"/>
         <source>Card Info</source>
         <translation>卡牌资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="126"/>
         <source>Deck</source>
         <translation>牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="127"/>
         <source>Filters</source>
         <translation>筛选项目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="124"/>
         <source>&amp;View</source>
         <translation>&amp;视图</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="128"/>
         <source>Printing</source>
         <translation>印刷版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="130"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="136"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="139"/>
         <source>Visible</source>
         <translation>可见</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="137"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="140"/>
         <source>Floating</source>
         <translation>浮动</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="142"/>
         <source>Reset layout</source>
         <translation>重置布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
+        <location filename="src/client/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Deck: %1</source>
         <translation>牌库:%1</translation>
     </message>
@@ -7899,55 +6809,68 @@ 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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="150"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="316"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="318"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="319"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="325"/>
+        <source>Deck Analytics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="338"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
         <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/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="344"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7955,22 +6878,22 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
+        <location filename="src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7978,138 +6901,138 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
         <translation>本地档案系统</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="168"/>
         <source>Server deck storage</source>
         <translation>伺服器牌库储藏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Open in deck editor</source>
         <translation>在套牌编辑打开</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Upload deck</source>
         <translation>上载牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="174"/>
         <source>Download deck</source>
         <translation>下载套牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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/client/tabs/tab_deck_storage.cpp" line="175"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="176"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>New folder</source>
         <translation>新文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
         <translation>打开牌库文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="260"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="263"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="278"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="313"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="333"/>
         <source>Invalid deck file</source>
         <translation>无效牌库档案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>Enter deck name</source>
         <translation>输入牌库名称</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="320"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation>本牌库列表未有名称.请输入名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Unnamed deck</source>
         <translation>未命名牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="350"/>
         <source>Failed to upload deck to server</source>
         <translation>牌库上载於伺服器时失败</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Delete local file</source>
         <translation>删除本地档案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="388"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>你确定要删除被选档案(眾)吗 ？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <source>Delete remote decks</source>
         <translation>删除伺服器上的牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="544"/>
         <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/client/tabs/tab_deck_storage.cpp" line="373"/>
+        <location filename="src/client/tabs/tab_deck_storage.cpp" line="508"/>
         <source>Name of new folder:</source>
         <translation>新建文件夹名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/client/tabs/tab_deck_storage.h" line="79"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -8117,17 +7040,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="27"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
+        <location filename="src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <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/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
@@ -8135,7 +7058,7 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRec</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec.h" line="21"/>
         <source>EDHREC: </source>
         <translation type="unfinished"/>
     </message>
@@ -8143,391 +7066,407 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
+        <location filename="src/client/tabs/api/edhrec/tab_edhrec_main.h" line="27"/>
+        <source>EDHREC: </source>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="1235"/>
         <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/client/tabs/tab_game.cpp" line="197"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="211"/>
         <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/client/tabs/tab_game.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="272"/>
         <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/client/tabs/tab_game.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="270"/>
         <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/client/tabs/tab_game.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="271"/>
         <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/client/tabs/tab_game.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="284"/>
         <source>Replay Timeline</source>
         <translation>录像时间线</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="222"/>
         <source>&amp;Phases</source>
         <translation>阶段</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="225"/>
         <source>&amp;Game</source>
         <translation>游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="227"/>
         <source>Next &amp;phase</source>
         <translation>下个&amp;阶段</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="230"/>
         <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/client/tabs/tab_game.cpp" line="233"/>
         <source>Next &amp;turn</source>
         <translation>下个&amp;回合</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="236"/>
         <source>Reverse turn order</source>
         <translation>逆转回合次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="239"/>
         <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/client/tabs/tab_game.cpp" line="242"/>
         <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/client/tabs/tab_game.cpp" line="245"/>
         <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/client/tabs/tab_game.cpp" line="248"/>
         <source>Game &amp;information</source>
         <translation>游戏&amp;资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="251"/>
         <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/client/tabs/tab_game.cpp" line="253"/>
         <source>&amp;Concede</source>
         <translation>&amp;投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="257"/>
         <source>&amp;Leave game</source>
         <translation>&amp;离开游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="260"/>
         <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/client/tabs/tab_game.cpp" line="263"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;聚焦聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="266"/>
         <source>&amp;Say:</source>
         <translation>&amp;説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="269"/>
         <source>&amp;View</source>
         <translation>&amp;视图</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="277"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="285"/>
         <source>Visible</source>
         <translation>可见</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="275"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="278"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="286"/>
         <source>Floating</source>
         <translation>浮动</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="289"/>
         <source>Reset layout</source>
         <translation>重置布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="486"/>
         <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/client/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation>撤销投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="493"/>
         <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/client/tabs/tab_game.cpp" line="511"/>
         <source>Leave game</source>
         <translation>离开游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
+        <location filename="src/client/tabs/tab_game.cpp" line="511"/>
         <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/client/tabs/tab_game.cpp" line="807"/>
+        <source>You are flooding the game. Please wait a couple of seconds.</source>
+        <translation>你正在刷屏。请稍等几秒鐘。</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1052"/>
         <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/client/tabs/tab_game.cpp" line="1053"/>
         <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/client/tabs/tab_game.cpp" line="1064"/>
+        <source>kicked by game host or moderator</source>
+        <translation>被游戏主机或版主踢出</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1067"/>
+        <source>player left the game</source>
+        <translation>玩家已经离开游戏</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1070"/>
+        <source>player disconnected from server</source>
+        <translation>玩家与伺服器断线</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1074"/>
+        <source>reason unknown</source>
+        <translation>原因不明</translation>
+    </message>
+    <message>
+        <location filename="src/client/tabs/tab_game.cpp" line="1112"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出游戏。</translation>
     </message>
 </context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>TabLog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
+        <location filename="src/client/tabs/tab_logs.h" line="61"/>
         <source>Logs</source>
         <translation>记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="30"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="36"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="42"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
         <translation>时间；发送者姓名；发送者IP；信息；目标ID；目标姓名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="45"/>
         <source>Room Logs</source>
         <translation>房间记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="46"/>
         <source>Game Logs</source>
         <translation>游戏记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="47"/>
         <source>Chat Logs</source>
         <translation>聊天记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="68"/>
         <source>You must select at least one filter.</source>
         <translation>您必须选择至少一个过滤项.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="78"/>
         <source>You have to select a valid number of days to locate.</source>
         <translation>您必须选择一个可用的日数来作为定位.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="148"/>
         <source>Username: </source>
         <translation>用户名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="152"/>
         <source>IP Address: </source>
         <translation>IP地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="156"/>
         <source>Game Name: </source>
         <translation>游戏名称：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="160"/>
         <source>GameID: </source>
         <translation>游戏ID：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="164"/>
         <source>Message: </source>
         <translation>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="169"/>
         <source>Main Room</source>
         <translation>主房</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="170"/>
         <source>Game Room</source>
         <translation>游戏房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="171"/>
         <source>Private Chat</source>
         <translation>私人聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="173"/>
         <source>Past X Days: </source>
         <translation>过去 X 天：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="174"/>
         <source>Today</source>
         <translation>今天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="175"/>
         <source>Last Hour</source>
         <translation>1小时前</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="179"/>
         <source>Maximum Results: </source>
         <translation>最多结果:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="183"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation>至少需要1个筛选项。
 您输入的信息越多，找到结果越準确。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="186"/>
         <source>Get User Logs</source>
         <translation>获取用户记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="190"/>
         <source>Clear Filters</source>
         <translation>清除筛选项目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="206"/>
         <source>Filters</source>
         <translation>筛选项目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="216"/>
         <source>Log Locations</source>
         <translation>记录位置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="225"/>
         <source>Date Range</source>
         <translation>日期范围</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="232"/>
         <source>Maximum Results</source>
         <translation>最多结果</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="269"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="275"/>
         <source>Message History</source>
         <translation>信息历史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="270"/>
         <source>Failed to collect message history information.</source>
         <translation>不能获取信息历史消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
+        <location filename="src/client/tabs/tab_logs.cpp" line="276"/>
         <source>There are no messages for the selected filters.</source>
         <translation>没有符合筛选条件的信息。</translation>
     </message>
@@ -8535,37 +7474,37 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabMessage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="69"/>
         <source>Private &amp;chat</source>
         <translation>私人&amp;聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="70"/>
         <source>&amp;Leave</source>
         <translation>&amp;离开</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="86"/>
         <source>%1 - Private chat</source>
         <translation>%1 - 私人聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="114"/>
         <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
         <translation>你已被这用户屏蔽, 它们不能再主聊天室看见你的信息,你亦不能参加它们的游戏.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="144"/>
         <source>Private message from</source>
         <translation>私人信息信到, 来自</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="161"/>
         <source>%1 has left the server.</source>
         <translation>%1 已离开伺服器.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/client/tabs/tab_message.cpp" line="167"/>
         <source>%1 has joined the server.</source>
         <translation>%1 已加入伺服器.</translation>
     </message>
@@ -8573,185 +7512,105 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="158"/>
         <source>Local file system</source>
         <translation>本地档案系统</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="159"/>
         <source>Server replay storage</source>
         <translation>伺服器录像仓库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="161"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="166"/>
         <source>Watch replay</source>
         <translation>观看游戏录像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="162"/>
         <source>Rename</source>
         <translation>改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>New folder</source>
         <translation>新文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="164"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="169"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="165"/>
         <source>Open replays folder</source>
         <translation>打开录像文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="167"/>
         <source>Download replay</source>
         <translation>下载游戏录像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="168"/>
         <source>Toggle expiration lock</source>
         <translation>过期锁定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local folder</source>
         <translation>本地档案夹改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="236"/>
         <source>Rename local file</source>
         <translation>本地档案改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="239"/>
         <source>New name:</source>
         <translation>新名称</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Error</source>
         <translation>出错</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="254"/>
         <source>Rename failed</source>
         <translation>改名不成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="272"/>
         <source>Name of new folder:</source>
         <translation>新建文件夹名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Delete local file</source>
         <translation>删除本地档案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="287"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>你确定要剷除所有被选的档案吗?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="444"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>你确定要删除被选录像档案吗 ？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
-        <source>Replay was added, or you already had access to it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
+        <location filename="src/client/tabs/tab_replays.cpp" line="443"/>
         <source>Delete remote replay</source>
         <translation>删除伺服器录像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
+        <location filename="src/client/tabs/tab_replays.h" line="72"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
@@ -8759,47 +7618,47 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="146"/>
         <source>&amp;Say:</source>
         <translation>&amp;説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="147"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="148"/>
         <source>&amp;Room</source>
         <translation>&amp;房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="149"/>
         <source>&amp;Leave room</source>
         <translation>&amp;离开房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="150"/>
         <source>&amp;Clear chat</source>
         <translation>&amp;清除聊天记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="151"/>
         <source>Chat Settings...</source>
         <translation>聊天设置...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="163"/>
         <source> mentioned you.</source>
         <translation>提到了你。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="171"/>
         <source>Click to view</source>
         <translation>点击查看</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_room.cpp" line="215"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation>你正在刷屏。请稍等几秒鐘。</translation>
     </message>
@@ -8807,35 +7666,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/client/tabs/tab_server.h" line="62"/>
         <source>Server</source>
         <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="205"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="206"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation>加入伺服器房间失败：在本伺服器上这房间并不存在。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="211"/>
         <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
         <translation>伺服器认为你在房间内, 但Cockatrice无法显示。请重新启动Cockatrice。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="216"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation>你未被允许进入该房间。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_server.cpp" line="221"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation>因为以下不知名的错误,所以不能参入伺服器房间: %1.</translation>
     </message>
@@ -8843,97 +7702,87 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="191"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="192"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="193"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="194"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="195"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="196"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="197"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="198"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="199"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="200"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="201"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="258"/>
         <source>Are you sure?</source>
         <translation>你确定吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="259"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation>游戏还在继续, 你确定要退出吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="963"/>
         <source>Click to view</source>
         <translation>点击查看</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="991"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>你的好友%1已登录!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1032"/>
         <source>Unknown Event</source>
         <translation>不知名事件</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1033"/>
         <source>The server has sent you a message that your client does not understand.
 This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
 
@@ -8944,38 +7793,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 要升级你的客户端，请点击“帮助”-&gt;“检查更新”</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>Idle Timeout</source>
         <translation>閒置超时</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1038"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>你即将因为长时间没有活动而被退出。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1042"/>
         <source>Promotion</source>
         <translation>升级</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1043"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation>你已被升级.请登出然后再登入让本更改生效.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1047"/>
         <source>Warned</source>
         <translation>被警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1048"/>
         <source>You have received a warning due to %1.
 Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
         <translation>你由於$1 原因,现在接受警告. 请避免继续本行为, 否则你将有可能会接受进一步的警诫或惩罚. 若有任何疑问, 请私信我们门下的版主.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
+        <location filename="src/client/tabs/tab_supervisor.cpp" line="1062"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation>你收到松本伺服器发出的以下讯息(类似本信息的自定讯息可能未经翻译)</translation>
@@ -8984,12 +7833,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
+        <location filename="src/client/tabs/tab_visual_database_display.h" line="22"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -8997,13 +7841,13 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TappedOutInterface</name>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="23"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="63"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
+        <location filename="src/client/tapped_out_interface.cpp" line="44"/>
         <source>Unable to analyze the deck.</source>
         <translation>不能分析本牌库.</translation>
     </message>
@@ -9011,14 +7855,14 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TipsOfTheDay</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="25"/>
         <source>File does not exist.
 </source>
         <translation>档案并不存在.
 </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
+        <location filename="src/client/ui/tip_of_the_day.cpp" line="28"/>
         <source>Failed to open file.
 </source>
         <translation>不能开啟档案.
@@ -9028,42 +7872,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/client/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>生命值</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/client/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/client/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>蓝色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/client/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>黑色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/client/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>红色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/client/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>绿色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/client/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>无色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/client/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>其他</translation>
     </message>
@@ -9071,7 +7915,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
+        <location filename="src/client/update_downloader.cpp" line="52"/>
         <source>Could not open the file for reading.</source>
         <translation>无法打开文件。</translation>
     </message>
@@ -9079,206 +7923,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="61"/>
         <source>User &amp;details</source>
         <translation>用户&amp;详细信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="62"/>
         <source>Private &amp;chat</source>
         <translation>私人&amp;聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="63"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>显示这个用户的&amp;游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="64"/>
         <source>Add to &amp;buddy list</source>
         <translation>加入到&amp;好友列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="65"/>
         <source>Remove from &amp;buddy list</source>
         <translation>从&amp;好友列表移除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="66"/>
         <source>Add to &amp;ignore list</source>
         <translation>加入到&amp;屏蔽列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="67"/>
         <source>Remove from &amp;ignore list</source>
         <translation>从&amp;屏蔽列表移除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="68"/>
         <source>Kick from &amp;game</source>
         <translation>从&amp;游戏中踢出</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="69"/>
         <source>Warn user</source>
         <translation>警告用户</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="70"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>查看用户警告记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="71"/>
         <source>Ban from &amp;server</source>
         <translation>把用户从&amp;伺服器禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="72"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>查看用户&amp;禁止记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="73"/>
         <source>&amp;Promote user to moderator</source>
         <translation>升$用户作为版主</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="74"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>把&amp;用户从版主降级</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="75"/>
         <source>Promote user to &amp;judge</source>
         <translation>把&amp;用户升级成裁判</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="76"/>
         <source>Demote user from judge</source>
         <translation>把&amp;用户从裁判降级</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="77"/>
         <source>View admin notes</source>
         <translation>阅读管理笔记</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <source>This user does not exist.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="107"/>
         <source>%1&apos;s games</source>
         <translation>%1 的游戏(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="162"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="185"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="189"/>
         <source>Ban History</source>
         <translation>禁用历史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="168"/>
         <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
         <translation>禁止时间；版主；禁止时长；禁止理由；可见理由</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="186"/>
         <source>User has never been banned.</source>
         <translation>用户从未被禁</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="190"/>
         <source>Failed to collect ban information.</source>
         <translation>不能获取禁用讯息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="200"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="221"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="225"/>
         <source>Warning History</source>
         <translation>警告历史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="205"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation>警告时间；版主；用户名称；理由</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="222"/>
         <source>User has never been warned.</source>
         <translation>用户从未接收警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="226"/>
         <source>Failed to collect warning information.</source>
         <translation>不能获取警告信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
         <source>Failed to get admin notes.</source>
         <translation>不能获取管理笔记</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="251"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="252"/>
         <source>Successfully promoted user.</source>
         <translation>用户升级成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="254"/>
         <source>Successfully demoted user.</source>
         <translation>用户降级成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="234"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed</source>
         <translation>失败</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="259"/>
         <source>Failed to promote user.</source>
         <translation>用户升级失败</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="261"/>
         <source>Failed to demote user.</source>
         <translation>用户降级失败</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="347"/>
         <source>Copy hash to clipboard</source>
         <translation>把哈希覆印到用户剪贴</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
+        <location filename="src/server/user/user_context_menu.cpp" line="367"/>
         <source>Remove this user&apos;s messages</source>
         <translation>移除这用户讯息</translation>
     </message>
@@ -9286,173 +8108,173 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/server/user/user_info_box.cpp" line="79"/>
         <source>Location:</source>
         <translation>位置：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/server/user/user_info_box.cpp" line="81"/>
         <source>Account Age:</source>
         <translation>帐户年龄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/server/user/user_info_box.cpp" line="83"/>
         <source>Edit</source>
         <translation>更改</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/server/user/user_info_box.cpp" line="84"/>
         <source>Change password</source>
         <translation>更改密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/server/user/user_info_box.cpp" line="85"/>
         <source>Change avatar</source>
         <translation>更改头像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/server/user/user_info_box.cpp" line="127"/>
         <source>Administrator</source>
         <translation>管理员</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/server/user/user_info_box.cpp" line="129"/>
         <source>Moderator</source>
         <translation>版主</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/server/user/user_info_box.cpp" line="131"/>
         <source>Registered user</source>
         <translation>登记用户</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <location filename="src/server/user/user_info_box.cpp" line="133"/>
+        <location filename="src/server/user/user_info_box.cpp" line="144"/>
         <source>Unregistered user</source>
         <translation>未登记用户</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
+        <location filename="src/server/user/user_info_box.cpp" line="136"/>
         <source>Judge</source>
         <translation>裁判</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/server/user/user_info_box.cpp" line="154"/>
         <source>Unknown</source>
         <translation>不知名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
         <source>The entered password does not match your account.</source>
         <translation>输入密码跟你户口不匹配</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Information</source>
         <translation>资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/server/user/user_info_box.cpp" line="316"/>
         <source>User information updated.</source>
         <translation>用户资讯已更新。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="268"/>
+        <location filename="src/server/user/user_info_box.cpp" line="319"/>
+        <location filename="src/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/server/user/user_info_box.cpp" line="327"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="350"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/server/user/user_info_box.cpp" line="71"/>
         <source>User Information</source>
         <translation>用户资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/server/user/user_info_box.cpp" line="78"/>
         <source>Real Name:</source>
         <translation>实名：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/server/user/user_info_box.cpp" line="80"/>
         <source>User Level:</source>
         <translation>用户等级:</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <location filename="src/server/user/user_info_box.cpp" line="172"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation><numerusform>%n年(眾) ，</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
+        <location filename="src/server/user/user_info_box.cpp" line="175"/>
         <source>%10%n Day(s) %20</source>
         <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
         <translation><numerusform>%10%n日(眾)  %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/server/user/user_info_box.cpp" line="231"/>
         <source>Enter Password</source>
         <translation>输入密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/server/user/user_info_box.cpp" line="232"/>
         <source>Password verification is required in order to change your email address</source>
         <translation>要核实密码才能更改你的电邮地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
+        <location filename="src/server/user/user_info_box.cpp" line="269"/>
+        <location filename="src/server/user/user_info_box.cpp" line="328"/>
+        <location filename="src/server/user/user_info_box.cpp" line="351"/>
         <source>An error occurred while trying to update your user information.</source>
         <translation>在尝试更新你的用户信息时出现错误.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <location filename="src/server/user/user_info_box.cpp" line="320"/>
         <source>This server does not permit you to update your user informations.</source>
         <translation>本伺服器不容许你更新你的用户资讯.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/server/user/user_info_box.cpp" line="337"/>
         <source>Password changed.</source>
         <translation>密码已更改</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/server/user/user_info_box.cpp" line="340"/>
         <source>This server does not permit you to change your password.</source>
         <translation>本伺服器不容许你更改密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/server/user/user_info_box.cpp" line="343"/>
         <source>The new password is too short.</source>
         <translation>新的密码太短</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/server/user/user_info_box.cpp" line="346"/>
         <source>The old password is incorrect.</source>
         <translation>旧的密码不正确</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/server/user/user_info_box.cpp" line="361"/>
         <source>Avatar updated.</source>
         <translation>头像已更新。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
+        <location filename="src/server/user/user_info_box.cpp" line="364"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>本伺服器不容许你更新你的头像.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
+        <location filename="src/server/user/user_info_box.cpp" line="368"/>
         <source>An error occured while trying to updater your avatar.</source>
         <translation>在更新你头像时出现错误</translation>
     </message>
@@ -9460,152 +8282,137 @@ 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/dialogs/dlg_settings.cpp" line="873"/>
         <source>General interface settings</source>
         <translation>一般通用接口设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="874"/>
         <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/dialogs/dlg_settings.cpp" line="875"/>
         <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/dialogs/dlg_settings.cpp" line="876"/>
         <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"/>
-        <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/dialogs/dlg_settings.cpp" line="877"/>
         <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/dialogs/dlg_settings.cpp" line="878"/>
         <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/dialogs/dlg_settings.cpp" line="879"/>
         <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/dialogs/dlg_settings.cpp" line="880"/>
         <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/dialogs/dlg_settings.cpp" line="881"/>
         <source>Notifications settings</source>
         <translation>通告设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="882"/>
         <source>Enable notifications in taskbar</source>
         <translation>开启任务栏通告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="883"/>
         <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/dialogs/dlg_settings.cpp" line="884"/>
         <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/dialogs/dlg_settings.cpp" line="885"/>
         <source>Animation settings</source>
         <translation>动画设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="886"/>
         <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/dialogs/dlg_settings.cpp" line="887"/>
         <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/dialogs/dlg_settings.cpp" line="888"/>
         <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/dialogs/dlg_settings.cpp" line="889"/>
         <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/dialogs/dlg_settings.cpp" line="890"/>
         <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/dialogs/dlg_settings.cpp" line="892"/>
         <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/dialogs/dlg_settings.cpp" line="894"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="896"/>
         <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/dialogs/dlg_settings.cpp" line="898"/>
         <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/dialogs/dlg_settings.cpp" line="899"/>
         <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/dialogs/dlg_settings.cpp" line="900"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="901"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="902"/>
         <source>Replay settings</source>
         <translation>重播设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
+        <location filename="src/dialogs/dlg_settings.cpp" line="903"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>用速键啟动向后跳的缓衝时间:</translation>
     </message>
@@ -9613,241 +8420,86 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="452"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="455"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="458"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="461"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Exact match</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
+        <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="53"/>
-        <source>Includes</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
+        <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="54"/>
-        <source>Include / Exclude</source>
-        <oldsource>Mode: Includes</oldsource>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
+        <source>Mode: Include/Exclude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
-        <source>How selected and unselected colors are combined in the filter</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
         <source>Save Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
         <source>Save all currently applied filters to a file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
         <source>Enter filename...</source>
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9855,27 +8507,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
+        <source>Filter by name...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
         <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -9883,7 +8535,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/client/ui/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 +8543,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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9911,37 +8563,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9949,93 +8591,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="167"/>
         <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"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="169"/>
+        <source>Save and load filters</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="170"/>
+        <source>Filter by exact card name</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>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="171"/>
+        <source>Filter by card sub-type</source>
         <translation type="unfinished"/>
     </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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <location filename="src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp" line="172"/>
+        <source>Filter by set</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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
         <source>Sample hand size</source>
         <translation type="unfinished"/>
     </message>
@@ -10043,25 +8637,46 @@ 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"/>
-        <source>Type a card name here for suggestions from the database...</source>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="192"/>
+        <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_editor_widget.cpp" line="208"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
         <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/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
         <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="196"/>
+        <source>Configure how cards are sorted within their groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="304"/>
+        <source>Overlap Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="199"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="301"/>
+        <source>Flat Layout</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -10069,52 +8684,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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/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/client/ui/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -10122,7 +8732,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"/>
     </message>
@@ -10130,22 +8740,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort by Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"/>
     </message>
@@ -10153,17 +8763,17 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -10171,43 +8781,43 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="135"/>
         <source>Which warning would you like to send?</source>
         <translation>你想发出那种警告？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="143"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation>把这用户在所有房间留下的讯息删除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="145"/>
         <source>&amp;OK</source>
         <translation>&amp;确认</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="148"/>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="163"/>
         <source>Warn user for misconduct</source>
         <translation>对行为不当的用户发出警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="175"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="170"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation>接收警告的用户名称不能空白.请定好要接收警告的用户名字.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
+        <location filename="src/server/user/user_list_widget.cpp" line="176"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation>警告名称不能留空. 请选择有效的警告.</translation>
     </message>
@@ -10215,133 +8825,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/dialogs/dlg_manage_sets.cpp" line="40"/>
         <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/dialogs/dlg_manage_sets.cpp" line="47"/>
         <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/dialogs/dlg_manage_sets.cpp" line="54"/>
         <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/dialogs/dlg_manage_sets.cpp" line="61"/>
         <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/dialogs/dlg_manage_sets.cpp" line="69"/>
         <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/dialogs/dlg_manage_sets.cpp" line="74"/>
         <source>Default order</source>
         <translation>常用次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="75"/>
         <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/dialogs/dlg_manage_sets.cpp" line="112"/>
         <source>Enable all sets</source>
         <translation>啟用所有牌组</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="113"/>
         <source>Disable all sets</source>
         <translation>禁用所有卡组</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="114"/>
         <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/dialogs/dlg_manage_sets.cpp" line="115"/>
         <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/dialogs/dlg_manage_sets.cpp" line="131"/>
         <source>Deck Editor</source>
         <translation>牌库编辑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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/dialogs/dlg_manage_sets.cpp" line="134"/>
         <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/dialogs/dlg_manage_sets.cpp" line="163"/>
         <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/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>Card Art</source>
         <translation>卡牌艺术</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="138"/>
         <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/dialogs/dlg_manage_sets.cpp" line="142"/>
         <source>Hints</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="145"/>
         <source>Note</source>
         <translation>笔记</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
+        <location filename="src/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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/dialogs/dlg_manage_sets.cpp" line="150"/>
         <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/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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/dialogs/dlg_manage_sets.cpp" line="154"/>
         <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/dialogs/dlg_manage_sets.cpp" line="193"/>
         <source>Manage sets</source>
         <translation>管理牌组</translation>
     </message>
@@ -10349,72 +8959,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="52"/>
         <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="219"/>
         <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="220"/>
         <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="221"/>
         <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="222"/>
         <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="229"/>
         <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="230"/>
         <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="231"/>
         <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="232"/>
         <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="233"/>
         <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="234"/>
         <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="235"/>
         <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="239"/>
         <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="240"/>
         <source>pile view</source>
         <translation>栋迭观看</translation>
     </message>
@@ -10422,7 +9032,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
+        <location filename="src/settings/cache_settings.cpp" line="169"/>
         <source>English</source>
         <translation>简体中文 (Chinese Simplified)</translation>
     </message>
@@ -10430,12 +9040,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="230"/>
+        <location filename="src/main.cpp" line="234"/>
         <source>Connect on startup</source>
         <translation>啟动时自动连接</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="231"/>
+        <location filename="src/main.cpp" line="235"/>
         <source>Debug to file</source>
         <translation>侦错纪录写进档案</translation>
     </message>
@@ -10443,1058 +9053,991 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
+        <location filename="src/settings/shortcuts_settings.h" line="41"/>
         <source>Main Window</source>
         <translation>主视窗</translation>
     </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/settings/shortcuts_settings.h" line="43"/>
+        <location filename="src/settings/shortcuts_settings.h" line="702"/>
         <source>Deck Editor</source>
         <translation>牌库编辑</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
+        <location filename="src/settings/shortcuts_settings.h" line="45"/>
         <source>Game Lobby</source>
         <translation>游戏厅堂</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
+        <location filename="src/settings/shortcuts_settings.h" line="47"/>
         <source>Card Counters</source>
         <translation>牌指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
+        <location filename="src/settings/shortcuts_settings.h" line="49"/>
         <source>Player Counters</source>
         <translation>玩家指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
+        <location filename="src/settings/shortcuts_settings.h" line="51"/>
         <source>Power and Toughness</source>
         <translation>力量和防御力</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
+        <location filename="src/settings/shortcuts_settings.h" line="53"/>
         <source>Game Phases</source>
         <translation>游戏阶段</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
+        <location filename="src/settings/shortcuts_settings.h" line="55"/>
         <source>Playing Area</source>
         <translation>游戏区域</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
+        <location filename="src/settings/shortcuts_settings.h" line="57"/>
         <source>Move Selected Card</source>
         <translation>移动所选牌张</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
+        <location filename="src/settings/shortcuts_settings.h" line="59"/>
         <source>View</source>
         <translation>查看</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
+        <location filename="src/settings/shortcuts_settings.h" line="61"/>
         <source>Move Top Card</source>
         <translation>移动顶牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
+        <location filename="src/settings/shortcuts_settings.h" line="63"/>
         <source>Move Bottom Card</source>
         <translation>移动底牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
+        <location filename="src/settings/shortcuts_settings.h" line="65"/>
         <source>Gameplay</source>
         <translation>游戏</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
+        <location filename="src/settings/shortcuts_settings.h" line="67"/>
         <source>Drawing</source>
         <translation>抽牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
+        <location filename="src/settings/shortcuts_settings.h" line="69"/>
         <source>Chat Room</source>
         <translation>聊天室</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
+        <location filename="src/settings/shortcuts_settings.h" line="71"/>
         <source>Game Window</source>
         <translation>游戏视窗</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
+        <location filename="src/settings/shortcuts_settings.h" line="73"/>
         <source>Load Deck from Clipboard</source>
         <translation>从剪贴板载入牌库</translation>
     </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/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/settings/shortcuts_settings.h" line="709"/>
         <source>Replays</source>
         <translation>游戏录像</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
+        <location filename="src/settings/shortcuts_settings.h" line="77"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/settings/shortcuts_settings.h" line="150"/>
         <source>Check for Card Updates...</source>
         <translation>检查卡牌更新</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/settings/shortcuts_settings.h" line="153"/>
         <source>Connect...</source>
         <translation>连线</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
+        <location filename="src/settings/shortcuts_settings.h" line="156"/>
         <source>Disconnect</source>
         <translation>断开连线</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
+        <location filename="src/settings/shortcuts_settings.h" line="160"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/settings/shortcuts_settings.h" line="161"/>
         <source>Full screen</source>
         <translation>全屏</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/settings/shortcuts_settings.h" line="164"/>
         <source>Register...</source>
         <translation>註册...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/settings/shortcuts_settings.h" line="167"/>
         <source>Settings...</source>
         <translation>设定...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/settings/shortcuts_settings.h" line="170"/>
         <source>Start a Local Game...</source>
         <translation>开始离线游戏</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/settings/shortcuts_settings.h" line="173"/>
         <source>Watch Replay...</source>
         <translation>观看录像</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
+        <location filename="src/settings/shortcuts_settings.h" line="179"/>
         <source>Analyze Deck (deckstats.net)</source>
+        <oldsource>Analyze Deck</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/settings/shortcuts_settings.h" line="183"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/settings/shortcuts_settings.h" line="186"/>
         <source>Clear All Filters</source>
         <translation>清除所有筛选项目</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
+        <location filename="src/settings/shortcuts_settings.h" line="189"/>
         <source>Clear Selected Filter</source>
         <translation>清除所选的筛选项目</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
+        <location filename="src/settings/shortcuts_settings.h" line="193"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/settings/shortcuts_settings.h" line="194"/>
         <source>Remove Card</source>
         <translation>移除卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/settings/shortcuts_settings.h" line="197"/>
         <source>Manage Sets...</source>
         <translation>管理牌组</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
+        <location filename="src/settings/shortcuts_settings.h" line="200"/>
         <source>Edit Custom Tokens...</source>
         <translation>编辑自定眾令牌...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
+        <location filename="src/settings/shortcuts_settings.h" line="204"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/settings/shortcuts_settings.h" line="208"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/settings/shortcuts_settings.h" line="211"/>
         <source>Add Card</source>
         <translation>添加卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
+        <location filename="src/settings/shortcuts_settings.h" line="214"/>
         <source>Load Deck...</source>
         <translation>载入牌库...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/settings/shortcuts_settings.h" line="218"/>
+        <location filename="src/settings/shortcuts_settings.h" line="274"/>
         <source>Load Deck from Clipboard...</source>
         <translation>从剪贴板载入牌库</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/settings/shortcuts_settings.h" line="222"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/settings/shortcuts_settings.h" line="226"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
+        <location filename="src/settings/shortcuts_settings.h" line="229"/>
         <source>New Deck</source>
         <translation>创建新牌库</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="233"/>
         <source>Open Custom Pictures Folder</source>
         <translation>打开自定图片文件夹</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/settings/shortcuts_settings.h" line="236"/>
         <source>Print Deck...</source>
         <translation>印刷牌库</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
+        <location filename="src/settings/shortcuts_settings.h" line="239"/>
         <source>Delete Card</source>
         <translation>删除卡牌</translation>
     </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/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/settings/shortcuts_settings.h" line="677"/>
         <source>Reset Layout</source>
         <translation>重置佈局</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/settings/shortcuts_settings.h" line="245"/>
         <source>Save Deck</source>
         <translation>保存牌库</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
+        <location filename="src/settings/shortcuts_settings.h" line="248"/>
         <source>Save Deck as...</source>
         <translation>牌库另存为</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
+        <location filename="src/settings/shortcuts_settings.h" line="252"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>从剪贴板储藏牌库, 带注释</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
+        <location filename="src/settings/shortcuts_settings.h" line="256"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
+        <location filename="src/settings/shortcuts_settings.h" line="260"/>
         <source>Save Deck to Clipboard</source>
         <translation>从剪贴板储藏牌库</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/settings/shortcuts_settings.h" line="264"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/settings/shortcuts_settings.h" line="267"/>
         <source>Load Local Deck...</source>
         <translation>从自身档案载入牌库</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
+        <location filename="src/settings/shortcuts_settings.h" line="270"/>
         <source>Load Remote Deck...</source>
         <translation>载入伺服器上的牌库...</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
+        <location filename="src/settings/shortcuts_settings.h" line="280"/>
         <source>Set Ready to Start</source>
         <translation>设定準备开始</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/settings/shortcuts_settings.h" line="284"/>
         <source>Toggle Sideboard Lock</source>
         <translation>切换副牌库锁</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/settings/shortcuts_settings.h" line="389"/>
         <source>Add Green Counter</source>
         <translation>增加绿色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Green Counter</source>
         <translation>移除绿色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/settings/shortcuts_settings.h" line="395"/>
         <source>Set Green Counters...</source>
         <translation>设定绿色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/settings/shortcuts_settings.h" line="380"/>
         <source>Add Red Counter</source>
         <translation>增加红色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Red Counter</source>
         <translation>移除红色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/settings/shortcuts_settings.h" line="386"/>
         <source>Set Red Counters...</source>
         <translation>设定红色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/settings/shortcuts_settings.h" line="344"/>
         <source>Add Life Counter</source>
         <translation>增加生命指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/settings/shortcuts_settings.h" line="176"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/settings/shortcuts_settings.h" line="277"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/settings/shortcuts_settings.h" line="287"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/settings/shortcuts_settings.h" line="290"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/settings/shortcuts_settings.h" line="293"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/settings/shortcuts_settings.h" line="296"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Life Counter</source>
         <translation>移除生命指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/settings/shortcuts_settings.h" line="350"/>
         <source>Set Life Counters...</source>
         <translation>设定生命指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/settings/shortcuts_settings.h" line="353"/>
         <source>Add White Counter</source>
         <translation>增加白色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/settings/shortcuts_settings.h" line="356"/>
         <source>Remove White Counter</source>
         <translation>移除白色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/settings/shortcuts_settings.h" line="359"/>
         <source>Set White Counters...</source>
         <translation>设定白色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/settings/shortcuts_settings.h" line="362"/>
         <source>Add Blue Counter</source>
         <translation>增加蓝色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/settings/shortcuts_settings.h" line="365"/>
         <source>Remove Blue Counter</source>
         <translation>移除蓝色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/settings/shortcuts_settings.h" line="368"/>
         <source>Set Blue Counters...</source>
         <translation>设定蓝色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/settings/shortcuts_settings.h" line="371"/>
         <source>Add Black Counter</source>
         <translation>增加黑色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Black Counter</source>
         <translation>移除黑色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/settings/shortcuts_settings.h" line="377"/>
         <source>Set Black Counters...</source>
         <translation>设定黑色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/settings/shortcuts_settings.h" line="398"/>
         <source>Add Colorless Counter</source>
         <translation>增加无色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Colorless Counter</source>
         <translation>移除无色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/settings/shortcuts_settings.h" line="404"/>
         <source>Set Colorless Counters...</source>
         <translation>设定无色指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/settings/shortcuts_settings.h" line="407"/>
         <source>Add Other Counter</source>
         <translation>增加其他指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Other Counter</source>
         <translation>移除其他指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
+        <location filename="src/settings/shortcuts_settings.h" line="413"/>
         <source>Set Other Counters...</source>
         <translation>设定其他指示物</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/settings/shortcuts_settings.h" line="416"/>
         <source>Add Power (+1/+0)</source>
         <translation>增加力量(+1/+0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Power (-1/-0)</source>
         <translation>削减力量(-1/-0)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/settings/shortcuts_settings.h" line="422"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>防御移到力量（+1/-1）</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/settings/shortcuts_settings.h" line="425"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>增加防御(+0/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/settings/shortcuts_settings.h" line="428"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>削减防御(-0/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/settings/shortcuts_settings.h" line="431"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>力量移到防御（-1/+1）</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/settings/shortcuts_settings.h" line="434"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>增加力量和防御(+1/+1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/settings/shortcuts_settings.h" line="437"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>削减力量和防御(-1/-1)</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/settings/shortcuts_settings.h" line="440"/>
         <source>Set Power and Toughness...</source>
         <translation>设置力量和防御</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/settings/shortcuts_settings.h" line="443"/>
         <source>Reset Power and Toughness</source>
         <translation>重置力量和防御</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
+        <location filename="src/settings/shortcuts_settings.h" line="446"/>
         <source>Untap</source>
         <translation>重置</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/settings/shortcuts_settings.h" line="450"/>
         <source>Upkeep</source>
         <translation>维持</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
+        <location filename="src/settings/shortcuts_settings.h" line="452"/>
         <source>Draw</source>
         <translation>抽牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/settings/shortcuts_settings.h" line="453"/>
         <source>First Main Phase</source>
         <translation>第一主阶段</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
+        <location filename="src/settings/shortcuts_settings.h" line="456"/>
         <source>Start Combat</source>
         <translation>开始战斗</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
+        <location filename="src/settings/shortcuts_settings.h" line="460"/>
         <source>Attack</source>
         <translation>攻击</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/settings/shortcuts_settings.h" line="462"/>
         <source>Block</source>
         <translation>挡格</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
+        <location filename="src/settings/shortcuts_settings.h" line="464"/>
         <source>Damage</source>
         <translation>计算损害</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/settings/shortcuts_settings.h" line="465"/>
         <source>End Combat</source>
         <translation>战斗结束</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
+        <location filename="src/settings/shortcuts_settings.h" line="468"/>
         <source>Second Main Phase</source>
         <translation>第二主阶段</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
+        <location filename="src/settings/shortcuts_settings.h" line="472"/>
         <source>End</source>
         <translation>完结</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/settings/shortcuts_settings.h" line="473"/>
         <source>Next Phase</source>
         <translation>下个阶段</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/settings/shortcuts_settings.h" line="476"/>
         <source>Next Phase Action</source>
         <translation>下个行动阶段</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/settings/shortcuts_settings.h" line="479"/>
         <source>Next Turn</source>
         <translation>下一回合</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/settings/shortcuts_settings.h" line="482"/>
         <source>Hide Card in Reveal Window</source>
         <translation>从揭露视窗中隐藏这牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/settings/shortcuts_settings.h" line="485"/>
         <source>Tap / Untap Card</source>
         <translation>横置/重置这牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
+        <location filename="src/settings/shortcuts_settings.h" line="488"/>
         <source>Untap All</source>
         <translation>重置全牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
+        <location filename="src/settings/shortcuts_settings.h" line="491"/>
+        <source>Toggle Untap</source>
+        <translation>锁定重置状态</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/settings/shortcuts_settings.h" line="494"/>
         <source>Turn Card Over</source>
         <translation>反转本牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/settings/shortcuts_settings.h" line="497"/>
         <source>Peek Card</source>
         <translation>查看卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/settings/shortcuts_settings.h" line="500"/>
         <source>Play Card</source>
         <translation>使出本牌</translation>
     </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"/>
+        <location filename="src/settings/shortcuts_settings.h" line="503"/>
         <source>Attach Card...</source>
         <translation>结附牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/settings/shortcuts_settings.h" line="506"/>
         <source>Unattach Card</source>
         <translation>解除牌结附</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/settings/shortcuts_settings.h" line="509"/>
         <source>Clone Card</source>
         <translation>复製卡牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/settings/shortcuts_settings.h" line="512"/>
         <source>Create Token...</source>
         <translation>派出令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/settings/shortcuts_settings.h" line="515"/>
         <source>Create All Related Tokens</source>
         <translation>派出所有相关令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/settings/shortcuts_settings.h" line="518"/>
         <source>Create Another Token</source>
         <translation>再做另外令牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/settings/shortcuts_settings.h" line="521"/>
         <source>Set Annotation...</source>
         <translation>记下註解</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/settings/shortcuts_settings.h" line="524"/>
         <source>Select All Cards in Zone</source>
         <translation>选择所有在区域的牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="527"/>
         <source>Select All Cards in Row</source>
         <translation>选择所有横行牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
+        <location filename="src/settings/shortcuts_settings.h" line="530"/>
         <source>Select All Cards in Column</source>
         <translation>选择所有直行牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/settings/shortcuts_settings.h" line="533"/>
+        <location filename="src/settings/shortcuts_settings.h" line="593"/>
         <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="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
+        <location filename="src/settings/shortcuts_settings.h" line="536"/>
+        <location filename="src/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="608"/>
         <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="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/settings/shortcuts_settings.h" line="539"/>
+        <location filename="src/settings/shortcuts_settings.h" line="556"/>
+        <location filename="src/settings/shortcuts_settings.h" line="579"/>
+        <location filename="src/settings/shortcuts_settings.h" line="601"/>
         <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="570"/>
+        <location filename="src/settings/shortcuts_settings.h" line="543"/>
+        <location filename="src/settings/shortcuts_settings.h" line="554"/>
         <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/settings/shortcuts_settings.h" line="544"/>
+        <location filename="src/settings/shortcuts_settings.h" line="612"/>
         <source>Top of Library</source>
         <translation>牌库顶</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/settings/shortcuts_settings.h" line="547"/>
+        <location filename="src/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/settings/shortcuts_settings.h" line="598"/>
         <source>Battlefield, Face Down</source>
         <translation>战场，面朝下</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/settings/shortcuts_settings.h" line="550"/>
         <source>Battlefield</source>
         <translation>战场</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/settings/shortcuts_settings.h" line="558"/>
         <source>Library</source>
         <translation>牌库</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/settings/shortcuts_settings.h" line="561"/>
         <source>Sideboard</source>
         <translation>副牌库</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/settings/shortcuts_settings.h" line="564"/>
         <source>Top Cards of Library</source>
         <translation>排副多张顶牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/settings/shortcuts_settings.h" line="567"/>
         <source>Bottom Cards of Library</source>
         <translation>排副多张底牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
+        <location filename="src/settings/shortcuts_settings.h" line="570"/>
         <source>Close Recent View</source>
         <translation>关闭最近查看</translation>
     </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/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/settings/shortcuts_settings.h" line="597"/>
         <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/settings/shortcuts_settings.h" line="582"/>
+        <location filename="src/settings/shortcuts_settings.h" line="604"/>
         <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/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/settings/shortcuts_settings.h" line="609"/>
         <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/settings/shortcuts_settings.h" line="590"/>
         <source>Stack Until Found</source>
         <translation>找到以下牌前全送迭区</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
+        <location filename="src/settings/shortcuts_settings.h" line="615"/>
         <source>Draw Bottom Card</source>
         <translation>从牌库底抽一张牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
+        <location filename="src/settings/shortcuts_settings.h" line="618"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>从牌库底抽超过一张牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
+        <location filename="src/settings/shortcuts_settings.h" line="621"/>
         <source>Draw Arrow...</source>
         <translation>画箭咀</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
+        <location filename="src/settings/shortcuts_settings.h" line="624"/>
         <source>Remove Local Arrows</source>
         <translation>清除自设箭咀</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
+        <location filename="src/settings/shortcuts_settings.h" line="627"/>
         <source>Leave Game</source>
         <translation>离开游戏</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/settings/shortcuts_settings.h" line="631"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
+        <location filename="src/settings/shortcuts_settings.h" line="632"/>
         <source>Roll Dice...</source>
         <translation>掷骰</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
+        <location filename="src/settings/shortcuts_settings.h" line="635"/>
         <source>Shuffle Library</source>
         <translation>洗牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
+        <location filename="src/settings/shortcuts_settings.h" line="638"/>
         <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/settings/shortcuts_settings.h" line="641"/>
         <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/settings/shortcuts_settings.h" line="644"/>
         <source>Mulligan</source>
         <translation>再调度</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
+        <location filename="src/settings/shortcuts_settings.h" line="647"/>
         <source>Draw a Card</source>
         <translation>抽一张牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
+        <location filename="src/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards...</source>
         <translation>抽超过一张牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
+        <location filename="src/settings/shortcuts_settings.h" line="653"/>
         <source>Undo Draw</source>
         <translation>撤销抽牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
+        <location filename="src/settings/shortcuts_settings.h" line="656"/>
         <source>Always Reveal Top Card</source>
         <translation>永远显示顶牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
+        <location filename="src/settings/shortcuts_settings.h" line="659"/>
         <source>Always Look At Top Card</source>
         <translation>永远看到顶牌</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
+        <location filename="src/settings/shortcuts_settings.h" line="662"/>
         <source>Rotate View Clockwise</source>
         <translation>视角顺时针转</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
+        <location filename="src/settings/shortcuts_settings.h" line="665"/>
         <source>Rotate View Counterclockwise</source>
         <translation>视角逆时针转</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/settings/shortcuts_settings.h" line="668"/>
         <source>Unfocus Text Box</source>
         <translation>取消聚焦文本框</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
+        <location filename="src/settings/shortcuts_settings.h" line="671"/>
         <source>Focus Chat</source>
         <translation>聚焦聊天</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/settings/shortcuts_settings.h" line="674"/>
         <source>Clear Chat</source>
         <translation>扫清聊天</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
+        <location filename="src/settings/shortcuts_settings.h" line="680"/>
         <source>Refresh</source>
         <translation>刷新</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
+        <location filename="src/settings/shortcuts_settings.h" line="683"/>
         <source>Skip Forward</source>
         <translation>跳前</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
+        <location filename="src/settings/shortcuts_settings.h" line="686"/>
         <source>Skip Backward</source>
         <translation>跳后</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
+        <location filename="src/settings/shortcuts_settings.h" line="689"/>
         <source>Skip Forward by a lot</source>
         <translation>向前大跳</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
+        <location filename="src/settings/shortcuts_settings.h" line="692"/>
         <source>Skip Backward by a lot</source>
         <translation>向后大跳</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
+        <location filename="src/settings/shortcuts_settings.h" line="695"/>
         <source>Play/Pause</source>
         <translation>播放/暂停</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
+        <location filename="src/settings/shortcuts_settings.h" line="698"/>
         <source>Toggle Fast Forward</source>
         <translation>切换快进</translation>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
+        <location filename="src/settings/shortcuts_settings.h" line="703"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
+        <location filename="src/settings/shortcuts_settings.h" line="707"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
+        <location filename="src/settings/shortcuts_settings.h" line="711"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
+        <location filename="src/settings/shortcuts_settings.h" line="713"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
+        <location filename="src/settings/shortcuts_settings.h" line="714"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
+        <location filename="src/settings/shortcuts_settings.h" line="718"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_zh-Hant.ts b/cockatrice/translations/cockatrice_zh-Hant.ts
deleted file mode 100644
index 1980960a9..000000000
--- a/cockatrice/translations/cockatrice_zh-Hant.ts
+++ /dev/null
@@ -1,11492 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="zh-Hant">
-<context>
-    <name>AbstractCounter</name>
-    <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
-        <source>&amp;Set counter...</source>
-        <translation>設置指示物為...</translation>
-    </message>
-</context>
-<context>
-    <name>AbstractCounterDialog</name>
-    <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
-        <source>Set counter</source>
-        <translation>設置指示物</translation>
-    </message>
-    <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
-        <source>New value for counter &apos;%1&apos;:</source>
-        <translation>新的指示物數值&apos;%1&apos;：</translation>
-    </message>
-</context>
-<context>
-    <name>AbstractDlgDeckTextEdit</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
-        <source>&amp;Refresh</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
-        <source>Parse Set Name and Number (if available)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AbstractTabDeckEditor</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="243"/>
-        <source>Open in new tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
-        <source>Are you sure?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
-        <source>The decklist has been modified.
-Do you want to save the changes?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="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"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
-        <source>Could not open deck at %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="338"/>
-        <source>Could not save remote deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
-        <source>The deck could not be saved.
-Please check that the directory is writable and try again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="374"/>
-        <source>Save deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="409"/>
-        <source>The deck could not be saved.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="532"/>
-        <source>There are no cards in your deck to be exported</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AddAnalyticsPanelDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
-        <source>Add Analytics Panel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdminNotesDialog</name>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
-        <source>Update Notes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
-        <source>Admin Notes for %1</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AllZonesCardAmountWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
-        <source>Mainboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
-        <source>Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AppearanceSettingsPage</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="446"/>
-        <source> seconds</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
-        <source>Could not create themes directory at &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
-        <source>Theme settings</source>
-        <translation>主題設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
-        <source>Current theme:</source>
-        <translation>當前主題</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
-        <source>Open themes folder</source>
-        <translation>打開主題文件夾</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
-        <source>Home tab background source:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
-        <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Disabled</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="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"/>
-        <source>Menu settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
-        <source>Show keyboard shortcuts in right-click menus</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>Show game filter toolbar above list in room tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
-        <source>Card rendering</source>
-        <translation>牌面</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
-        <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"/>
-        <source>Auto-Rotate cards with sideways layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
-        <source>Bump sets that the deck contains cards from to the top in the printing selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
-        <source>Scale cards on mouse over</source>
-        <translation>卡牌隨指針縮放</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <source>Use rounded card corners</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
-        <source>Minimum overlap percentage of cards on the stack and in vertical hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
-        <source>Maximum initial height for card view window:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
-        <source> rows</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
-        <source>Maximum expanded height for card view window:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
-        <source>Card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
-        <source>Counter %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
-        <source>Hand layout</source>
-        <translation>手牌區域佈局</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
-        <source>Display hand horizontally (wastes space)</source>
-        <translation>水平顯示手牌區域 (浪費空間)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
-        <source>Enable left justification</source>
-        <translation>開啓左對齊</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
-        <source>Table grid layout</source>
-        <translation>表格佈局</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
-        <source>Invert vertical coordinate</source>
-        <translation>反轉垂直坐標</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
-        <source>Minimum player count for multi-column layout:</source>
-        <translation>界面佈局之內能夠容納的玩家欄數量：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
-        <source>Maximum font size for information displayed on cards:</source>
-        <translation>卡牌上顯示的最大字號</translation>
-    </message>
-</context>
-<context>
-    <name>ArchidektApiResponseDeckDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
-        <source>Back to results</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
-        <source>Open Deck in Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BackgroundSources</name>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
-        <source>Theme</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
-        <source>Art crop of random card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
-        <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>BanDialog</name>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
-        <source>ban &amp;user name</source>
-        <translation>禁止該用戶</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
-        <source>ban &amp;IP address</source>
-        <translation>禁止該IP地址</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
-        <source>ban client I&amp;D</source>
-        <translation>禁止該客户端</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
-        <source>Ban type</source>
-        <translation>禁止類型</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
-        <source>&amp;permanent ban</source>
-        <translation>永久禁止</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
-        <source>&amp;temporary ban</source>
-        <translation>暫時禁止</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
-        <source>&amp;Days:</source>
-        <translation>天：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
-        <source>&amp;Hours:</source>
-        <translation>小時：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
-        <source>&amp;Minutes:</source>
-        <translation>分鐘：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
-        <source>Duration of the ban</source>
-        <translation>持續時長</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
-        <source>Please enter the reason for the ban.
-This is only saved for moderators and cannot be seen by the banned person.</source>
-        <translation>請輸入禁止原因.
-此項為管理緣由而保存並且對於這位被禁止的用戶不可見.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
-        <source>Please enter the reason for the ban that will be visible to the banned person.</source>
-        <translation>請輸入對於被禁止用戶可見的禁止原因</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
-        <source>Redact all messages from this user in all rooms</source>
-        <translation>修改該用戶在所有房間中的所有消息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
-        <source>&amp;OK</source>
-        <translation>確認</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
-        <source>&amp;Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
-        <source>Ban user from server</source>
-        <translation>禁止此用戶</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
-        <source>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</source>
-        <translation>你必須選擇姓名、IP、客户端或任意多選組合來執行禁止操作。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
-        <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
-        <translation>在禁用姓名時必須填寫一個姓名。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
-        <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
-        <translation>在禁用IP時必須填寫一個IP。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
-        <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
-        <translation>在禁用客戶端ID時必須填寫一個客戶端ID。</translation>
-    </message>
-</context>
-<context>
-    <name>BetaReleaseChannel</name>
-    <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
-        <source>Beta</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
-        <source>No reply received from the release update server.</source>
-        <translation>未收到更新伺服器的回應。</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
-        <source>Invalid reply received from the release update server.</source>
-        <translation>收到更新伺服器的無效回應</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
-        <source>No reply received from the file update server.</source>
-        <translation>未收到文件更新伺服器的回應</translation>
-    </message>
-</context>
-<context>
-    <name>CardDatabaseModel</name>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
-        <source>Name</source>
-        <translation>名稱</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
-        <source>Sets</source>
-        <translation>系列</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
-        <source>Mana cost</source>
-        <translation>魔法力費用</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
-        <source>Card type</source>
-        <translation>卡牌類別</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
-        <source>P/T</source>
-        <translation>力量/防禦力</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
-        <source>Color(s)</source>
-        <translation>顏色</translation>
-    </message>
-</context>
-<context>
-    <name>CardFilter</name>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
-        <source>AND</source>
-        <comment>Logical conjunction operator used in card filter</comment>
-        <translation>和</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
-        <source>OR</source>
-        <comment>Logical disjunction operator used in card filter</comment>
-        <translation>或</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
-        <source>AND NOT</source>
-        <comment>Negated logical conjunction operator used in card filter</comment>
-        <translation>和不是</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
-        <source>OR NOT</source>
-        <comment>Negated logical disjunction operator used in card filter</comment>
-        <translation>或不是</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
-        <source>Name</source>
-        <translation>名稱</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
-        <source>Name (Exact)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
-        <source>Type</source>
-        <translation>類型</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
-        <source>Color</source>
-        <translation>顏色</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
-        <source>Text</source>
-        <translation>文本</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
-        <source>Set</source>
-        <translation>系列</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
-        <source>Mana Cost</source>
-        <translation>魔法力費用</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
-        <source>Mana Value</source>
-        <translation>魔法力值</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
-        <source>Rarity</source>
-        <translation>稀有度</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
-        <source>Power</source>
-        <translation>力量</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
-        <source>Toughness</source>
-        <translation>防禦力</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
-        <source>Loyalty</source>
-        <translation>忠誠</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
-        <source>Format</source>
-        <translation>賽制</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CardInfoFrameWidget</name>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="68"/>
-        <source>Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="69"/>
-        <source>Description</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="70"/>
-        <source>Both</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_frame_widget.cpp" line="73"/>
-        <source>View transformation</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CardInfoPictureWidget</name>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="375"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
-        <source>Add card to deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
-        <source>Mainboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
-        <source>Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CardInfoTextWidget</name>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="63"/>
-        <source>Name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="69"/>
-        <source>Set:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
-        <source>Collector Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
-        <source>Related cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
-        <source>Unknown card:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
-        <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
-        <source>View related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
-        <source>Token: </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
-        <source>All tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
-        <source>&amp;Select All</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
-        <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
-        <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
-        <source>&amp;Play</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
-        <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
-        <source>&amp;Tap / Untap</source>
-        <extracomment>Turn sideways or back again</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
-        <source>Skip &amp;untapping</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
-        <source>T&amp;urn Over</source>
-        <extracomment>Turn face up/face down</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="460"/>
-        <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
-        <source>&amp;Clone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
-        <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
-        <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
-        <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
-        <source>&amp;Set annotation...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
-        <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
-        <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
-        <source>&amp;Remove counter (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
-        <source>&amp;Set counters (%1)...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CardSizeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
-        <source>Card Size</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CardZoneLogic</name>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
-        <source>their hand</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
-        <source>%1&apos;s hand</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
-        <source>their library</source>
-        <comment>look at zone</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
-        <source>%1&apos;s library</source>
-        <comment>look at zone</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
-        <source>of their library</source>
-        <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
-        <source>of %1&apos;s library</source>
-        <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="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"/>
-        <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"/>
-        <source>their library</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
-        <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"/>
-        <source>their graveyard</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
-        <source>%1&apos;s graveyard</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
-        <source>their exile</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
-        <source>%1&apos;s exile</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
-        <source>their sideboard</source>
-        <comment>look at zone</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
-        <source>%1&apos;s sideboard</source>
-        <comment>look at zone</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
-        <source>their sideboard</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
-        <source>%1&apos;s sideboard</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
-        <source>their custom zone &apos;%1&apos;</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="213"/>
-        <source>%1&apos;s custom zone &apos;%2&apos;</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CockatriceXml3Parser</name>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
-        <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CockatriceXml4Parser</name>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
-        <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CustomZoneMenu</name>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckAnalyticsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
-        <source>Add Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
-        <source>Remove Panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
-        <source>Save Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
-        <source>Load Layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardDatabaseDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorCardInfoDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
-        <source>Card Info</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorDatabaseDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
-        <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="197"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
-        <source>Add card to &amp;maindeck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="242"/>
-        <source>Add card to &amp;sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorDeckDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
-        <source>Loading Database...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
-        <source>Banner Card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
-        <source>Mana Cost</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
-        <source>Colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
-        <source>Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
-        <source>Deck &amp;name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
-        <source>Banner Card/Tags Visibility Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
-        <source>Show banner card selection menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
-        <source>Show tags selection menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
-        <source>&amp;Comments:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
-        <source>Group by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
-        <source>Format:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
-        <source>Hash:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
-        <source>&amp;Increment number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
-        <source>&amp;Decrement number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
-        <source>&amp;Remove row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
-        <source>Swap card to/from sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorFilterDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
-        <source>&amp;Clear all filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
-        <source>Delete selected</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorMenu</name>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
-        <source>&amp;Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
-        <source>&amp;New deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
-        <source>&amp;Load deck...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
-        <source>Load recent deck...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
-        <source>Clear</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
-        <source>&amp;Save deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
-        <source>Save deck &amp;as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
-        <source>Load deck from cl&amp;ipboard...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
-        <source>Edit deck in clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
-        <source>Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="169"/>
-        <source>Not Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
-        <source>Save deck to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="168"/>
-        <source>Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="170"/>
-        <source>Not Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="172"/>
-        <source>&amp;Print deck...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
-        <source>&amp;Send deck to online service</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
-        <source>Create decklist (decklist.org)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
-        <source>Create decklist (decklist.xyz)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
-        <source>Analyze deck (deckstats.net)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
-        <source>Analyze deck (tappedout.net)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckEditorPrintingSelectorDockWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
-        <source>Printing Selector</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<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"/>
-        <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"/>
-        <source>Success</source>
-        <translation>成功</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
-        <source>Download URLs have been reset.</source>
-        <translation>下載URL已重置。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>下載的卡牌圖片已被重置。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Edit URL</source>
-        <translation>編輯URL</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1311"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
-        <source>Add New URL</source>
-        <translation>添加新的URL</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
-        <source>Remove URL</source>
-        <translation>移除URL</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
-        <source>Day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
-        <source>Updating...</source>
-        <translation>更新中...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
-        <source>Choose path</source>
-        <translation>選擇路徑</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>URL Download Priority</source>
-        <translation>URL下載優先級</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
-        <source>Spoilers</source>
-        <translation>預覽</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
-        <source>Download Spoilers Automatically</source>
-        <translation>自動下載預覽</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
-        <source>Spoiler Location:</source>
-        <translation>預覽位置:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
-        <source>Last Change</source>
-        <translation>最近的變更</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
-        <source>Spoilers download automatically on launch</source>
-        <translation>自動下載預覽運行</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
-        <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"/>
-        <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"/>
-        <source>Download card pictures on the fly</source>
-        <translation>即時下載卡牌圖片</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
-        <source>How to add a custom URL</source>
-        <translation>如何添加自定義URL</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
-        <source>Delete Downloaded Images</source>
-        <translation>刪除已下載的圖片</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
-        <source>Reset Download URLs</source>
-        <translation>重置用於下載的URL</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckListHistoryManagerWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
-        <source>Undo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
-        <source>Redo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
-        <source>Undo/Redo history</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
-        <source>Click on an entry to revert to that point in the history.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
-        <source>[redo] </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
-        <source>[undo] </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckListModel</name>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
-        <source>Count</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
-        <source>Set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
-        <source>Number</source>
-        <translation>數量</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
-        <source>Provider ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
-        <source>Card</source>
-        <translation>卡牌</translation>
-    </message>
-</context>
-<context>
-    <name>DeckLoader</name>
-    <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
-        <source>Common deck formats (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
-        <source>All files (*.*)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewColorIdentityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
-        <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewDeckTagsDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
-        <source>Edit tags ...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewTagDialog</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
-        <source>Deck Tags Manager</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
-        <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
-        <source>Add a new tag (e.g., Aggro️)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
-        <source>Add Tag</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
-        <source>Filter tags...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
-        <source>Edit default tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
-        <source>Invalid Input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
-        <source>Tag name cannot be empty!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
-        <source>Duplicate Tag</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
-        <source>This tag already exists.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckPreviewWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
-        <source>Banner Card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
-        <source>Open in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
-        <source>Edit Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
-        <source>Rename Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
-        <source>Save Deck to Clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
-        <source>Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
-        <source>Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <source>Not Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
-        <source>Not Annotated (No set info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
-        <source>Rename File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
-        <source>Delete File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
-        <source>Set Banner Card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="455"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="475"/>
-        <source>New name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
-        <source>Rename failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
-        <source>Delete file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
-        <source>Are you sure you want to delete the selected file?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
-        <source>Delete failed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckStateManager</name>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="113"/>
-        <source>Rename deck to &quot;%1&quot; from &quot;%2&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
-        <source>Updated comments (was %1 chars, now %2 chars)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
-        <source>Set banner card to %1 (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
-        <source>Tags changed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
-        <source>Set format to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
-        <source>Added (%1): %2 (%3) %4</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
-        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
-        <source>Removed &quot;%1&quot; (all copies)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
-        <source>%1 1 × &quot;%2&quot; (%3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Added</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
-        <source>Removed</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DeckStatsInterface</name>
-    <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/interfaces/deck_stats_interface.cpp" line="35"/>
-        <source>The reply from the server could not be parsed.</source>
-        <translation>伺服器的回復無法分析</translation>
-    </message>
-</context>
-<context>
-    <name>DeckViewContainer</name>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="123"/>
-        <source>Load deck...</source>
-        <translation>讀取套牌...</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="124"/>
-        <source>Load remote deck...</source>
-        <translation>載入伺服器上的套牌...</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
-        <source>Load from clipboard...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
-        <source>Load from website...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
-        <source>Unload deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
-        <source>Ready to start</source>
-        <translation>準備好開始</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
-        <source>Force start</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
-        <source>Sideboard unlocked</source>
-        <translation>解鎖備牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
-        <source>Sideboard locked</source>
-        <translation>鎖定備牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
-        <source>The selected file could not be loaded.</source>
-        <translation>此文件無法被載入</translation>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
-        <source>Deck is greater than maximum file size.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
-        <source>Are you sure you want to force start?
-This will kick all non-ready players from the game.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="344"/>
-        <source>Cockatrice</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DialogConvertDeckToCodFormat</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="30"/>
-        <source>Deck Format Conversion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="32"/>
-        <source>You tried to add a tag to a .txt format deck.
- Tags can only be added to .cod format decks.
- Do you want to convert the deck to the .cod format?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="34"/>
-        <source>Remember and automatically apply choice in the future</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DlgConnect</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.h" line="80"/>
-        <source>Downloading...</source>
-        <translation>下載中...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
-        <source>Known Hosts</source>
-        <translation>已知主機：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
-        <source>Delete the currently selected saved server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
-        <source>Refresh the server list with known public servers</source>
-        <translation>從已知的伺服器更新伺服器列表</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
-        <source>New Host</source>
-        <translation>新主機</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
-        <source>Name:</source>
-        <translation>名稱:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
-        <source>&amp;Host:</source>
-        <translation>主機：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
-        <source>&amp;Port:</source>
-        <translation>端口：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
-        <source>Player &amp;name:</source>
-        <translation>玩家名字：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
-        <source>P&amp;assword:</source>
-        <translation>密碼：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
-        <source>&amp;Save password</source>
-        <translation>記住密碼</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
-        <source>A&amp;uto connect</source>
-        <translation>自動連接</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
-        <source>Automatically connect to the most recent login when Cockatrice opens</source>
-        <translation>當Cockatrice啓動時自動連接到最近的登錄</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="90"/>
-        <source>If you have any trouble connecting or registering then contact the server staff for help!</source>
-        <translation>如果你在連接或者註冊上遇到了任何麻煩，可以聯繫伺服器的工作人員獲得幫助。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
-        <source>Webpage</source>
-        <translation>網頁</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
-        <source>Reset Password</source>
-        <translation>重設密碼</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
-        <source>Forgot password?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
-        <source>&amp;Connect</source>
-        <translation>連接</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
-        <source>Server</source>
-        <translation>伺服器</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
-        <source>Login</source>
-        <translation>登錄</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
-        <source>Server Contact</source>
-        <translation>聯繫伺服器</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
-        <source>Connect to Server</source>
-        <translation>連接伺服器</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
-        <source>Server URL</source>
-        <translation>伺服器URL</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
-        <source>Communication Port</source>
-        <translation>通信端口</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
-        <source>Unique Server Name</source>
-        <translation>唯一的伺服器名稱</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
-        <source>Connection Warning</source>
-        <translation>連接警告</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
-        <source>You need to name your new connection profile.</source>
-        <translation>你需要給連接配置文件命名。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
-        <source>Connect Warning</source>
-        <translation>連接警告</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
-        <source>The player name can&apos;t be empty.</source>
-        <translation>玩家名稱不能為空白</translation>
-    </message>
-</context>
-<context>
-    <name>DlgCreateGame</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="24"/>
-        <source>Re&amp;member settings</source>
-        <translation>記住設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="25"/>
-        <source>&amp;Description:</source>
-        <translation>描述：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="30"/>
-        <source>P&amp;layers:</source>
-        <translation>玩家：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="42"/>
-        <source>General</source>
-        <translation>綜合</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="55"/>
-        <source>Game type</source>
-        <translation>房間類型</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="58"/>
-        <source>&amp;Password:</source>
-        <translation>密碼：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="63"/>
-        <source>Only &amp;buddies can join</source>
-        <translation>只容許好友加入</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="64"/>
-        <source>Only &amp;registered users can join</source>
-        <translation>只容許註冊用戶加入</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="78"/>
-        <source>Joining restrictions</source>
-        <translation>加入條件</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="81"/>
-        <source>&amp;Spectators can watch</source>
-        <translation>允許觀看者</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="84"/>
-        <source>Spectators &amp;need a password to watch</source>
-        <translation>觀看者需要密碼</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="85"/>
-        <source>Spectators can &amp;chat</source>
-        <translation>觀看者可以聊天</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="86"/>
-        <source>Spectators can see &amp;hands</source>
-        <translation>觀看者可見手牌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="87"/>
-        <source>Create game as spectator</source>
-        <translation>以旁觀者的身份創建遊戲</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="94"/>
-        <source>Spectators</source>
-        <translation>觀看者</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="97"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="104"/>
-        <source>Open decklists in lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
-        <source>Create game as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
-        <source>&amp;Clear</source>
-        <translation>清除</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
-        <source>Create game</source>
-        <translation>創建一個房間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
-        <source>Game information</source>
-        <translation>房間信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
-        <source>Server error.</source>
-        <translation>伺服器錯誤.</translation>
-    </message>
-</context>
-<context>
-    <name>DlgCreateToken</name>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
-        <source>&amp;Name:</source>
-        <translation>名稱：</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
-        <source>Token</source>
-        <translation>衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
-        <source>C&amp;olor:</source>
-        <translation>顏色：</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
-        <source>white</source>
-        <translation>白</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
-        <source>blue</source>
-        <translation>藍</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
-        <source>black</source>
-        <translation>黑</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
-        <source>red</source>
-        <translation>紅</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
-        <source>green</source>
-        <translation>綠</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
-        <source>multicolor</source>
-        <translation>多色</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
-        <source>colorless</source>
-        <translation>無色</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
-        <source>&amp;P/T:</source>
-        <translation>力量/防禦力：</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
-        <source>&amp;Annotation:</source>
-        <translation>註釋：</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
-        <source>&amp;Destroy token when it leaves the table</source>
-        <translation>此衍生物離場時會被摧毀</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
-        <source>Create face-down (Only hides name)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
-        <source>Token data</source>
-        <translation>衍生物數據資料</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
-        <source>Show &amp;all tokens</source>
-        <translation>顯示所有衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
-        <source>Show tokens from this &amp;deck</source>
-        <translation>顯示此套牌所使用的衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
-        <source>Choose token from list</source>
-        <translation>從列表中選擇衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
-        <source>Create token</source>
-        <translation>派出一個衍生物</translation>
-    </message>
-</context>
-<context>
-    <name>DlgDefaultTagsEditor</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
-        <source>Edit Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
-        <source>Add</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
-        <source>Confirm</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
-        <source>Cancel</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
-        <source>Invalid Input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
-        <source>Tag name cannot be empty!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
-        <source>Duplicate Tag</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DlgEditAvatar</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
-        <source>No image chosen.</source>
-        <translation>未選擇圖像</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
-        <source>To change your avatar, choose a new image.
-To remove your current avatar, confirm without choosing a new image.</source>
-        <translation>要更改你的頭像，請選擇一個新圖片。
-要清除你當前的頭像，可以不用選擇新頭像直接確認。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
-        <source>Browse...</source>
-        <translation>瀏覽...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
-        <source>Change avatar</source>
-        <translation>改變頭像</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
-        <source>Open Image</source>
-        <translation>打開圖片</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
-        <source>Image Files (*.png *.jpg *.bmp)</source>
-        <translation>圖片文件（*.png *.jpg *.bmp格式）</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
-        <source>Invalid image chosen.</source>
-        <translation>所選圖片不可用。</translation>
-    </message>
-</context>
-<context>
-    <name>DlgEditDeckInClipboard</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
-        <source>Edit deck in clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
-        <source>Invalid deck list.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DlgEditPassword</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
-        <source>Old password:</source>
-        <translation>舊密碼：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
-        <source>New password:</source>
-        <translation>新密碼：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
-        <source>Confirm new password:</source>
-        <translation>確認新密碼：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
-        <source>Change password</source>
-        <translation>修改密碼：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
-        <source>Your password is too short.</source>
-        <translation>你的密碼太短。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
-        <source>The new passwords don&apos;t match.</source>
-        <translation>兩次輸入的新密碼不一致。</translation>
-    </message>
-</context>
-<context>
-    <name>DlgEditTokens</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
-        <source>&amp;Name:</source>
-        <translation>名稱：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
-        <source>C&amp;olor:</source>
-        <translation>顏色：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
-        <source>white</source>
-        <translation>白</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="35"/>
-        <source>blue</source>
-        <translation>藍</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="36"/>
-        <source>black</source>
-        <translation>黑</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="37"/>
-        <source>red</source>
-        <translation>紅</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="38"/>
-        <source>green</source>
-        <translation>綠</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="39"/>
-        <source>multicolor</source>
-        <translation>多色</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
-        <source>colorless</source>
-        <translation>無色</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
-        <source>&amp;P/T:</source>
-        <translation>力量/防禦力：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
-        <source>&amp;Annotation:</source>
-        <translation>註釋：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
-        <source>Token data</source>
-        <translation>衍生物數據資料</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
-        <source>Add token</source>
-        <translation>添加衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
-        <source>Remove token</source>
-        <translation>刪除衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
-        <source>Edit custom tokens</source>
-        <translation>編輯自定義衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
-        <source>Please enter the name of the token:</source>
-        <translation>請輸入衍生物名稱:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="155"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="156"/>
-        <source>The chosen name conflicts with an existing card or token.
-Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dialog to display them correctly.</source>
-        <translation>所選擇的名字與現有的卡牌或衍生物有衝突。
-請確保在“系列管理”中將“衍生物”啓用以正常顯示。</translation>
-    </message>
-</context>
-<context>
-    <name>DlgEditUser</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="13"/>
-        <source>Email:</source>
-        <translation>電子郵箱：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="19"/>
-        <source>Country:</source>
-        <translation>國家：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="22"/>
-        <source>Undefined</source>
-        <translation>未定義</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
-        <source>Real name:</source>
-        <translation>真實姓名：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
-        <source>Edit user profile</source>
-        <translation>編輯用戶資料</translation>
-    </message>
-</context>
-<context>
-    <name>DlgFilterGames</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="18"/>
-        <source>no limit</source>
-        <translation>沒有限制</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="19"/>
-        <source>5 minutes</source>
-        <translation>5分鐘</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="20"/>
-        <source>10 minutes</source>
-        <translation>10分鐘</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="21"/>
-        <source>30 minutes</source>
-        <translation>30分鐘</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="22"/>
-        <source>1 hour</source>
-        <translation>1小時</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="23"/>
-        <source>2 hours</source>
-        <translation>2小時</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
-        <source>Hide &apos;buddies only&apos; games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
-        <source>Hide games that have started</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
-        <source>Hide password protected games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
-        <source>Hide &apos;ignored user&apos; games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddies</source>
-        <oldsource>Hide games not created by buddy</oldsource>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
-        <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
-        <source>&amp;Newer than:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
-        <source>Game &amp;description:</source>
-        <translation>房間描述：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
-        <source>&amp;Creator name:</source>
-        <translation>創建者名字:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
-        <source>General</source>
-        <translation>綜合</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
-        <source>&amp;Game types</source>
-        <translation>房間類型</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
-        <source>at &amp;least:</source>
-        <translation>至少：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
-        <source>at &amp;most:</source>
-        <translation>最多：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
-        <source>Maximum player count</source>
-        <translation>可容納玩家數量</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
-        <source>Restrictions</source>
-        <translation>限制</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
-        <source>Show games only if &amp;spectators can watch</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
-        <source>Show spectator password p&amp;rotected games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
-        <source>Show only if spectators can ch&amp;at</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
-        <source>Show only if spectators can see &amp;hands</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
-        <source>Spectators</source>
-        <translation>觀看者</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
-        <source>Filter games</source>
-        <translation>過濾房間</translation>
-    </message>
-</context>
-<context>
-    <name>DlgForgotPasswordChallenge</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="29"/>
-        <source>Reset Password Challenge Warning</source>
-        <translation>重設密碼驗證警告</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="30"/>
-        <source>A problem has occurred. Please try to request a new password again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="35"/>
-        <source>Enter the information of the server and the account you&apos;d like to request a new password for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="38"/>
-        <source>&amp;Host:</source>
-        <translation>主機：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="43"/>
-        <source>&amp;Port:</source>
-        <translation>端口：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="48"/>
-        <source>Player &amp;name:</source>
-        <translation>玩家名字：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="53"/>
-        <source>Email:</source>
-        <translation>電子郵箱：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="87"/>
-        <source>Reset Password Challenge</source>
-        <translation>重設密碼驗證</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
-        <source>Reset Password Challenge Error</source>
-        <translation>重設密碼驗證錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp" line="95"/>
-        <source>The email address can&apos;t be empty.</source>
-        <translation>電郵不能為空白</translation>
-    </message>
-</context>
-<context>
-    <name>DlgForgotPasswordRequest</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="28"/>
-        <source>Enter the information of the server you&apos;d like to request a new password for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="31"/>
-        <source>&amp;Host:</source>
-        <translation>主機：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="36"/>
-        <source>&amp;Port:</source>
-        <translation>端口：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="41"/>
-        <source>Player &amp;name:</source>
-        <translation>玩家名字：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="64"/>
-        <source>Reset Password Request</source>
-        <translation>重設密碼請求</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
-        <source>Reset Password Error</source>
-        <translation>重設密碼錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_request.cpp" line="72"/>
-        <source>The player name can&apos;t be empty.</source>
-        <translation>玩家名稱不能為空白</translation>
-    </message>
-</context>
-<context>
-    <name>DlgForgotPasswordReset</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="29"/>
-        <source>Reset Password Warning</source>
-        <translation>重設密碼警告</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="30"/>
-        <source>A problem has occurred. Please try to request a new password again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="34"/>
-        <source>Enter the received token and the new password in order to set your new password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="37"/>
-        <source>&amp;Host:</source>
-        <translation>主機：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="42"/>
-        <source>&amp;Port:</source>
-        <translation>端口：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="47"/>
-        <source>Player &amp;name:</source>
-        <translation>玩家名字：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="52"/>
-        <source>Token:</source>
-        <translation>驗證碼</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="57"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="63"/>
-        <source>New Password:</source>
-        <translation>新密碼：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="102"/>
-        <source>Reset Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <source>The player name can&apos;t be empty.</source>
-        <translation>玩家名稱不能為空白</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="110"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
-        <source>Reset Password Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="115"/>
-        <source>The token can&apos;t be empty.</source>
-        <translation>驗證碼不能為空白</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="120"/>
-        <source>The new password can&apos;t be empty.</source>
-        <translation>新密碼不能為空白</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="126"/>
-        <source>Your password is too short.</source>
-        <translation>你的密碼太短。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp" line="129"/>
-        <source>The passwords do not match.</source>
-        <translation>密碼不一致</translation>
-    </message>
-</context>
-<context>
-    <name>DlgLoadDeck</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="6"/>
-        <source>Load Deck</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DlgLoadDeckFromClipboard</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
-        <source>Load deck from clipboard</source>
-        <translation>從剪貼板讀取套牌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
-        <source>Invalid deck list.</source>
-        <translation>無效的牌表.</translation>
-    </message>
-</context>
-<context>
-    <name>DlgLoadDeckFromWebsite</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
-        <source>Paste a link to a decklist site here to import it.
-(Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
-        <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
-        <source>No parser available for this deck provider.
- (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
-        <source>Network error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
-        <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
-        <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
-        <source>The provided URL is not recognized as a valid deck URL.
-Valid deck URLs look like this:
-
-https://archidekt.com/decks/9999999
-https://deckstats.net/decks/99999/9999999-your-deck-name/en
-https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
-https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DlgLoadRemoteDeck</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
-        <source>Load deck</source>
-        <translation>讀取套牌</translation>
-    </message>
-</context>
-<context>
-    <name>DlgLocalGameOptions</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
-        <source>Players:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
-        <source>Starting life total:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
-        <source>Game setup options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
-        <source>Remember settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
-        <source>Local game options</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DlgMoveTopCardsUntil</name>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
-        <source>Card name (or search expressions):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
-        <source>Number of hits:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
-        <source>Auto play hits</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
-        <source>Put top cards on stack until...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="82"/>
-        <source>No cards matching the search expression exists in the card database. Proceed anyways?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
-        <source>Cockatrice</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
-        <source>Invalid filter</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DlgRegister</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
-        <source>Enter your information and the information of the server you'd like to register to.
-Your email will be used to verify your account.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
-        <source>&amp;Host:</source>
-        <translation>主機：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
-        <source>&amp;Port:</source>
-        <translation>端口：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
-        <source>Player &amp;name:</source>
-        <translation>玩家名字：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
-        <source>P&amp;assword:</source>
-        <translation>密碼：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
-        <source>Password (again):</source>
-        <translation>(再次)輸入密碼：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
-        <source>Email:</source>
-        <translation>電子郵箱：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
-        <source>Email (again):</source>
-        <translation>(再次)輸入電郵：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
-        <source>Country:</source>
-        <translation>國家：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
-        <source>Undefined</source>
-        <translation>未定義</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
-        <source>Real name:</source>
-        <translation>真實姓名:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
-        <source>Register to server</source>
-        <translation>註冊到伺服器</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
-        <source>Registration Warning</source>
-        <translation>註冊警告</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
-        <source>Your password is too short.</source>
-        <translation>你的密碼太短。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
-        <source>Your passwords do not match, please try again.</source>
-        <translation>兩次輸入的密碼不一致，請重新輸入，</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
-        <source>Your email addresses do not match, please try again.</source>
-        <translation>兩次輸入的電子郵箱不一致，請重新輸入。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
-        <source>The player name can&apos;t be empty.</source>
-        <translation>玩家名稱不能為空白</translation>
-    </message>
-</context>
-<context>
-    <name>DlgRollDice</name>
-    <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
-        <source>Number of sides:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
-        <source>Number of dice:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
-        <source>Roll Dice</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DlgSelectSetForCards</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
-        <source>Unmodified Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
-        <source>Modified Cards:</source>
-        <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 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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
-        <source>Bulk modified printings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
-        <source>Cleared all printing information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
-        <source>Set all printings to preferred.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DlgSettings</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
-        <source>Unknown Error loading card database</source>
-        <translation>讀取卡牌數據庫時出現未知錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
-        <source>Your card database is invalid.
-
-Cockatrice may not function correctly with an invalid database
-
-You may need to rerun oracle to update your card database.
-
-Would you like to change your database location setting?</source>
-        <translation>你的卡牌資料庫無效。
-
-資料庫無效可能會導致Cockatrice無法正確運行。
-
-你應該重新啓動Oracle以便更新卡牌資料庫。
-
-你想要重新設置卡牌資料庫路徑嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1897"/>
-        <source>Your card database version is too old.
-
-This can cause problems loading card information or images
-
-Usually this can be fixed by rerunning oracle to to update your card database.
-
-Would you like to change your database location setting?</source>
-        <translation>你的卡牌資料庫過舊。
-
-這可能會導致卡牌圖片出現問題。
-
-你應該重新啓動Oracle以便更新卡牌資料庫。
-
-你想要重新設置卡牌資料庫路徑嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <source>Your card database did not finish loading
-
-Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
-
-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"/>
-        <source>File Error loading your card database.
-
-Would you like to change your database location setting?</source>
-        <translation>載入卡牌數據庫時出現錯誤
-
-你想要重新設置卡牌數據庫路徑嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <source>Your card database was loaded but contains no cards.
-
-Would you like to change your database location setting?</source>
-        <translation>你的卡牌資料庫中並不包含任何卡牌信息
-
-你想要重新設置卡牌資料庫路徑嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1917"/>
-        <source>Unknown card database load status
-
-Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
-
-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"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
-        <source>The path to your deck directory is invalid. Would you like to go back and set the correct path?</source>
-        <translation>你的套牌路徑無效。你想要重新設置正確的路徑嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1946"/>
-        <source>The path to your card pictures directory is invalid. Would you like to go back and set the correct path?</source>
-        <translation>你想要重新設置卡牌數據庫路徑嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1958"/>
-        <source>Settings</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
-        <source>General</source>
-        <translation>常規</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
-        <source>Appearance</source>
-        <translation>外觀</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
-        <source>User Interface</source>
-        <translation>用戶界面</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
-        <source>Card Sources</source>
-        <translation>卡牌的來源</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
-        <source>Chat</source>
-        <translation>聊天</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
-        <source>Sound</source>
-        <translation>聲音</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
-        <source>Shortcuts</source>
-        <translation>快捷鍵</translation>
-    </message>
-</context>
-<context>
-    <name>DlgStartupCardCheck</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
-        <source>Card Update Check</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="17"/>
-        <source>It has been more than %2 days since you last checked your card database for updates.
-Choose how you would like to run the card database updater.
-You can always change this behavior in the &apos;General&apos; settings tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
-        <source>Run in foreground</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
-        <source>Run in background</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
-        <source>Run in background and always from now on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="28"/>
-        <source>Don&apos;t prompt again and don&apos;t run</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
-        <source>Don&apos;t run this time</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DlgTipOfTheDay</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="65"/>
-        <source>Next</source>
-        <translation>下一個</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="66"/>
-        <source>Previous</source>
-        <translation>已知</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp" line="89"/>
-        <source>Tip of the Day</source>
-        <translation>每日提示</translation>
-    </message>
-</context>
-<context>
-    <name>DlgUpdate</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
-        <source>Current release channel</source>
-        <translation>當前的發行通道</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
-        <source>Reinstall</source>
-        <translation>重新安裝</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
-        <source>Cancel Download</source>
-        <translation>取消下載</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
-        <source>Open Download Page</source>
-        <translation>打開下載頁面</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
-        <source>Check for Client Updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="64"/>
-        <source>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
-Please visit the download page to update manually.</source>
-        <translation>雞蛇不支持建立SSL連接，因此你不能自動下載更新！
-請訪問下載頁面以手動更新。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
-        <source>Downloading update: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
-        <source>Checking for updates...</source>
-        <translation>正在檢查更新...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
-        <source>Finished checking for updates</source>
-        <translation>更新檢查完成</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
-        <source>No Update Available</source>
-        <translation>沒有更新可用</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
-        <source>Cockatrice is up to date!</source>
-        <translation>雞蛇已經是最新的了！</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
-        <source>You are already running the latest version available in the chosen release channel.</source>
-        <translation>你運行的已經是最新的發行版本了。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
-        <source>Current version</source>
-        <translation>當前版本</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
-        <source>Selected release channel</source>
-        <translation>選擇發行渠道</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
-        <source>Update Available</source>
-        <translation>更新可用</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
-        <source>A new version of Cockatrice is available!</source>
-        <translation>雞蛇有新版本可用！</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
-        <source>New version</source>
-        <translation>新版本</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
-        <source>Released</source>
-        <translation>發佈</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
-        <source>Changelog</source>
-        <translation>更新日誌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <source>Do you want to update now?</source>
-        <translation>你打算現在就更新嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
-        <source>Unfortunately, the automatic updater failed to find a compatible download. 
-You may have to manually download the new version.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
-        <source>Please check the &lt;a href=&quot;%1&quot;&gt;releases page&lt;/a&gt; on our Github and download the build for your system.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
-        <source>Update Error</source>
-        <translation>更新錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <source>An error occurred while checking for updates:</source>
-        <translation>檢查更新時發生錯誤：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
-        <source>An error occurred while downloading an update:</source>
-        <translation>下載更新時發生錯誤：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
-        <source>Installing...</source>
-        <translation>正在安裝...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
-        <source>Cockatrice is unable to open the installer.</source>
-        <translation>雞蛇無法打開安裝程序。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
-        <source>Try to update manually by closing Cockatrice and running the installer.</source>
-        <translation>嘗試關閉雞蛇運行安裝程序手動更新。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
-        <source>Download location</source>
-        <translation>下載區域信息</translation>
-    </message>
-</context>
-<context>
-    <name>DlgViewLog</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
-        <source>Clear log when closing</source>
-        <translation>關閉時清除日誌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
-        <source>Debug Log</source>
-        <translation>問題日誌</translation>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
-        <source>Draw Probability Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
-        <source>Criteria:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
-        <source>Exactness:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
-        <source>Quantity (N):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
-        <source>Cards drawn (M):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DrawProbabilityWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
-        <source>Draw Probability</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
-        <source>Probability of drawing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
-        <source>Card Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
-        <source>Subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
-        <source>At least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
-        <source>Exactly</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
-        <source>card(s) having drawn at least</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
-        <source>cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Category</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Qty</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
-        <source>Odds (%)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
-        <source>In %1 decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
-        <source>%1% of %2 decks</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecApiResponseCardPricesDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="57"/>
-        <source>Card Hoarder</source>
-        <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="58"/>
-        <source>Card Kingdom</source>
-        <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="59"/>
-        <source>Card Market</source>
-        <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"/>
-        <source>Face 2-Face</source>
-        <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="61"/>
-        <source>Mana Pool</source>
-        <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="62"/>
-        <source>MTG Stocks</source>
-        <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="63"/>
-        <source>Scg</source>
-        <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="64"/>
-        <source>Tcgl</source>
-        <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="65"/>
-        <source>Tcgplayer</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecApiResponseCardSynergyDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
-        <source>%1% Synergy</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderApiResponseNavigationWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
-        <source>Combos</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
-        <source>Average Deck</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
-        <source>Salt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>FilterBuilder</name>
-    <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
-        <source>Type your filter here</source>
-        <translation>輸入你打算篩選的類型</translation>
-    </message>
-</context>
-<context>
-    <name>FilterDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
-        <source>Confirm Delete</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
-        <source>Are you sure you want to delete the filter &apos;%1&apos;?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
-        <source>Delete Failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
-        <source>Failed to delete filter &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>GameEventHandler</name>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="412"/>
-        <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="415"/>
-        <source>player left the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="418"/>
-        <source>player disconnected from server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/game_event_handler.cpp" line="422"/>
-        <source>reason unknown</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>GameSelector</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <source>Please join the appropriate room first.</source>
-        <translation>首先請加入一個房間.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <source>Wrong password.</source>
-        <translation>密碼錯誤.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <source>Spectators are not allowed in this game.</source>
-        <translation>這個遊戲不允許觀眾加入.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
-        <source>The game is already full.</source>
-        <translation>這個遊戲已經滿了.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
-        <source>The game does not exist any more.</source>
-        <translation>這個遊戲不能裝下啊更多了.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
-        <source>This game is only open to registered users.</source>
-        <translation>這個遊戲只開放給註冊用戶.</translation>
-    </message>
-    <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>這個遊戲只開放給好友。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
-        <source>You are being ignored by the creator of this game.</source>
-        <translation>你屏蔽了這個與遊戲的創造者.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
-        <source>Join Game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
-        <source>Spectate Game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
-        <source>Game Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
-        <source>Join Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
-        <source>Spectate Game as Judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
-        <source>Join game</source>
-        <translation>加入遊戲</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
-        <source>Password:</source>
-        <translation>密碼:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
-        <source>Please join the respective room first.</source>
-        <translation>請各自加入一個房間.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
-        <source>&amp;Filter games</source>
-        <translation>過濾房間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
-        <source>C&amp;lear filter</source>
-        <translation>清除篩選項目</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
-        <source>C&amp;reate</source>
-        <translation>創建</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
-        <source>&amp;Join</source>
-        <translation>加入</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
-        <source>Join as judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
-        <source>J&amp;oin as spectator</source>
-        <translation>觀看</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
-        <source>Join as judge spectator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
-        <source>Games shown: %1 / %2</source>
-        <translation>顯示遊戲：%1/%2</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
-        <source>Games</source>
-        <translation>遊戲</translation>
-    </message>
-</context>
-<context>
-    <name>GameSelectorQuickFilterToolBar</name>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
-        <source>All types</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
-        <source>Filter by game name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
-        <source>Filter by game type/format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
-        <source>Hide games not created by buddies</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
-        <source>Hide full games</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
-        <source>Hide started games</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>GamesModel</name>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
-        <source>&gt;1 day</source>
-        <translation type="unfinished"/>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
-        <source>%1%2 hr</source>
-        <comment>short age in hours</comment>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
-        <source>new</source>
-        <translation>新建</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
-        <source>%1%2 min</source>
-        <comment>short age in minutes</comment>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
-        <source>password</source>
-        <translation>密碼</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
-        <source>buddies only</source>
-        <translation>僅限好友</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
-        <source>reg. users only</source>
-        <translation>僅限註冊用户</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
-        <source>open decklists</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
-        <source>can chat</source>
-        <translation>允許聊天</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
-        <source>see hands</source>
-        <translation>查看手牌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
-        <source>can see hands</source>
-        <translation>允許查看手牌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
-        <source>not allowed</source>
-        <translation>不允許</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
-        <source>Room</source>
-        <translation>房間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
-        <source>Age</source>
-        <translation>時長</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
-        <source>Description</source>
-        <translation>描述</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
-        <source>Creator</source>
-        <translation>創建者</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
-        <source>Type</source>
-        <translation>類型</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
-        <source>Restrictions</source>
-        <translation>限制</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
-        <source>Players</source>
-        <translation>玩家</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
-        <source>Spectators</source>
-        <translation>觀看者</translation>
-    </message>
-</context>
-<context>
-    <name>GeneralSettingsPage</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
-        <source>Reset all paths</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
-        <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"/>
-        <source>Choose path</source>
-        <translation>選擇路徑</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>個人設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
-        <source>Language:</source>
-        <translation>語言:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
-        <source>Paths (editing disabled in portable mode)</source>
-        <translation>路徑(在便攜模式下禁止編輯)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
-        <source>Paths</source>
-        <translation>路徑</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
-        <source>How to help with translations</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
-        <source>Decks directory:</source>
-        <translation>套牌路徑:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
-        <source>Filters directory:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
-        <source>Replays directory:</source>
-        <translation>遊戲錄像目錄:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
-        <source>Pictures directory:</source>
-        <translation>圖片目錄:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
-        <source>Card database:</source>
-        <translation>卡牌數據庫:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
-        <source>Custom database directory:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
-        <source>Token database:</source>
-        <translation>衍生物數據庫：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
-        <source>Update channel</source>
-        <translation>更新通道</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
-        <source>Check for client 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
-        <source>Don&apos;t check</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
-        <source>Prompt for update</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
-        <source>Check for card database updates every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
-        <source> days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
-        <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"/>
-        <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"/>
-        <source>Show tips on startup</source>
-        <translation>顯示啓動時提示</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
-        <source>Last update check on %1 (%2 days ago)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>GraveyardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
-        <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
-        <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
-        <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HandMenu</name>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
-        <source>&amp;View hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
-        <source>Sort hand by...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
-        <source>Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
-        <source>Take &amp;mulligan (Choose hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
-        <source>Take mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
-        <source>Take mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
-        <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
-        <source>&amp;Top 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
-        <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
-        <source>All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>HomeWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
-        <source>Create New Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
-        <source>Browse Decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
-        <source>Browse Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
-        <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
-        <source>Browse Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
-        <source>View Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
-        <source>Quit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
-        <source>Connecting...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
-        <source>Play</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>LibraryMenu</name>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
-        <source>&amp;Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
-        <source>&amp;View library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
-        <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
-        <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
-        <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
-        <source>Lend library to...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
-        <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
-        <source>&amp;Bottom of library...</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
-        <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
-        <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
-        <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
-        <source>D&amp;raw 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
-        <source>Shuffle</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
-        <source>&amp;Play top card</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
-        <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
-        <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
-        <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
-        <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
-        <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
-        <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
-        <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
-        <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
-        <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
-        <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"/>
-        <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"/>
-        <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
-        <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
-        <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="108"/>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>伺服器已達到最大用戶數，請稍微再試。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="111"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>你的地址有太多連接.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="114"/>
-        <source>Banned by moderator</source>
-        <translation>已被版主禁止</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="117"/>
-        <source>Expected end time: %1</source>
-        <translation>預計結束時間: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="119"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>這個封禁是永久的.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="125"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>預定伺服器關閉.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="128"/>
-        <location filename="src/interface/window_main.cpp" line="476"/>
-        <source>Invalid username.</source>
-        <translation>不可用的用戶名。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="131"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>由於在其他地點登陸，您已被登出。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="136"/>
-        <source>Connection closed</source>
-        <translation>連接關閉</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>伺服器中斷連接.
-原因: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="142"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="147"/>
-        <source>Scheduled server shutdown</source>
-        <translation>預定伺服器關閉</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <location filename="src/interface/window_main.cpp" line="196"/>
-        <source>Success</source>
-        <translation>成功</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="186"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>註冊已成功。
-現在登陸。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="196"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>賬號已激活。
-現在登陸</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="246"/>
-        <location filename="src/interface/window_main.cpp" line="253"/>
-        <source>Player %1</source>
-        <translation>玩家 %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="266"/>
-        <source>Load replay</source>
-        <translation>載入遊戲錄像</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="318"/>
-        <source>About Cockatrice</source>
-        <translation>關於Cockatrice雞蛇</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="320"/>
-        <source>Version</source>
-        <translation>版本</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
-        <source>Cockatrice Webpage</source>
-        <translation>Cockatrice雞蛇網站</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
-        <source>Project Manager:</source>
-        <translation>項目經理：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
-        <source>Past Project Managers:</source>
-        <translation>前項目經理：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
-        <source>Developers:</source>
-        <translation>開發者：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
-        <source>Our Developers</source>
-        <translation>我們的開發者：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
-        <source>Help Develop!</source>
-        <translation>協助開發！</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
-        <source>Translators:</source>
-        <translation>翻譯者：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
-        <source>Our Translators</source>
-        <translation>翻譯者名單</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
-        <source>Help Translate!</source>
-        <translation>協助翻譯!</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
-        <source>Support:</source>
-        <translation>支持：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
-        <source>Report an Issue</source>
-        <translation>報告錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
-        <source>Troubleshooting</source>
-        <translation>排除故障</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
-        <source>F.A.Q.</source>
-        <translation>問答</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <location filename="src/interface/window_main.cpp" line="403"/>
-        <location filename="src/interface/window_main.cpp" line="407"/>
-        <location filename="src/interface/window_main.cpp" line="420"/>
-        <location filename="src/interface/window_main.cpp" line="424"/>
-        <location filename="src/interface/window_main.cpp" line="428"/>
-        <location filename="src/interface/window_main.cpp" line="436"/>
-        <location filename="src/interface/window_main.cpp" line="441"/>
-        <location filename="src/interface/window_main.cpp" line="465"/>
-        <location filename="src/interface/window_main.cpp" line="566"/>
-        <location filename="src/interface/window_main.cpp" line="570"/>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <location filename="src/interface/window_main.cpp" line="580"/>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <location filename="src/interface/window_main.cpp" line="604"/>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <location filename="src/interface/window_main.cpp" line="1278"/>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="375"/>
-        <source>Server timeout</source>
-        <translation>伺服器超時</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="394"/>
-        <source>Failed Login</source>
-        <translation>登錄失敗</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>你的客戶端缺少連接這個伺服器所需要的要素</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>轉到幫助-&gt;檢查客户端更新，更新你的客户端。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>用户名或密碼錯誤。請檢查賬號信息並重試。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>已經有一個在線用户正在使用這個用户名.
-首先請關閉這個對話框然後重新登陸.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="414"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>You are banned until %1.</source>
-        <translation>你被禁止直到: %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="416"/>
-        <location filename="src/interface/window_main.cpp" line="562"/>
-        <source>You are banned indefinitely.</source>
-        <translation>你被永久封禁.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>伺服器需要註冊。現在註冊嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <source>This server requires client IDs. Your client is either failing to generate an ID or you are running a modified client.
-Please close and reopen your client to try again.</source>
-        <translation>伺服器需要客户端ID。你的客户端未能生成ID或你正在運行修改過的客户端。
-請關閉並重新打開客户端。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <source>An internal error has occurred, please close and reopen Cockatrice before trying again.
-If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.</source>
-        <translation>出現內部錯誤，請關閉並重啓客戶端再嘗試。如果錯誤仍然出現請將您的客戶端升級到最新版本，如有需要請聯繫您的軟件提供商。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="448"/>
-        <source>Account activation</source>
-        <translation>賬號激活</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>你的賬號還未激活。
-請提供激活郵件中的驗證碼。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="460"/>
-        <source>Server Full</source>
-        <translation>伺服器已滿</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <source>Unknown login error: %1</source>
-        <translation>未知的登陸錯誤: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>
-This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</source>
-        <translation>
-這通常表示你的客户端已經過於陳舊，未能響應伺服器提出的請求。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="479"/>
-        <source>Your username must respect these rules:</source>
-        <translation>您的用戶名須遵守以下規則：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="481"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>在%1 - %2個字符之間。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>能包含  %1 個小寫字母</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <location filename="src/interface/window_main.cpp" line="493"/>
-        <source>NOT</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="484"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>能包含%1個小寫字母</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="487"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>能包含%1個數字</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="490"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>能包含以下符號：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="493"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>第一個字符不能為%1 標點符號</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="500"/>
-        <source>no unacceptable language as specified by these server rules:</source>
-        <comment>note that the following lines will not be translated</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="506"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>不能包含以下詞：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="512"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>不能包含以下語句：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="518"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>你可以使用A-Z，a-z，0-9，_，.以及-作為用户名。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="528"/>
-        <location filename="src/interface/window_main.cpp" line="532"/>
-        <location filename="src/interface/window_main.cpp" line="536"/>
-        <location filename="src/interface/window_main.cpp" line="544"/>
-        <location filename="src/interface/window_main.cpp" line="548"/>
-        <location filename="src/interface/window_main.cpp" line="555"/>
-        <source>Registration denied</source>
-        <translation>註冊失敗</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="529"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>當前伺服器無法註冊</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>當前用戶名已經被使用。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>註冊時必須提供一個有效的電郵。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <source>It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address.  Please contact the server operator for further assistance or to obtain your credential information.</source>
-        <translation>看起來你正試圖在這個伺服器上註冊一個新賬户，但是你已經有了一個用提供的郵箱註冊的賬户。 此伺服器限制每個郵箱地址可以註冊用户帳户的數量。請聯繫伺服器運營商以獲得進一步幫助或獲取你的憑據信息。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="555"/>
-        <source>Password too short.</source>
-        <translation>密碼太短。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="574"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>由於伺服器出現技術問題，註冊失敗。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="577"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="581"/>
-        <source>Unknown registration error: %1</source>
-        <translation>未知的註冊錯誤：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="590"/>
-        <source>Account activation failed</source>
-        <translation>賬號激活失敗</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="597"/>
-        <source>Socket error: %1</source>
-        <translation>接口錯誤: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="605"/>
-        <source>You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
-Local version is %1, remote version is %2.</source>
-        <translation>你正在連接到一個過時的伺服器，請下調你的版本或者連接到一個匹配的伺服器.
-你當前的版本 %1, 伺服器版本 %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="611"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>你使用的客户端意見過時，請使用更新你版本.
-你當前的版本 %1, 伺服器版本 %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="621"/>
-        <source>Connecting to %1...</source>
-        <translation>連接到 %1⋯</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="625"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>正在將 %2 註冊到  %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="628"/>
-        <source>Disconnected</source>
-        <translation>斷開連接</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="631"/>
-        <source>Connected, logging in at %1</source>
-        <translation>連接登陸到 %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="639"/>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>正在將%2向%1申請忘記密碼流程。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="660"/>
-        <source>&amp;Connect...</source>
-        <translation>連接⋯</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="661"/>
-        <source>&amp;Disconnect</source>
-        <translation>斷開連接</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="662"/>
-        <source>Start &amp;local game...</source>
-        <translation>開始本地遊戲...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="663"/>
-        <source>&amp;Watch replay...</source>
-        <translation>觀看錄像...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="664"/>
-        <source>&amp;Full screen</source>
-        <translation>全屏</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
-        <source>&amp;Register to server...</source>
-        <translation>註冊到伺服器</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
-        <source>&amp;Restore password...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
-        <source>&amp;Settings...</source>
-        <translation>設置⋯</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
-        <source>&amp;Exit</source>
-        <translation>退出</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
-        <source>A&amp;ctions</source>
-        <translation>動作</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
-        <source>&amp;Cockatrice</source>
-        <translation>CockatriceCockatrice</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
-        <source>C&amp;ard Database</source>
-        <translation>卡牌資料庫</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="678"/>
-        <source>&amp;Manage sets...</source>
-        <translation>系列管理</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
-        <source>Edit custom &amp;tokens...</source>
-        <translation>編輯自定義&amp;tokens</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="680"/>
-        <source>Open custom image folder</source>
-        <translation>打開自定義圖片文件夾</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="681"/>
-        <source>Open custom sets folder</source>
-        <translation>打開自定義系列文件夾</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
-        <source>Add custom sets/cards</source>
-        <translation>添加自定義系列/卡牌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
-        <source>Reload card database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
-        <source>Tabs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
-        <source>&amp;Help</source>
-        <translation>幫助</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
-        <source>&amp;About Cockatrice</source>
-        <translation>關於Cockatrice雞蛇</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="689"/>
-        <source>&amp;Tip of the Day</source>
-        <translation>&amp; 每日提示</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
-        <source>Check for Client Updates</source>
-        <translation>檢查客戶端更新</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="691"/>
-        <source>Check for Card Updates...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
-        <source>Check for Card Updates (Automatic)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
-        <source>Show Status Bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
-        <source>View &amp;Debug Log</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
-        <source>Open Settings Folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
-        <source>Show/Hide</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1011"/>
-        <source>New Version</source>
-        <translation>新版本</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1012"/>
-        <source>Congratulations on updating to Cockatrice %1!
-Oracle will now launch to update your card database.</source>
-        <translation>恭喜Cockatrice更新到%1！
-現在啓動Oracle更新你的卡牌資料庫。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1016"/>
-        <source>Cockatrice installed</source>
-        <translation>雞蛇已安裝</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1017"/>
-        <source>Congratulations on installing Cockatrice %1!
-Oracle will now launch to install the initial card database.</source>
-        <translation>恭喜Cockatrice更新到%1！
-現在啓動Oracle更新你的卡牌資料庫。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1151"/>
-        <source>Card database</source>
-        <translation>卡牌數據庫</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1153"/>
-        <source>Cockatrice is unable to load the card database.
-Do you want to update your card database now?
-If unsure or first time user, choose &quot;Yes&quot;</source>
-        <translation>軟件無法載入卡牌數據庫。
-是否現在升級你的卡牌數據？
-如果不確定或者你是第一次使用，請選擇“是”</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1157"/>
-        <location filename="src/interface/window_main.cpp" line="1182"/>
-        <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"/>
-        <source>No</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1159"/>
-        <source>Open settings</source>
-        <translation>打開設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1174"/>
-        <source>New sets found</source>
-        <translation>發現新系列</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1176"/>
-        <source>%n new set(s) found in the card database
-Set code(s): %1
-Do you want to enable it/them?</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1184"/>
-        <source>View sets</source>
-        <translation>查看系列</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1203"/>
-        <source>Welcome</source>
-        <translation>歡迎</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1204"/>
-        <source>Hi! It seems like you're running this version of Cockatrice for the first time.
-All the sets in the card database have been enabled.
-Read more about changing the set order or disabling specific sets and consequent effects in the &quot;Manage Sets&quot; dialog.</source>
-        <translation>你好！貌似你是第一次使用這個版本的Cockatrice。
-所有卡牌數據庫中的系列都已生效。
-瞭解更多用“系列管理”窗口更改系列順序或者禁用某系列的信息。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
-        <location filename="src/interface/window_main.cpp" line="1384"/>
-        <source>Information</source>
-        <translation>信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1224"/>
-        <source>A card database update is already running.</source>
-        <translation>數據庫更新已經在運行中。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1279"/>
-        <source>Unable to run the card database updater: </source>
-        <translation>無法運行卡組數據庫更新器：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1288"/>
-        <source>Card database update running.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1306"/>
-        <source>Failed to start. The file might be missing, or permissions might be incorrect.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1309"/>
-        <source>The process crashed some time after starting successfully.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1313"/>
-        <source>Timed out. The process took too long to respond. The last waitFor...() function timed out.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1316"/>
-        <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1320"/>
-        <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1325"/>
-        <source>Unknown error occurred.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1330"/>
-        <source>The card database updater exited with an error:
-%1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1385"/>
-        <source>This server supports additional features that your client doesn't have.
-This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>你當前的客户端缺少該伺服器所需要的特性。
-通常不會有問題，但這代表有新版本的Cockatrice可供使用，或有預覽版本。
-要升級客户端，請點擊 幫助-&gt;檢查更新</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1404"/>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
-        <location filename="src/interface/window_main.cpp" line="1447"/>
-        <location filename="src/interface/window_main.cpp" line="1451"/>
-        <source>Load sets/cards</source>
-        <translation>載入系列/卡牌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1413"/>
-        <source>Selected file cannot be found.</source>
-        <translation>找不到選擇的文件。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1419"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Reset Password</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1503"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>你的密碼已重置，現在你可以使用新密碼登錄了。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1513"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>重置密碼失敗，請聯繫伺服器管理員重置密碼。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1522"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>激活請求已收到，請查看你的電子郵箱獲取激活驗證碼。</translation>
-    </message>
-</context>
-<context>
-    <name>ManaBaseConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
-        <source>Mana Base Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaBaseWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
-        <source>Mana Base</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaCurveConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
-        <source>Group By:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
-        <source>type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
-        <source>color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
-        <source>subtype</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
-        <source>power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
-        <source>toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
-        <source>Filters (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
-        <source>Show main bar row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
-        <source>Show per-category rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaCurveWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
-        <source>Mana Curve</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDevotionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
-        <source>Display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
-        <source>combinedBar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
-        <source>Filter Colors (optional):</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDevotionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
-        <source>Mana Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionConfigDialog</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
-        <source>Top display type:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
-        <source>pie</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
-        <source>bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
-        <source>Colors:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
-        <source>Show per-color rows</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionSingleDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
-        <source>%1 pips (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
-        <source>%1 mana (%2 cards)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ManaDistributionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
-        <source>Mana Production + Devotion</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
-        <source>Mana Distribution Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>MessageLogWidget</name>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
-        <source> from play</source>
-        <translation>從戰場上</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
-        <source> from their graveyard</source>
-        <translation>從他的墳墓場</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
-        <source> from exile</source>
-        <translation>從放逐區</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
-        <source> from their hand</source>
-        <translation>從他的手牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
-        <source>the top card of %1&apos;s library</source>
-        <translation>%1牌庫頂的牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
-        <source>the top card of their library</source>
-        <translation>他牌庫頂的卡牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
-        <source> from the top of %1&apos;s library</source>
-        <translation>從%1的牌庫頂</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
-        <source> from the top of their library</source>
-        <translation>從他的牌庫頂</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
-        <source>the bottom card of %1&apos;s library</source>
-        <translation>%1的牌庫底牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="62"/>
-        <source>the bottom card of their library</source>
-        <translation>他牌庫底部的牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
-        <source> from the bottom of %1&apos;s library</source>
-        <translation>從%1的牌庫底</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
-        <source> from the bottom of their library</source>
-        <translation>從他的牌庫底</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
-        <source> from %1&apos;s library</source>
-        <translation>從%1的牌庫中</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
-        <source> from their library</source>
-        <translation>從他的牌庫</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
-        <source> from sideboard</source>
-        <translation>從備牌中</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
-        <source> from the stack</source>
-        <translation>從堆疊中</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
-        <source> from custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
-        <source>%1 is now keeping the top card %2 revealed.</source>
-        <translation>%1已持續展示牌庫頂牌%2</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="111"/>
-        <source>%1 is not revealing the top card %2 any longer.</source>
-        <translation>%1不再%2展示牌庫頂牌。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
-        <source>%1 can now look at top card %2 at any time.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
-        <source>%1 no longer can look at top card %2 at any time.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
-        <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"/>
-        <source>%1 has conceded the game.</source>
-        <translation>%1 已放棄遊戲。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
-        <source>%1 has unconceded the game.</source>
-        <translation>%1 已放棄遊戲。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>%1 creates a face down token.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>%1 destroys %2.</source>
-        <translation>%1銷燬了%2。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
-        <source>a card</source>
-        <translation>一張牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
-        <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"/>
-        <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"/>
-        <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>%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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>bottom</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
-        <source>top</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
-        <source>%1 turns %2 face-down.</source>
-        <translation>%1回合%2翻為面朝下。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
-        <source>%1 turns %2 face-up.</source>
-        <translation>%1回合%2翻為面朝上。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
-        <source>The game has been closed.</source>
-        <translation>遊戲已經關閉。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
-        <source>The game has started.</source>
-        <translation>遊戲已開始。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
-        <source>You are flooding the game. Please wait a couple of seconds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
-        <source>%1 has joined the game.</source>
-        <translation>%1 已經加入遊戲。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
-        <source>%1 is now watching the game.</source>
-        <translation>%1 正在旁觀遊戲。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="435"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>%1 lends %2 to %3.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
-        <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"/>
-        <source>%1 reveals %2.</source>
-        <translation>%1 展示 %2。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>%1 reveals %2%3.</source>
-        <translation>%1展示%2%3。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
-        <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"/>
-        <source>reversed</source>
-        <translation>反轉</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
-        <source>normal</source>
-        <translation>正常</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
-        <source>Heads</source>
-        <translation>正面</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
-        <source>Tails</source>
-        <translation>反面</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>%1&apos;s turn.</source>
-        <translation>現在是%1的回合。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>%1 has locked their sideboard.</source>
-        <translation>%1已鎖定他的備牌。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
-        <source>%1 has unlocked their sideboard.</source>
-        <translation>%1 解除鎖定他的備牌。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
-        <source>%1 taps their permanents.</source>
-        <translation>%1 橫置了永久物。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
-        <source>%1 untaps their permanents.</source>
-        <translation>%1 重置了永久物。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
-        <source>%1 taps %2.</source>
-        <translation>%1 橫置了 %2。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
-        <source>%1 untaps %2.</source>
-        <translation>%1 重置了 %2。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
-        <source>%1 shuffles %2.</source>
-        <translation>%1 切洗了%2。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>%1 unattaches %2.</source>
-        <translation>%1 取消了%2的結附。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
-        <source>%1 undoes their last draw.</source>
-        <translation>%1撤銷了最後的抓牌。</translation>
-    </message>
-    <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
-        <source>%1 undoes their last draw (%2).</source>
-        <translation>%1撤銷了最後的抓牌(%2)。</translation>
-    </message>
-</context>
-<context>
-    <name>MessagesSettingsPage</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
-        <source>Word1 Word2 Word3</source>
-        <translation>詞1 詞2 詞3</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
-        <source>Add New Message</source>
-        <translation>添加新信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
-        <source>Edit Message</source>
-        <translation>編輯信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
-        <source>Remove Message</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
-        <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"/>
-        <source>Message:</source>
-        <translation>信息:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
-        <source>Edit message</source>
-        <translation>編輯消息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
-        <source>Chat settings</source>
-        <translation>聊天設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
-        <source>Custom alert words</source>
-        <translation>自定義警告語</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
-        <source>Enable chat mentions</source>
-        <translation>允許聊天中提到某人</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
-        <source>Enable mention completer</source>
-        <translation>允許自動完成提名</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
-        <source>In-game message macros</source>
-        <translation>遊戲內消息宏</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
-        <source>How to use in-game message macros</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
-        <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"/>
-        <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"/>
-        <source>Invert text color</source>
-        <translation>反轉文本顏色</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
-        <source>Enable desktop notifications for private messages</source>
-        <translation>開啓私人消息桌面提醒</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
-        <source>Enable desktop notification for mentions</source>
-        <translation>開啓聊天提名桌面提醒</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
-        <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"/>
-        <source>(Color is hexadecimal)</source>
-        <translation>（顏色為16進制）</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
-        <source>Separate words with a space, alphanumeric characters only</source>
-        <translation>將單詞以空格區分，僅支持字母</translation>
-    </message>
-</context>
-<context>
-    <name>MoveMenu</name>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
-        <source>Move to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
-        <source>&amp;Top of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
-        <source>X cards from the top of library...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
-        <source>&amp;Bottom of library in random order</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
-        <source>T&amp;able</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>Mtg</name>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="35"/>
-        <source>Card Type</source>
-        <translation>牌類型</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
-        <source>Mana Value</source>
-        <translation>魔法力值</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
-        <source>Color(s)</source>
-        <translation>顏色</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
-        <source>Loyalty</source>
-        <translation>忠誠</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
-        <source>Main Card Type</source>
-        <translation>牌的主類型</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
-        <source>Mana Cost</source>
-        <translation>魔法力費用</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
-        <source>P/T</source>
-        <translation>力量/防禦力</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
-        <source>Side</source>
-        <translation>旁邊</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
-        <source>Layout</source>
-        <translation>佈局</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
-        <source>Color Identity</source>
-        <translation>標識色</translation>
-    </message>
-</context>
-<context>
-    <name>OverlapControlWidget</name>
-    <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
-        <source>Cards to overlap:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
-        <source>Overlap percentage:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
-        <source>Overlap direction:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>Phase</name>
-    <message>
-        <location filename="src/game/phase.cpp" line="47"/>
-        <source>Unknown Phase</source>
-        <translation>未知步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phase.cpp" line="49"/>
-        <source>Untap</source>
-        <translation>重置步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phase.cpp" line="50"/>
-        <source>Upkeep</source>
-        <translation>維持步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phase.cpp" line="51"/>
-        <source>Draw</source>
-        <translation>抓牌步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phase.cpp" line="52"/>
-        <source>First Main</source>
-        <translation>主要步驟1</translation>
-    </message>
-    <message>
-        <location filename="src/game/phase.cpp" line="53"/>
-        <source>Beginning of Combat</source>
-        <translation>戰鬥開始步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phase.cpp" line="54"/>
-        <source>Declare Attackers</source>
-        <translation>宣告進攻步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phase.cpp" line="55"/>
-        <source>Declare Blockers</source>
-        <translation>宣告阻擋步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phase.cpp" line="56"/>
-        <source>Combat Damage</source>
-        <translation>戰鬥傷害步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phase.cpp" line="57"/>
-        <source>End of Combat</source>
-        <translation>戰鬥結束步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phase.cpp" line="58"/>
-        <source>Second Main</source>
-        <translation>主要步驟2</translation>
-    </message>
-    <message>
-        <location filename="src/game/phase.cpp" line="59"/>
-        <source>End/Cleanup</source>
-        <translation>結束/清理階段</translation>
-    </message>
-</context>
-<context>
-    <name>PhasesToolbar</name>
-    <message>
-        <location filename="src/game/phases_toolbar.cpp" line="155"/>
-        <source>Untap step</source>
-        <translation>重置步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phases_toolbar.cpp" line="157"/>
-        <source>Upkeep step</source>
-        <translation>維持步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phases_toolbar.cpp" line="159"/>
-        <source>Draw step</source>
-        <translation>抓牌步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phases_toolbar.cpp" line="161"/>
-        <source>First main phase</source>
-        <translation>主要步驟1</translation>
-    </message>
-    <message>
-        <location filename="src/game/phases_toolbar.cpp" line="163"/>
-        <source>Beginning of combat step</source>
-        <translation>戰鬥開始步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phases_toolbar.cpp" line="165"/>
-        <source>Declare attackers step</source>
-        <translation>宣告進攻步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phases_toolbar.cpp" line="167"/>
-        <source>Declare blockers step</source>
-        <translation>宣告阻擋步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phases_toolbar.cpp" line="169"/>
-        <source>Combat damage step</source>
-        <translation>戰鬥傷害步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phases_toolbar.cpp" line="171"/>
-        <source>End of combat step</source>
-        <translation>戰鬥結束步驟</translation>
-    </message>
-    <message>
-        <location filename="src/game/phases_toolbar.cpp" line="173"/>
-        <source>Second main phase</source>
-        <translation>主要步驟2</translation>
-    </message>
-    <message>
-        <location filename="src/game/phases_toolbar.cpp" line="175"/>
-        <source>End of turn step</source>
-        <translation>結束步驟</translation>
-    </message>
-</context>
-<context>
-    <name>PictureLoader</name>
-    <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
-        <source>en</source>
-        <comment>code for scryfall's language property, not available for all languages</comment>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PlayerActions</name>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="175"/>
-        <source>View top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="176"/>
-        <location filename="src/game/player/player_actions.cpp" line="189"/>
-        <location filename="src/game/player/player_actions.cpp" line="249"/>
-        <location filename="src/game/player/player_actions.cpp" line="278"/>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
-        <location filename="src/game/player/player_actions.cpp" line="358"/>
-        <location filename="src/game/player/player_actions.cpp" line="450"/>
-        <location filename="src/game/player/player_actions.cpp" line="645"/>
-        <location filename="src/game/player/player_actions.cpp" line="768"/>
-        <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="188"/>
-        <source>View bottom cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="248"/>
-        <source>Shuffle top cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="277"/>
-        <source>Shuffle bottom cards of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="312"/>
-        <source>Draw hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <source>0 and lower are in comparison to current hand size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="357"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="449"/>
-        <source>Move top cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="644"/>
-        <source>Move bottom cards to %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="767"/>
-        <source>Draw bottom cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="871"/>
-        <location filename="src/game/player/player_actions.cpp" line="917"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1045"/>
-        <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"/>
-        <source>Number:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1209"/>
-        <source>Place card X cards from top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <source>Which position should this card be placed:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1210"/>
-        <source>(max. %1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change power/toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1369"/>
-        <source>Change stats to:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1489"/>
-        <source>Set annotation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1490"/>
-        <source>Please enter the new annotation:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1583"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PlayerMenu</name>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
-        <source>Player &quot;%1&quot;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
-        <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>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelector</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
-        <source>Display Navigation Buttons</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="155"/>
-        <source>Printing Selector</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardOverlayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="199"/>
-        <source>Preference</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
-        <source>Pin Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
-        <source>Unpin Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardSearchWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
-        <source>Search by set name or set code</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardSelectionWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
-        <source>Previous Card in Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
-        <source>Bulk Selection</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorCardSortingWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
-        <source>Alphabetical</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
-        <source>Preference</source>
-        <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 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"/>
-        <source>Descending</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
-        <source>Ascending</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PrintingSelectorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
-        <source>Select a card to view its available printings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>PtMenu</name>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
-        <source>Power / toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
-        <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
-        <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
-        <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
-        <source>D&amp;ecrease toughness</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
-        <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
-        <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
-        <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
-        <source>Set &amp;power and toughness...</source>
-        <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 type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>QMenuBar</name>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="765"/>
-        <source>Services</source>
-        <translation>服務</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="766"/>
-        <source>Hide %1</source>
-        <translation>隱藏 %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="767"/>
-        <source>Hide Others</source>
-        <translation>隱藏其他</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="768"/>
-        <source>Show All</source>
-        <translation>展示所有</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="769"/>
-        <source>Preferences...</source>
-        <translation>參數</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
-        <source>Quit %1</source>
-        <translation>退出%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
-        <source>About %1</source>
-        <translation>關於 %1</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="85"/>
-        <source>Cockatrice card database (*.xml)</source>
-        <translation>CockatriceCockatrice卡牌數據庫 (*.xml)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
-        <source>All files (*.*)</source>
-        <translation>全部文件 (*.*)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="268"/>
-        <source>Cockatrice replays (*.cor)</source>
-        <translation>Cockatrice錄像文件 (*.cor)</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
-        <source>Maindeck</source>
-        <translation>主套牌</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
-        <source>Sideboard</source>
-        <translation>備牌</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
-        <source>Tokens</source>
-        <translation>衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="117"/>
-        <source>Overwrite Existing File?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="118"/>
-        <source>A .cod version of this deck already exists. Overwrite it?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="11"/>
-        <source>Enabling this feature will disable the use of the Printing Selector.
-
-You will not be able to manage printing preferences on a per-deck basis, or see printings other people have selected for their decks.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="17"/>
-        <source>Disabling this feature will enable the Printing Selector.
-
-You can now choose printings on a per-deck basis in the Deck Editor and configure which printing gets added to a deck by default by pinning it in the Printing Selector.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>QPlatformTheme</name>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
-        <source>OK</source>
-        <translation>確定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
-        <source>Save</source>
-        <translation>保存</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
-        <source>Save All</source>
-        <translation>保存全部</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="777"/>
-        <source>Open</source>
-        <translation>打開</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="778"/>
-        <source>&amp;Yes</source>
-        <translation>是</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
-        <source>Yes to &amp;All</source>
-        <translation>全選是</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
-        <source>&amp;No</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
-        <source>N&amp;o to All</source>
-        <translation>全選否</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
-        <source>Abort</source>
-        <translation>退出</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
-        <source>Retry</source>
-        <translation>重試</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
-        <source>Ignore</source>
-        <translation>忽略</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
-        <source>Close</source>
-        <translation>關閉</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
-        <source>Discard</source>
-        <translation>棄牌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
-        <source>Help</source>
-        <translation>幫助</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
-        <source>Apply</source>
-        <translation>應用</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
-        <source>Reset</source>
-        <translation>重置</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
-        <source>Restore Defaults</source>
-        <translation>恢復為默認值</translation>
-    </message>
-</context>
-<context>
-    <name>RemoteDeckList_TreeModel</name>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
-        <source>Name</source>
-        <translation>名稱</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
-        <source>Upload time</source>
-        <translation>上傳時間</translation>
-    </message>
-</context>
-<context>
-    <name>RemoteReplayList_TreeModel</name>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
-        <source>ID</source>
-        <translation>ID</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
-        <source>Name</source>
-        <translation>名稱</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
-        <source>Players</source>
-        <translation>玩家</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
-        <source>Keep</source>
-        <translation>維持</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
-        <source>Time started</source>
-        <translation>遊戲時間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
-        <source>Duration (sec)</source>
-        <translation>持續(離開)</translation>
-    </message>
-</context>
-<context>
-    <name>RfgMenu</name>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
-        <source>&amp;Exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
-        <source>&amp;View exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
-        <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
-        <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
-        <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
-        <source>&amp;Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
-        <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>RoomSelector</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
-        <source>Rooms</source>
-        <translation>房間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
-        <source>Joi&amp;n</source>
-        <translation>加入</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
-        <source>Room</source>
-        <translation>房間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
-        <source>Description</source>
-        <translation>信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
-        <source>Permissions</source>
-        <translation>許可證</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
-        <source>Players</source>
-        <translation>玩家</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
-        <source>Games</source>
-        <translation>遊戲</translation>
-    </message>
-</context>
-<context>
-    <name>SayMenu</name>
-    <message>
-        <location filename="src/game/player/menu/say_menu.cpp" line="16"/>
-        <source>S&amp;ay</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>SequenceEdit</name>
-    <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
-        <source>Choose an action from the table</source>
-        <translation>從列表中選擇動作</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
-        <source>Hit the key/combination of keys you want to set for this action</source>
-        <translation>點擊要為此操作設置的鍵/組合鍵</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="175"/>
-        <source>Invalid key</source>
-        <translation>無效密鑰</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
-        <source>Shortcut already in use by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
-        <source>Clear</source>
-        <translation>清理</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
-        <source>Restore default</source>
-        <translation>恢復至默認狀態</translation>
-    </message>
-</context>
-<context>
-    <name>SetsModel</name>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
-        <source>Enabled</source>
-        <translation>已啓用</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
-        <source>Set type</source>
-        <translation>設置類型</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
-        <source>Set code</source>
-        <translation>設置代碼</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
-        <source>Long name</source>
-        <translation>長的名稱</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
-        <source>Release date</source>
-        <translation>發佈日期</translation>
-    </message>
-</context>
-<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"/>
-        <source>Restore all default shortcuts</source>
-        <translation>恢復所有默認快捷鍵</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
-        <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"/>
-        <source>Clear all default shortcuts</source>
-        <translation>清楚所有默認快捷鍵</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
-        <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"/>
-        <source>Section:</source>
-        <translation>部分:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
-        <source>Action:</source>
-        <translation>行動:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
-        <source>Shortcut:</source>
-        <translation>快捷鍵:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
-        <source>How to set custom shortcuts</source>
-        <translation>如何設置自定義快捷鍵</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
-        <source>Clear all shortcuts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
-        <source>Search by shortcut name</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ShortcutTreeView</name>
-    <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
-        <source>Action</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
-        <source>Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ShortcutsSettings</name>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
-        <source>Your configuration file contained invalid shortcuts.
-Please check your shortcut settings!</source>
-        <translation>您的配置文件包涵了無效的快捷鍵
-請檢查您的快捷鍵設定</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
-        <source>The following shortcuts have been set to default:
-</source>
-        <translation>以下快捷方式被設置為默認狀態：
-</translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownDialog</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="20"/>
-        <source>&amp;Reason for shutdown:</source>
-        <translation>關閉原因:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="24"/>
-        <source>&amp;Time until shutdown (minutes):</source>
-        <translation>關閉倒計時 (分鐘)：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="43"/>
-        <source>Shut down server</source>
-        <translation>關閉伺服器</translation>
-    </message>
-</context>
-<context>
-    <name>SideboardMenu</name>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
-        <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
-        <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>SoundSettingsPage</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
-        <source>Enable &amp;sounds</source>
-        <translation>啓用聲效</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
-        <source>Current sounds theme:</source>
-        <translation>當前聲效主題：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
-        <source>Test system sound engine</source>
-        <translation>測試系統聲效</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
-        <source>Sound settings</source>
-        <translation>聲效設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
-        <source>Master volume</source>
-        <translation>主音量</translation>
-    </message>
-</context>
-<context>
-    <name>SpoilerBackgroundUpdater</name>
-    <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
-        <source>Spoilers season has ended</source>
-        <translation>預覽季節已結束</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
-        <source>Deleting spoiler.xml. Please run Oracle</source>
-        <translation>刪除spoiler.xml。請運行Oracle</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
-        <source>Spoilers download failed</source>
-        <translation>預覽下載錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
-        <source>No internet connection</source>
-        <translation>沒有網絡連接</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
-        <source>Spoilers already up to date</source>
-        <translation>Spoilers更新已準備好</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
-        <source>No new spoilers added</source>
-        <translation>沒有新的預覽被添加</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
-        <source>Spoilers have been updated!</source>
-        <translation>預覽已更新！</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
-        <source>Last change:</source>
-        <translation>最後變更：</translation>
-    </message>
-</context>
-<context>
-    <name>StableReleaseChannel</name>
-    <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
-        <source>Default</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
-        <source>No reply received from the release update server.</source>
-        <translation>更新伺服器未回應。</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="128"/>
-        <source>Invalid reply received from the release update server.</source>
-        <translation>收到更新伺服器的無效回應。</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
-        <source>No reply received from the tag update server.</source>
-        <translation>未收到標籤更新伺服器的回應</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
-        <source>Invalid reply received from the tag update server.</source>
-        <translation>收到標籤更新伺服器的無效回應</translation>
-    </message>
-</context>
-<context>
-    <name>TabAccount</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
-        <source>Add to Buddy List</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
-        <source>Add to Ignore List</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabAdmin</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.h" line="67"/>
-        <source>Administration</source>
-        <translation>管理員</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="130"/>
-        <source>Update server &amp;message</source>
-        <translation>更新伺服器信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="131"/>
-        <source>&amp;Shut down server</source>
-        <translation>關閉伺服器</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="132"/>
-        <source>&amp;Reload configuration</source>
-        <translation>重新載入設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="133"/>
-        <source>Server administration functions</source>
-        <translation>伺服器管理功能</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
-        <source>Server moderator functions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
-        <source>Replay ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
-        <source>Grant Replay Access</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
-        <source>Username to Activate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
-        <source>Force Activate User</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
-        <source>&amp;Unlock functions</source>
-        <translation>解鎖功能</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="143"/>
-        <source>&amp;Lock functions</source>
-        <translation>鎖定功能</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
-        <source>Success</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
-        <source>Replay access granted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
-        <source>Unable to grant replay access. Replay ID invalid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
-        <source>Unable to grant replay access. Internal error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
-        <source>User successfully activated</source>
-        <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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
-        <source>Unable to activate user. Internal error</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabArchidekt</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="77"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Desc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
-        <source>AND</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="105"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
-        <source>Require ALL selected colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
-        <source>Deck name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
-        <source>Owner...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
-        <source>Packages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
-        <source>Advanced Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
-        <source>Bracket:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
-        <source>Any</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
-        <source>Contains card...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
-        <source>Commander...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
-        <source>Tag...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
-        <source>Deck Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
-        <source>Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
-        <source>Asc.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
-        <source>Filter by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
-        <source>Display Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
-        <source>Archidekt: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabDeckEditor</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
-        <source>Card Info</source>
-        <translation>卡牌信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
-        <source>Deck</source>
-        <translation>套牌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
-        <source>Filters</source>
-        <translation>過濾器</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
-        <source>&amp;View</source>
-        <translation>視圖</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
-        <source>Card Database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
-        <source>Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
-        <source>Visible</source>
-        <translation>可見</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
-        <source>Floating</source>
-        <translation>移動窗口</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
-        <source>Reset layout</source>
-        <translation>重置界面</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="83"/>
-        <source>Deck: %1</source>
-        <translation>套牌: %1</translation>
-    </message>
-</context>
-<context>
-    <name>TabDeckEditorVisual</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="118"/>
-        <source>Visual Deck: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="297"/>
-        <source>&amp;Visual Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="299"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
-        <source>Card Info</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="306"/>
-        <source>Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="301"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="307"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
-        <source>&amp;View</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
-        <source>Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="311"/>
-        <source>Visible</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
-        <source>Floating</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="315"/>
-        <source>Reset layout</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabDeckEditorVisualTabWidget</name>
-    <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 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 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 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 type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabDeckStorage</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
-        <source>Local file system</source>
-        <translation>本地文件系統</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
-        <source>Server deck storage</source>
-        <translation>伺服器上的套牌倉庫</translation>
-    </message>
-    <message>
-        <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>打開套牌編輯</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
-        <source>Rename deck or folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
-        <source>Upload deck</source>
-        <translation>上傳套牌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
-        <source>Download deck</source>
-        <translation>下載套牌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="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"/>
-        <source>New folder</source>
-        <translation>新建文件夾</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
-        <source>Delete</source>
-        <translation>刪除</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
-        <source>Open decks folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
-        <source>Rename local folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
-        <source>Rename local file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
-        <source>New name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
-        <source>Rename failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
-        <source>Invalid deck file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
-        <source>Enter deck name</source>
-        <translation>輸入套牌名稱</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
-        <source>This decklist does not have a name.
-Please enter a name:</source>
-        <translation>這個套牌沒有名稱.
-請輸入一個名稱:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
-        <source>Unnamed deck</source>
-        <translation>未命名套牌</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
-        <source>Failed to upload deck to server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
-        <source>Delete local file</source>
-        <translation>刪除本地文件</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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
-        <source>Delete remote decks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
-        <source>Are you sure you want to delete the selected decks?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="374"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
-        <source>Name of new folder:</source>
-        <translation>新建文件夾的名稱:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabDeckStorageVisual</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
-        <source>Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
-        <source>Could not open deck at %1</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabEdhRec</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
-        <source>EDHREC: </source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabEdhRecMain</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
-        <source>&amp;Cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
-        <source>Top Commanders</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
-        <source>Tags</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
-        <source>Search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
-        <source>EDHRec: </source>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Replay Timeline</source>
-        <translation>錄像時間線</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
-        <source>&amp;Phases</source>
-        <translation>階段</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
-        <source>&amp;Game</source>
-        <translation>遊戲</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
-        <source>Next &amp;phase</source>
-        <translation>下個階段</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
-        <source>Next phase with &amp;action</source>
-        <translation>下個階段&amp;行動</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
-        <source>Next &amp;turn</source>
-        <translation>下個回合</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
-        <source>Reverse turn order</source>
-        <translation>反轉回合順序</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
-        <source>&amp;Remove all local arrows</source>
-        <translation>移除所有箭頭</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
-        <source>Rotate View Cl&amp;ockwise</source>
-        <translation>順時針旋轉視角</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
-        <source>Rotate View Co&amp;unterclockwise</source>
-        <translation>逆時針旋轉視角</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
-        <source>Game &amp;information</source>
-        <translation>遊戲信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
-        <source>Un&amp;concede</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="319"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="816"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="837"/>
-        <source>&amp;Concede</source>
-        <translation>放棄遊戲</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
-        <source>&amp;Leave game</source>
-        <translation>離開遊戲</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
-        <source>C&amp;lose replay</source>
-        <translation>關閉遊戲錄像</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
-        <source>&amp;Focus Chat</source>
-        <translation>聚焦聊天室</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
-        <source>&amp;Say:</source>
-        <translation>説：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
-        <source>Selected cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
-        <source>&amp;View</source>
-        <translation>視圖</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <source>Visible</source>
-        <translation>可見</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <source>Floating</source>
-        <translation>移動窗口</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <source>Reset layout</source>
-        <translation>重置界面</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
-        <source>Concede</source>
-        <translation>投降</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
-        <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"/>
-        <source>Unconcede</source>
-        <translation>取消投降</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
-        <source>You have already conceded.  Do you want to return to this game?</source>
-        <translation>你已經投降,你想回到這場遊戲嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
-        <source>Leave game</source>
-        <translation>離開遊戲</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
-        <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"/>
-        <source>A player has joined game #%1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
-        <source>%1 has joined the game</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
-        <source>You have been kicked out of the game.</source>
-        <translation>你已被踢出遊戲。</translation>
-    </message>
-</context>
-<context>
-    <name>TabHome</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabLog</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.h" line="66"/>
-        <source>Logs</source>
-        <translation>記錄</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="28"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="34"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="40"/>
-        <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</source>
-        <translation>時間；發送者姓名；發送者IP；消息；目標ID；目標姓名</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
-        <source>Room Logs</source>
-        <translation>房間記錄</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
-        <source>Game Logs</source>
-        <translation>遊戲記錄</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
-        <source>Chat Logs</source>
-        <translation>聊天記錄</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
-        <source>You must select at least one filter.</source>
-        <translation>您必須至少選擇一個過濾項</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="76"/>
-        <source>You have to select a valid number of days to locate.</source>
-        <translation>您必須選擇一個可用的天數用來定位</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
-        <source>Username: </source>
-        <translation>用户名：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
-        <source>IP Address: </source>
-        <translation>IP地址：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
-        <source>Game Name: </source>
-        <translation>遊戲名：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
-        <source>GameID: </source>
-        <translation>遊戲ID：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
-        <source>Message: </source>
-        <translation>消息：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
-        <source>Main Room</source>
-        <translation>主房間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
-        <source>Game Room</source>
-        <translation>遊戲房間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
-        <source>Private Chat</source>
-        <translation>私人聊天</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
-        <source>Past X Days: </source>
-        <translation>過去 X 天：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
-        <source>Today</source>
-        <translation>今天</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
-        <source>Last Hour</source>
-        <translation>1小時前</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
-        <source>Maximum Results: </source>
-        <translation>最大結果：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
-        <source>At least one filter is required.
-The more information you put in, the more specific your results will be.</source>
-        <translation>至少需要1個篩選項。
-您輸入的信息越多，找到結果越準確。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
-        <source>Get User Logs</source>
-        <translation>獲取用戶記錄</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
-        <source>Clear Filters</source>
-        <translation>清楚篩選項目</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
-        <source>Filters</source>
-        <translation>過濾器</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
-        <source>Log Locations</source>
-        <translation>記錄位置</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
-        <source>Date Range</source>
-        <translation>日期範圍</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
-        <source>Maximum Results</source>
-        <translation>最大結果</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
-        <source>Message History</source>
-        <translation>消息歷史</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
-        <source>Failed to collect message history information.</source>
-        <translation>獲取消息歷史信息失敗。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
-        <source>There are no messages for the selected filters.</source>
-        <translation>沒有符合篩選條件的消息。</translation>
-    </message>
-</context>
-<context>
-    <name>TabMessage</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="69"/>
-        <source>Private &amp;chat</source>
-        <translation>私人聊天</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
-        <source>&amp;Leave</source>
-        <translation>離開</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
-        <source>%1 - Private chat</source>
-        <translation>%1 - 私人聊天</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
-        <source>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</source>
-        <translation>該用戶已屏蔽你，他無法在主聊天中看見你的消息，你也不能加入他的遊戲。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
-        <source>Private message from</source>
-        <translation>私人信息來自</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
-        <source>%1 has left the server.</source>
-        <translation>%1 已經離開了伺服器.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
-        <source>%1 has joined the server.</source>
-        <translation>%1 已經加入了伺服器.</translation>
-    </message>
-</context>
-<context>
-    <name>TabReplays</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
-        <source>Local file system</source>
-        <translation>本地文件系統</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
-        <source>Server replay storage</source>
-        <translation>伺服器錄像倉庫</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
-        <source>Watch replay</source>
-        <translation>觀看錄像</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <source>Rename</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
-        <source>New folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
-        <source>Delete</source>
-        <translation>刪除</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <source>Open replays folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
-        <source>Download replay</source>
-        <translation>下載遊戲錄像</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
-        <source>Toggle expiration lock</source>
-        <translation>過期鎖定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
-        <source>Get replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Look up replay by share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
-        <source>Rename local folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
-        <source>Rename local file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
-        <source>New name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
-        <source>Rename failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
-        <source>Name of new folder:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
-        <source>Delete local file</source>
-        <translation>刪除本地文件</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 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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <source>Failed to get code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="541"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="602"/>
-        <source>Either this server does not support replay sharing, or does not permit replay sharing for you.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
-        <source>Replay Share Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
-        <source>Others can use this code to add the replay to their list of remote replays:
-%1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
-        <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
-        <source>Replay share code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
-        <source>Replay code found</source>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
-        <source>Replay code not found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Failed to submit code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
-        <source>Unexpected error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
-        <source>Delete remote replay</source>
-        <translation>刪除伺服器上的錄像</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
-        <source>Game Replays</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabRoom</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
-        <source>&amp;Say:</source>
-        <translation>説：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
-        <source>Chat</source>
-        <translation>聊天</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
-        <source>&amp;Room</source>
-        <translation>房間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
-        <source>&amp;Leave room</source>
-        <translation>離開房間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
-        <source>&amp;Clear chat</source>
-        <translation>清除聊天記錄</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
-        <source>Chat Settings...</source>
-        <translation>聊天設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
-        <source> mentioned you.</source>
-        <translation>提到了你。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
-        <source>Click to view</source>
-        <translation>點擊查看</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
-        <source>You are flooding the chat. Please wait a couple of seconds.</source>
-        <translation>你正在灌水，請等待幾秒再發言.</translation>
-    </message>
-</context>
-<context>
-    <name>TabServer</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
-        <source>Server</source>
-        <translation>伺服器</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
-        <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
-        <source>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
-        <source>You do not have the required permission to join this server room.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
-        <source>Failed to join the server room due to an unknown error: %1.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TabSupervisor</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
-        <source>Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
-        <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
-        <source>EDHRec</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Archidekt</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
-        <source>&amp;Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
-        <source>Visual Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
-        <source>Server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
-        <source>Game Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
-        <source>Administration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
-        <source>Logs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
-        <source>Are you sure?</source>
-        <translation>你確定嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
-        <source>There are still open games. Are you sure you want to quit?</source>
-        <translation>遊戲還在繼續, 你確定要退出嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
-        <source>Click to view</source>
-        <translation>點擊查看</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
-        <source>Your buddy %1 has signed on!</source>
-        <translation>你的好友%1已登錄!</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
-        <source>Unknown Event</source>
-        <translation>未知事件</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
-        <source>The server has sent you a message that your client does not understand.
-This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>伺服器發送了一條你的客户端無法識別的消息。
-這條消息可能是表明當前有新版本的Cockatrice軟件，或是伺服器上運行的是自定義/預覽版本。
-
-要升級你的客户端，請點擊“幫助”-&gt;“檢查更新”</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
-        <source>Idle Timeout</source>
-        <translation>閒置超時</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
-        <source>You are about to be logged out due to inactivity.</source>
-        <translation>你即將因為長時間未操作而被退出。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
-        <source>Promotion</source>
-        <translation>晉升</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
-        <source>You have been promoted. Please log out and back in for changes to take effect.</source>
-        <translation>你已被提升為版主。請退出再登陸以使修改生效。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
-        <source>Warned</source>
-        <translation>被警告</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
-        <source>You have received a warning due to %1.
-Please refrain from engaging in this activity or further actions may be taken against you. If you have any questions, please private message a moderator.</source>
-        <translation>你因為%1被警告。
-請杜絕此類行為否則會被採取進一步行動。如果有任何疑問，請私信版主。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
-        <source>You have received the following message from the server.
-(custom messages like these could be untranslated)</source>
-        <translation>你收到來自伺服器的如下消息。
-(消息可能未經翻譯)</translation>
-    </message>
-</context>
-<context>
-    <name>TabVisualDatabaseDisplay</name>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
-        <source>Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
-        <source>Visual Database Display</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>TappedOutInterface</name>
-    <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="23"/>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="63"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/client/network/interfaces/tapped_out_interface.cpp" line="44"/>
-        <source>Unable to analyze the deck.</source>
-        <translation>無法分析套牌。</translation>
-    </message>
-</context>
-<context>
-    <name>TipsOfTheDay</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="25"/>
-        <source>File does not exist.
-</source>
-        <translation>文件不存在
-</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/tip_of_the_day.cpp" line="28"/>
-        <source>Failed to open file.
-</source>
-        <translation>打開文件失敗。
-</translation>
-    </message>
-</context>
-<context>
-    <name>TranslateCounterName</name>
-    <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
-        <source>Life</source>
-        <translation>生命值</translation>
-    </message>
-    <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
-        <source>White</source>
-        <translation>白色</translation>
-    </message>
-    <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
-        <source>Blue</source>
-        <translation>藍色</translation>
-    </message>
-    <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
-        <source>Black</source>
-        <translation>黑色</translation>
-    </message>
-    <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
-        <source>Red</source>
-        <translation>紅色</translation>
-    </message>
-    <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
-        <source>Green</source>
-        <translation>綠色</translation>
-    </message>
-    <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
-        <source>Colorless</source>
-        <translation>無色</translation>
-    </message>
-    <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
-        <source>Other</source>
-        <translation>其他</translation>
-    </message>
-</context>
-<context>
-    <name>UpdateDownloader</name>
-    <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
-        <source>Could not open the file for reading.</source>
-        <translation>無法打開文件。</translation>
-    </message>
-</context>
-<context>
-    <name>UserContextMenu</name>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
-        <source>User &amp;details</source>
-        <translation>用户詳細信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
-        <source>Private &amp;chat</source>
-        <translation>私人聊天</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
-        <source>Show this user&apos;s &amp;games</source>
-        <translation>顯示這個用户的遊戲</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
-        <source>Add to &amp;buddy list</source>
-        <translation>加入到好友列表</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
-        <source>Remove from &amp;buddy list</source>
-        <translation>從好友列表移除</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
-        <source>Add to &amp;ignore list</source>
-        <translation>加入到屏蔽列表</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
-        <source>Remove from &amp;ignore list</source>
-        <translation>從屏蔽列表移除</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
-        <source>Kick from &amp;game</source>
-        <translation>從遊戲中踢出</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
-        <source>Warn user</source>
-        <translation>警告用戶</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
-        <source>View user&apos;s war&amp;n history</source>
-        <translation>查看用户警告記錄</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="69"/>
-        <source>Ban from &amp;server</source>
-        <translation>在伺服器中禁止</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="70"/>
-        <source>View user&apos;s &amp;ban history</source>
-        <translation>查看用户禁止記錄</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="71"/>
-        <source>&amp;Promote user to moderator</source>
-        <translation>將用戶提升為版主</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
-        <source>Dem&amp;ote user from moderator</source>
-        <translation>撤銷用户版主職位</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="73"/>
-        <source>Promote user to &amp;judge</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
-        <source>Demote user from judge</source>
-        <translation>撤銷用戶的裁判身份</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
-        <source>View admin notes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="86"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
-        <source>This user does not exist.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="87"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="91"/>
-        <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
-        <source>%1&apos;s games</source>
-        <translation>%1的遊戲</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="173"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="196"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="200"/>
-        <source>Ban History</source>
-        <translation>禁止歷史</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="179"/>
-        <source>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</source>
-        <translation>禁止時間；版主；禁止時長；禁止理由；可見理由</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
-        <source>User has never been banned.</source>
-        <translation>用戶從未被禁止</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
-        <source>Failed to collect ban information.</source>
-        <translation>獲取禁止信息失敗。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
-        <source>Warning History</source>
-        <translation>警告歷史</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
-        <source>Warning Time;Moderator;User Name;Reason</source>
-        <translation>警告時間；版主；用户名；理由</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
-        <source>User has never been warned.</source>
-        <translation>用戶從未被警告</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
-        <source>Failed to collect warning information.</source>
-        <translation>獲取警告信息失敗。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <source>Failed to get admin notes.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
-        <source>Success</source>
-        <translation>成功</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
-        <source>Successfully promoted user.</source>
-        <translation>提升用戶成功。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
-        <source>Successfully demoted user.</source>
-        <translation>撤銷用戶成功。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="245"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
-        <source>Failed</source>
-        <translation>失敗</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
-        <source>Failed to promote user.</source>
-        <translation>提升用戶失敗。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
-        <source>Failed to demote user.</source>
-        <translation>撤銷用戶失敗。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
-        <source>Copy hash to clipboard</source>
-        <translation>複製哈希到剪貼板</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
-        <source>Remove this user&apos;s messages</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>UserInfoBox</name>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
-        <source>Location:</source>
-        <translation>位置:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
-        <source>Account Age:</source>
-        <translation>賬號年齡：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
-        <source>Edit</source>
-        <translation>編輯</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
-        <source>Change password</source>
-        <translation>修改密碼</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
-        <source>Change avatar</source>
-        <translation>修改頭像</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
-        <source>Administrator</source>
-        <translation>管理員</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
-        <source>Moderator</source>
-        <translation>版主</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
-        <source>Registered user</source>
-        <translation>註冊用戶</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
-        <source>Unregistered user</source>
-        <translation>未註冊用戶</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="136"/>
-        <source>Judge</source>
-        <translation>裁判</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
-        <source>Unknown</source>
-        <translation>未知的</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <source>The entered password does not match your account.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
-        <source>Information</source>
-        <translation>信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <source>User information updated.</source>
-        <translation>用戶信息已更新。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
-        <source>User Information</source>
-        <translation>用戶信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
-        <source>Real Name:</source>
-        <translation>真實姓名:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
-        <source>User Level:</source>
-        <translation>用戶等級:</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
-        <source>%n Year(s), </source>
-        <comment>amount of years (only shown if more than 0)</comment>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
-        <source>%10%n Day(s) %20</source>
-        <comment>amount of years (if more than 0), amount of days, date in local short format</comment>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
-        <source>Enter Password</source>
-        <translation>輸入密碼</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
-        <source>Password verification is required in order to change your email address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="351"/>
-        <source>An error occurred while trying to update your user information.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
-        <source>This server does not permit you to update your user informations.</source>
-        <translation>該伺服器不允許你更新你的用戶信息。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <source>Password changed.</source>
-        <translation>密碼已修改。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <source>This server does not permit you to change your password.</source>
-        <translation>該伺服器不允許你修改你的密碼。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <source>The new password is too short.</source>
-        <translation>新密碼太短。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <source>The old password is incorrect.</source>
-        <translation>原密碼不正確。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
-        <source>Avatar updated.</source>
-        <translation>頭像已更新。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <source>This server does not permit you to update your avatar.</source>
-        <translation>該伺服器不允許你更新你的頭像。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>嘗試更新你的頭像時出錯。</translation>
-    </message>
-</context>
-<context>
-    <name>UserInterfaceSettingsPage</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
-        <source>General interface settings</source>
-        <translation>通用接口設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
-        <source>&amp;Double-click cards to play them (instead of single-click)</source>
-        <translation>雙擊卡牌開始 (而不是單擊開始)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
-        <source>&amp;Clicking plays all selected cards (instead of just the clicked card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
-        <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"/>
-        <source>Do not delete &amp;arrows inside of subphases</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
-        <source>Close card view window when last card is removed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
-        <source>Auto focus search bar when card view window is opened</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
-        <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"/>
-        <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"/>
-        <source>Notifications settings</source>
-        <translation>通知設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
-        <source>Enable notifications in taskbar</source>
-        <translation>開啓任務欄提醒</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
-        <source>Notify in the taskbar for game events while you are spectating</source>
-        <translation>觀看時在任務欄提示遊戲信息</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="974"/>
-        <source>Notify in the taskbar when users in your buddy list connect</source>
-        <translation>在任務欄中提示好友連接到伺服器</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
-        <source>Animation settings</source>
-        <translation>動畫設定</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
-        <source>&amp;Tap/untap animation</source>
-        <translation>橫置/重置 動畫</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
-        <source>Deck editor/storage settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
-        <source>Open deck in new tab by default</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
-        <source>Use visual deck storage in game lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
-        <source>Use selection animation for Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
-        <source>When adding a tag in the visual deck storage to a .txt deck:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="984"/>
-        <source>do nothing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
-        <source>ask to convert to .cod</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
-        <source>always convert to .cod</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
-        <source>Default deck editor type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
-        <source>Classic Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
-        <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
-        <source>Replay settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
-        <source>Buffer time for backwards skip via shortcut:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>UserListWidget</name>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
-        <source>Users connected to server: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
-        <source>Users in this room: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
-        <source>Buddies online: %1 / %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
-        <source>Ignored users online: %1 / %2</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>UtilityMenu</name>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
-        <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>R&amp;oll die...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
-        <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
-        <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
-        <source>Cr&amp;eate predefined token</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayColorFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>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"/>
-    </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"/>
-    </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"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
-        <source>Search filter...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
-        <source>Save Filter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="53"/>
-        <source>Save all currently applied filters to a file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
-        <source>Enter filename...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
-        <source>Sort by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
-        <source>Filter by</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
-        <source>Save and load filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
-        <source>Filter by exact card name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
-        <source>Filter by card main-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
-        <source>Filter by card sub-type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
-        <source>Filter by set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
-        <source>Filter by format legality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
-        <source>Save/Load</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
-        <source>Main Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
-        <source>Sub Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
-        <source>Sets</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
-        <source>Formats</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
-        <source>Show formats with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
-        <source>Do not display formats with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="66"/>
-        <source>Show main types with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
-        <source>Do not display card main-types with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="177"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="177"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Filter by name... (Exact match)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
-        <source>Load from Clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
-        <source>Apply all card names in clipboard as exact match name filters</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="43"/>
-        <source>Filter to most recent sets</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplaySetFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="57"/>
-        <source>Search sets...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="87"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="26"/>
-        <source>Search subtypes...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="71"/>
-        <source>Show sub types with at least:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
-        <source> cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
-        <source>Do not display card sub-types with less than this amount of cards in the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="185"/>
-        <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="185"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDatabaseDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
-        <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
-        <source>Visual</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
-        <source>Clear all filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
-        <source>Table</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckDisplayOptionsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
-        <source>Group by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
-        <source>Change how cards are divided into categories/groups.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
-        <source>Sort by:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
-        <source>Click and drag to change the sort order within the groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="94"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="121"/>
-        <source>Toggle Layout: Overlap</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
-        <source>Toggle Layout: Flat</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorPlaceholderWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
-        <source>Add cards using the search bar or database tab to have them appear here</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorSampleHandWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="71"/>
-        <source>Draw a new sample hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="72"/>
-        <source>Sample hand size</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckEditorWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
-        <source>Type a card name here for suggestions from the database...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="208"/>
-        <source>Quick search and add card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="209"/>
-        <source>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageFolderDisplayWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageQuickSettingsWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
-        <source>Show Folders</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
-        <source>Show Tag Filter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="131"/>
-        <source>Show Color Identity</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="132"/>
-        <source>Show Tags On Deck Previews</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="133"/>
-        <source>Show Banner Card Selection Option</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="134"/>
-        <source>Draw unused Color Identities</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="135"/>
-        <source>Unused Color Identities Opacity</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
-        <source>Deck tooltip:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
-        <source>None</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
-        <source>Filepath</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageSearchWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="26"/>
-        <source>Search by filename (or search expression)</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageSortWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
-        <source>Sort Alphabetically (Deck Name)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
-        <source>Sort Alphabetically (Filename)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
-        <source>Sort by Last Modified</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
-        <source>Sort by Last Loaded</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>VisualDeckStorageWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
-        <source>Loading database ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
-        <source>Refresh loaded files</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
-        <source>Visual Deck Storage Settings</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>WarningDialog</name>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
-        <source>Which warning would you like to send?</source>
-        <translation>你想發出那種警告？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
-        <source>Redact all messages from this user in all rooms</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
-        <source>&amp;OK</source>
-        <translation>確認</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
-        <source>&amp;Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
-        <source>Warn user for misconduct</source>
-        <translation>警告用戶的不當行為</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
-        <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
-        <translation>發送警告的用戶名不能為空，請提供用戶名以供警告。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <source>Warning to use can not be blank, please select a valid warning to send.</source>
-        <translation>警告不能為空，請選擇警告以供發送。</translation>
-    </message>
-</context>
-<context>
-    <name>WndSets</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="35"/>
-        <source>Move selected set to the top</source>
-        <translation>將選擇的系列移到頂端</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="42"/>
-        <source>Move selected set up</source>
-        <translation>將選擇的系列上移</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="49"/>
-        <source>Move selected set down</source>
-        <translation>將選擇的系列下移</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="56"/>
-        <source>Move selected set to the bottom</source>
-        <translation>將選擇的系列移到底部</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
-        <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"/>
-        <source>Default order</source>
-        <translation>默認順序</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="70"/>
-        <source>Restore original art priority order</source>
-        <translation>恢復初始優先順序</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="106"/>
-        <source>Enable all sets</source>
-        <translation>啓用所有系列</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="107"/>
-        <source>Disable all sets</source>
-        <translation>禁用所有系列</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="108"/>
-        <source>Enable selected set(s)</source>
-        <translation>啓用所選系列</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
-        <source>Disable selected set(s)</source>
-        <translation>禁用所選系列</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
-        <source>Deck Editor</source>
-        <translation>套牌編輯器</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="125"/>
-        <source>Use CTRL+A to select all sets in the view.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="126"/>
-        <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="127"/>
-        <source>Image priority is decided in the following order:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
-        <source>first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom)</source>
-        <comment>%1 is a link to the wiki</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="157"/>
-        <source>Include cards rebalanced for Alchemy [requires restart]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="127"/>
-        <source>Card Art</source>
-        <translation>牌張風格</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
-        <source>How to use custom card art</source>
-        <translation>如何使用自定義卡牌圖片</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
-        <source>Hints</source>
-        <translation>提示</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
-        <source>Note</source>
-        <translation>注</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="143"/>
-        <source>Sorting by column allows you to find a set while not changing set priority.</source>
-        <translation>按列排序允許您在不更改系列優先級的情況下查找系列。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="144"/>
-        <source>To enable ordering again, click the column header until this message disappears.</source>
-        <translation>要再次啓用排序，請單擊列標題，直到此消息消失。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="147"/>
-        <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"/>
-        <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"/>
-        <source>Manage sets</source>
-        <translation>系列管理</translation>
-    </message>
-</context>
-<context>
-    <name>ZoneViewWidget</name>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="61"/>
-        <source>Search by card name (or search expressions)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
-        <source>Ungrouped</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
-        <source>Group by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
-        <source>Group by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
-        <source>Group by Color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
-        <source>Unsorted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
-        <source>Sort by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
-        <source>Sort by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
-        <source>Sort by Mana Cost</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
-        <source>Sort by Colors</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
-        <source>Sort by P/T</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
-        <source>Sort by Set</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
-        <source>shuffle when closing</source>
-        <translation>當關閉界面時洗牌</translation>
-    </message>
-    <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
-        <source>pile view</source>
-        <translation>柱形圖</translation>
-    </message>
-</context>
-<context>
-    <name>i18n</name>
-    <message>
-        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
-        <source>English</source>
-        <translation>繁體中文 (Chinese Traditional)</translation>
-    </message>
-</context>
-<context>
-    <name>main</name>
-    <message>
-        <location filename="src/main.cpp" line="230"/>
-        <source>Connect on startup</source>
-        <translation>啓動連接</translation>
-    </message>
-    <message>
-        <location filename="src/main.cpp" line="231"/>
-        <source>Debug to file</source>
-        <translation>調試至文件</translation>
-    </message>
-</context>
-<context>
-    <name>shortcutsTab</name>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
-        <source>Main Window</source>
-        <translation>主窗口</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
-        <source>Deck Editor</source>
-        <translation>套牌編輯</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
-        <source>Game Lobby</source>
-        <translation>遊戲大廳</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
-        <source>Card Counters</source>
-        <translation>牌指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
-        <source>Player Counters</source>
-        <translation>玩家指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
-        <source>Power and Toughness</source>
-        <translation>力量和防禦力</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
-        <source>Game Phases</source>
-        <translation>遊戲步驟</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
-        <source>Playing Area</source>
-        <translation>遊戲區域</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
-        <source>Move Selected Card</source>
-        <translation>移動所選的牌張</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
-        <source>View</source>
-        <translation>查看</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
-        <source>Move Top Card</source>
-        <translation>移動上方的牌張</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
-        <source>Move Bottom Card</source>
-        <translation>移動底部的牌張</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
-        <source>Gameplay</source>
-        <translation>遊戲</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
-        <source>Drawing</source>
-        <translation>繪制</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
-        <source>Chat Room</source>
-        <translation>聊天室</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
-        <source>Game Window</source>
-        <translation>遊戲窗口</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
-        <source>Load Deck from Clipboard</source>
-        <translation>從剪貼板載入套牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
-        <source>Replays</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
-        <source>Tabs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
-        <source>Check for Card Updates...</source>
-        <translation>檢查卡牌更新</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
-        <source>Connect...</source>
-        <translation>連接</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
-        <source>Disconnect</source>
-        <translation>斷開連接</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
-        <source>Exit</source>
-        <translation>退出</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
-        <source>Full screen</source>
-        <translation>全屏</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
-        <source>Register...</source>
-        <translation>註冊</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
-        <source>Settings...</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
-        <source>Start a Local Game...</source>
-        <translation>開始本地遊戲</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
-        <source>Watch Replay...</source>
-        <translation>觀看錄像</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
-        <source>Analyze Deck (deckstats.net)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
-        <source>Analyze Deck (tappedout.net)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
-        <source>Clear All Filters</source>
-        <translation>清除所有篩選項目</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
-        <source>Clear Selected Filter</source>
-        <translation>清除所選的篩選項目</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
-        <source>Close</source>
-        <translation>關閉</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
-        <source>Remove Card</source>
-        <translation>移除卡牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
-        <source>Manage Sets...</source>
-        <translation>系列管理</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
-        <source>Edit Custom Tokens...</source>
-        <translation>編輯自定義衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
-        <source>Export Deck (decklist.org)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
-        <source>Export Deck (decklist.xyz)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
-        <source>Add Card</source>
-        <translation>添加卡牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
-        <source>Load Deck...</source>
-        <translation>讀取套牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
-        <source>Load Deck from Clipboard...</source>
-        <translation>從剪貼板載入套牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
-        <source>Edit Deck in Clipboard, Annotated</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
-        <source>Edit Deck in Clipboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
-        <source>New Deck</source>
-        <translation>創建新套牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
-        <source>Open Custom Pictures Folder</source>
-        <translation>打開自定義圖片文件夾</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
-        <source>Print Deck...</source>
-        <translation>打印套牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
-        <source>Delete Card</source>
-        <translation>刪除卡牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
-        <source>Reset Layout</source>
-        <translation>重置佈局</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
-        <source>Save Deck</source>
-        <translation>保存套牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
-        <source>Save Deck as...</source>
-        <translation>套牌另存為</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
-        <source>Save Deck to Clipboard, Annotated</source>
-        <translation>保存套牌到剪貼板，帶注釋</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
-        <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
-        <source>Save Deck to Clipboard</source>
-        <translation>保存套牌到剪貼板</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
-        <source>Save Deck to Clipboard (No Set Info)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
-        <source>Load Local Deck...</source>
-        <translation>從本地載入套牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
-        <source>Load Remote Deck...</source>
-        <translation>載入遠程套牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
-        <source>Set Ready to Start</source>
-        <translation>系列準備好開始</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
-        <source>Toggle Sideboard Lock</source>
-        <translation>切換備牌鎖</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
-        <source>Add Green Counter</source>
-        <translation>增加綠色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
-        <source>Remove Green Counter</source>
-        <translation>移除綠色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
-        <source>Set Green Counters...</source>
-        <translation>設置綠色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
-        <source>Add Red Counter</source>
-        <translation>增加紅色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
-        <source>Remove Red Counter</source>
-        <translation>移除紅色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
-        <source>Set Red Counters...</source>
-        <translation>設置紅色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
-        <source>Add Life Counter</source>
-        <translation>增加生命指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
-        <source>Show Status Bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
-        <source>Unload Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
-        <source>Force Start</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
-        <source>Add Card Counter (F)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
-        <source>Remove Card Counter (F)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
-        <source>Set Card Counters (F)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
-        <source>Add Card Counter (E)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
-        <source>Remove Card Counter (E)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
-        <source>Set Card Counters (E)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
-        <source>Add Card Counter(D)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
-        <source>Remove Card Counter (D)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
-        <source>Set Card Counters (D)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
-        <source>Add Card Counter (C)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
-        <source>Remove Card Counter (C)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
-        <source>Set Card Counters (C)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
-        <source>Add Card Counter (B)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
-        <source>Remove Card Counter (B)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
-        <source>Set Card Counters (B)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
-        <source>Add Card Counter (A)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
-        <source>Remove Card Counter (A)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
-        <source>Set Card Counters (A)...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
-        <source>Remove Life Counter</source>
-        <translation>移除生命指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
-        <source>Set Life Counters...</source>
-        <translation>設置生命指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
-        <source>Add White Counter</source>
-        <translation>增加白色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
-        <source>Remove White Counter</source>
-        <translation>移除白色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
-        <source>Set White Counters...</source>
-        <translation>設置白色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
-        <source>Add Blue Counter</source>
-        <translation>增加藍色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
-        <source>Remove Blue Counter</source>
-        <translation>移除藍色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
-        <source>Set Blue Counters...</source>
-        <translation>設置藍色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
-        <source>Add Black Counter</source>
-        <translation>增加黑色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
-        <source>Remove Black Counter</source>
-        <translation>移除黑色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
-        <source>Set Black Counters...</source>
-        <translation>設置黑色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
-        <source>Add Colorless Counter</source>
-        <translation>增加無色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
-        <source>Remove Colorless Counter</source>
-        <translation>移除無色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
-        <source>Set Colorless Counters...</source>
-        <translation>設置無色指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
-        <source>Add Other Counter</source>
-        <translation>增加其他指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
-        <source>Remove Other Counter</source>
-        <translation>移除其他指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
-        <source>Set Other Counters...</source>
-        <translation>設置其他指示物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
-        <source>Increment all card counters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
-        <source>Add Power (+1/+0)</source>
-        <translation>增加力量(+1/+0)</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
-        <source>Remove Power (-1/-0)</source>
-        <translation>減少力量(-1/-0)</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
-        <source>Move Toughness to Power (+1/-1)</source>
-        <translation>移動防禦到力量（+1/-1）</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
-        <source>Add Toughness (+0/+1)</source>
-        <translation>增加防禦(+0/+1)</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
-        <source>Remove Toughness (-0/-1)</source>
-        <translation>減少防禦(-0/-1)</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
-        <source>Move Power to Toughness (-1/+1)</source>
-        <translation>移動力量到防禦（-1/+1）</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
-        <source>Add Power and Toughness (+1/+1)</source>
-        <translation>增加力量和防禦(+1/+1)</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
-        <source>Remove Power and Toughness (-1/-1)</source>
-        <translation>減少力量和防禦(-1/-1)</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
-        <source>Set Power and Toughness...</source>
-        <translation>設置力量和防禦</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
-        <source>Reset Power and Toughness</source>
-        <translation>重置力量和防禦</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
-        <source>Untap</source>
-        <translation>重置</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
-        <source>Upkeep</source>
-        <translation>維持</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
-        <source>Draw</source>
-        <translation>抓</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
-        <source>First Main Phase</source>
-        <translation>主要步驟1</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
-        <source>Start Combat</source>
-        <translation>開始戰鬥</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
-        <source>Attack</source>
-        <translation>攻擊</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
-        <source>Block</source>
-        <translation>阻擋</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
-        <source>Damage</source>
-        <translation>傷害</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
-        <source>End Combat</source>
-        <translation>結束戰鬥</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
-        <source>Second Main Phase</source>
-        <translation>主要步驟2</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
-        <source>End</source>
-        <translation>回合結束</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
-        <source>Next Phase</source>
-        <translation>下個步驟</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
-        <source>Next Phase Action</source>
-        <translation>下個行動步驟</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
-        <source>Next Turn</source>
-        <translation>下個回合</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
-        <source>Hide Card in Reveal Window</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
-        <source>Tap / Untap Card</source>
-        <translation>橫置 / 重置卡牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
-        <source>Untap All</source>
-        <translation>重置所有</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
-        <source>Toggle Skip Untapping</source>
-        <oldsource>Toggle Untap</oldsource>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
-        <source>Turn Card Over</source>
-        <translation>將卡翻面</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
-        <source>Peek Card</source>
-        <translation>查看卡牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
-        <source>Play Card</source>
-        <translation>使用卡牌</translation>
-    </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"/>
-        <source>Unattach Card</source>
-        <translation>取消結附</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
-        <source>Clone Card</source>
-        <translation>複製卡牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
-        <source>Create Token...</source>
-        <translation>派出衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
-        <source>Create All Related Tokens</source>
-        <translation>派出所有相關的衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
-        <source>Create Another Token</source>
-        <translation>派出另一個衍生物</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
-        <source>Set Annotation...</source>
-        <translation>設置注釋...</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
-        <source>Select All Cards in Zone</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
-        <source>Select All Cards in Row</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
-        <source>Select All Cards in Column</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
-        <source>Reveal Selected Cards to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
-        <source>Bottom of Library</source>
-        <translation>牌庫底</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="576"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
-        <source>Exile</source>
-        <translation>放逐區</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="572"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
-        <source>Graveyard</source>
-        <translation>墳墓場</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="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"/>
-        <source>Top of Library</source>
-        <translation>牌庫頂</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
-        <source>Battlefield, Face Down</source>
-        <translation>戰場，面朝下</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
-        <source>Battlefield</source>
-        <translation>戰場</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
-        <source>Library</source>
-        <translation>牌庫</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
-        <source>Sideboard</source>
-        <translation>備牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
-        <source>Top Cards of Library</source>
-        <translation>牌庫頂牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
-        <source>Bottom Cards of Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
-        <source>Close Recent View</source>
-        <translation>關閉最近的查看</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
-        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <source>Stack Until Found</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
-        <source>Draw Bottom Card</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
-        <source>Draw Multiple Cards from Bottom...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
-        <source>Draw Arrow...</source>
-        <translation>畫箭頭...</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
-        <source>Remove Local Arrows</source>
-        <translation>移除本地箭頭</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
-        <source>Leave Game</source>
-        <translation>離開遊戲</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
-        <source>Concede</source>
-        <translation>投降</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
-        <source>Roll Dice...</source>
-        <translation>擲骰子...</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
-        <source>Shuffle Library</source>
-        <translation>洗牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
-        <source>Shuffle Top Cards of Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
-        <source>Shuffle Bottom Cards of Library</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
-        <source>Mulligan</source>
-        <translation>再調度起手牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
-        <source>Mulligan (Same hand size)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
-        <source>Mulligan (Hand size - 1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
-        <source>Draw a Card</source>
-        <translation>抓一張牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
-        <source>Draw Multiple Cards...</source>
-        <translation>抓多張牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
-        <source>Undo Draw</source>
-        <translation>撤銷抓牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
-        <source>Always Reveal Top Card</source>
-        <translation>一直展示牌庫頂牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
-        <source>Always Look At Top Card</source>
-        <translation>一直檢視牌庫頂牌</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
-        <source>Sort Hand by Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
-        <source>Sort Hand by Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
-        <source>Sort Hand by Mana Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
-        <source>Reveal Hand to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
-        <source>Reveal Random Card to All Players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
-        <source>Rotate View Clockwise</source>
-        <translation>順時針旋轉視角</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
-        <source>Rotate View Counterclockwise</source>
-        <translation>逆時針旋轉視角</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
-        <source>Unfocus Text Box</source>
-        <translation>取消聚焦文本框</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
-        <source>Focus Chat</source>
-        <translation>聚焦聊天室</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
-        <source>Clear Chat</source>
-        <translation>清除聊天記錄</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
-        <source>Refresh</source>
-        <translation>刷新</translation>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
-        <source>Skip Forward</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
-        <source>Skip Backward</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
-        <source>Skip Forward by a lot</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
-        <source>Skip Backward by a lot</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
-        <source>Play/Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
-        <source>Toggle Fast Forward</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
-        <source>Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
-        <source>Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
-        <source>Server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
-        <source>Administration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
-        <source>Logs</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-</TS>
\ No newline at end of file
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
new file mode 100644
index 000000000..cf2f15db1
--- /dev/null
+++ b/common/CMakeLists.txt
@@ -0,0 +1,49 @@
+# CMakeLists for common directory
+#
+# provides the common library
+
+add_subdirectory(pb)
+
+set(common_SOURCES
+    abstract_deck_list_card_node.cpp
+    abstract_deck_list_node.cpp
+    debug_pb_message.cpp
+    deck_list_card_node.cpp
+    deck_list.cpp
+    expression.cpp
+    featureset.cpp
+    get_pb_extension.cpp
+    inner_deck_list_node.cpp
+    passwordhasher.cpp
+    rng_abstract.cpp
+    rng_sfmt.cpp
+    server/game/server_abstract_participant.cpp
+    server/game/server_arrow.cpp
+    server/game/server_arrowtarget.cpp
+    server/game/server_card.cpp
+    server/game/server_cardzone.cpp
+    server/game/server_counter.cpp
+    server/game/server_game.cpp
+    server/game/server_player.cpp
+    server/game/server_spectator.cpp
+    server/server.cpp
+    server/server_abstractuserinterface.cpp
+    server/server_database_interface.cpp
+    server/server_protocolhandler.cpp
+    server/server_remoteuserinterface.cpp
+    server/server_response_containers.cpp
+    server/server_room.cpp
+    serverinfo_user_container.cpp
+    sfmt/SFMT.c
+)
+
+set(ORACLE_LIBS)
+
+include_directories(pb)
+include_directories(sfmt)
+include_directories(${PROTOBUF_INCLUDE_DIR})
+include_directories(${${COCKATRICE_QT_VERSION_NAME}Core_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_library(cockatrice_common ${common_SOURCES} ${common_MOC_SRCS})
+target_link_libraries(cockatrice_common PUBLIC cockatrice_protocol)
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp b/common/abstract_deck_list_card_node.cpp
similarity index 100%
rename from libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp
rename to common/abstract_deck_list_card_node.cpp
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h b/common/abstract_deck_list_card_node.h
similarity index 88%
rename from libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h
rename to common/abstract_deck_list_card_node.h
index 88d8b0930..82d334db8 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h
+++ b/common/abstract_deck_list_card_node.h
@@ -15,7 +15,6 @@
 
 /**
  * @class AbstractDecklistCardNode
- * @ingroup DeckModels
  * @brief Abstract base class for all deck list nodes that represent
  *        actual card entries.
  *
@@ -59,41 +58,35 @@ public:
     }
 
     /// @return The number of copies of this card in the deck.
-    [[nodiscard]] virtual int getNumber() const = 0;
+    virtual int getNumber() const = 0;
 
     /// @param _number Set the number of copies of this card.
     virtual void setNumber(int _number) = 0;
 
     /// @return The display name of this card.
-    [[nodiscard]] QString getName() const override = 0;
+    QString getName() const override = 0;
 
     /// @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).
-    [[nodiscard]] virtual QString getCardProviderId() const override = 0;
+    virtual QString getCardProviderId() const override = 0;
 
     /// @param _cardProviderId Set the provider identifier for this card.
     virtual void setCardProviderId(const QString &_cardProviderId) = 0;
 
     /// @return The abbreviated set code (e.g., "NEO").
-    [[nodiscard]] virtual QString getCardSetShortName() const override = 0;
+    virtual QString getCardSetShortName() const override = 0;
 
     /// @param _cardSetShortName Set the abbreviated set code.
     virtual void setCardSetShortName(const QString &_cardSetShortName) = 0;
 
     /// @return The collector number of the card within its set.
-    [[nodiscard]] virtual QString getCardCollectorNumber() const override = 0;
+    virtual QString getCardCollectorNumber() const override = 0;
 
     /// @param _cardSetNumber Set the collector number.
     virtual void setCardCollectorNumber(const QString &_cardSetNumber) = 0;
 
-    /// @return The format legality of the card
-    virtual bool getFormatLegality() const = 0;
-
-    /// @param _formatLegal If the card is considered legal
-    virtual void setFormatLegality(const bool _formatLegal) = 0;
-
     /**
      * @brief Get the height of this node in the tree.
      *
@@ -102,7 +95,7 @@ public:
      *
      * @return 0
      */
-    [[nodiscard]] int height() const override
+    int height() const override
     {
         return 0;
     }
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.cpp b/common/abstract_deck_list_node.cpp
similarity index 100%
rename from libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.cpp
rename to common/abstract_deck_list_node.cpp
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h b/common/abstract_deck_list_node.h
similarity index 92%
rename from libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h
rename to common/abstract_deck_list_node.h
index 877705705..6dcc2c7d6 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h
+++ b/common/abstract_deck_list_node.h
@@ -17,11 +17,11 @@
 #ifndef COCKATRICE_ABSTRACT_DECK_LIST_NODE_H
 #define COCKATRICE_ABSTRACT_DECK_LIST_NODE_H
 
+#include <QtCore/QXmlStreamReader>
 #include <QtCore/QXmlStreamWriter>
 
 /**
  * @enum DeckSortMethod
- * @ingroup DeckModels
  * @brief Defines the different sort strategies a node may use
  *        to order its children.
  *
@@ -43,7 +43,6 @@ class InnerDecklistNode;
 
 /**
  * @class AbstractDecklistNode
- * @ingroup DeckModels
  * @brief Base class for all nodes in the deck list tree.
  *
  * This class defines the common interface for every node in the
@@ -122,10 +121,10 @@ public:
      * identifying information about a node, regardless of type.
      * @{
      */
-    [[nodiscard]] virtual QString getName() const = 0;
-    [[nodiscard]] virtual QString getCardProviderId() const = 0;
-    [[nodiscard]] virtual QString getCardSetShortName() const = 0;
-    [[nodiscard]] virtual QString getCardCollectorNumber() const = 0;
+    virtual QString getName() const = 0;
+    virtual QString getCardProviderId() const = 0;
+    virtual QString getCardSetShortName() const = 0;
+    virtual QString getCardCollectorNumber() const = 0;
     /// @}
 
     /**
@@ -137,7 +136,7 @@ public:
     [[nodiscard]] virtual bool isDeckHeader() const = 0;
 
     /// @return The parent node, or nullptr if this is the root.
-    [[nodiscard]] InnerDecklistNode *getParent() const
+    InnerDecklistNode *getParent() const
     {
         return parent;
     }
@@ -146,7 +145,7 @@ public:
      * @brief Compute the depth of this node in the tree.
      * @return Distance from the root (root = 0, children = 1, etc.).
      */
-    [[nodiscard]] int depth() const;
+    int depth() const;
 
     /**
      * @brief Compute the "height" of this node.
@@ -158,7 +157,7 @@ public:
      * - A card node has height 1.
      * - A group node containing cards has height 2.
      */
-    [[nodiscard]] virtual int height() const = 0;
+    virtual int height() const = 0;
 
     /**
      * @brief Compare this node against another for sorting.
diff --git a/libcockatrice_utility/libcockatrice/utility/card_ref.h b/common/card_ref.h
similarity index 87%
rename from libcockatrice_utility/libcockatrice/utility/card_ref.h
rename to common/card_ref.h
index d89fe590b..d29eee0bb 100644
--- a/libcockatrice_utility/libcockatrice/utility/card_ref.h
+++ b/common/card_ref.h
@@ -19,11 +19,6 @@ struct CardRef
     {
         return name == other.name && providerId == other.providerId;
     }
-
-    bool isEmpty() const
-    {
-        return name.isEmpty() && providerId.isEmpty();
-    }
 };
 
 #endif // CARD_REF_H
diff --git a/common/color.h b/common/color.h
new file mode 100644
index 000000000..1ea3e33df
--- /dev/null
+++ b/common/color.h
@@ -0,0 +1,35 @@
+#ifndef COLOR_H
+#define COLOR_H
+
+#ifdef QT_GUI_LIB
+#include <QColor>
+#endif
+
+#include "pb/color.pb.h"
+
+#ifdef QT_GUI_LIB
+inline QColor convertColorToQColor(const color &c)
+{
+    return QColor(c.r(), c.g(), c.b());
+}
+
+inline color convertQColorToColor(const QColor &c)
+{
+    color result;
+    result.set_r(c.red());
+    result.set_g(c.green());
+    result.set_b(c.blue());
+    return result;
+}
+#endif
+
+inline color makeColor(int r, int g, int b)
+{
+    color result;
+    result.set_r(r);
+    result.set_g(g);
+    result.set_b(b);
+    return result;
+}
+
+#endif
diff --git a/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp b/common/debug_pb_message.cpp
similarity index 93%
rename from libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
rename to common/debug_pb_message.cpp
index 718487c18..dda672689 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
+++ b/common/debug_pb_message.cpp
@@ -1,11 +1,12 @@
 #include "debug_pb_message.h"
 
+#include "trice_limits.h"
+
 #include <QList>
 #include <QString>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>
 #include <google/protobuf/text_format.h>
-#include <libcockatrice/utility/trice_limits.h>
 
 // FastFieldValuePrinter is added in protobuf 3.4, going out of our way to add the old FieldValuePrinter is not worth it
 #if GOOGLE_PROTOBUF_VERSION > 3004000
@@ -101,10 +102,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/debug_pb_message.h b/common/debug_pb_message.h
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.h
rename to common/debug_pb_message.h
diff --git a/common/deck_list.cpp b/common/deck_list.cpp
new file mode 100644
index 000000000..b2fbdb028
--- /dev/null
+++ b/common/deck_list.cpp
@@ -0,0 +1,713 @@
+#include "deck_list.h"
+
+#include "abstract_deck_list_node.h"
+#include "deck_list_card_node.h"
+#include "inner_deck_list_node.h"
+
+#include <QCryptographicHash>
+#include <QDebug>
+#include <QFile>
+#include <QRegularExpression>
+#include <QTextStream>
+#include <algorithm>
+
+#if QT_VERSION < 0x050600
+// qHash on QRegularExpression was added in 5.6, FIX IT
+uint qHash(const QRegularExpression &key, uint seed) noexcept
+{
+    return qHash(key.pattern(), seed); // call qHash on pattern QString instead
+}
+#endif
+
+SideboardPlan::SideboardPlan(const QString &_name, const QList<MoveCard_ToZone> &_moveList)
+    : name(_name), moveList(_moveList)
+{
+}
+
+void SideboardPlan::setMoveList(const QList<MoveCard_ToZone> &_moveList)
+{
+    moveList = _moveList;
+}
+
+bool SideboardPlan::readElement(QXmlStreamReader *xml)
+{
+    while (!xml->atEnd()) {
+        xml->readNext();
+        const QString childName = xml->name().toString();
+        if (xml->isStartElement()) {
+            if (childName == "name")
+                name = xml->readElementText();
+            else if (childName == "move_card_to_zone") {
+                MoveCard_ToZone m;
+                while (!xml->atEnd()) {
+                    xml->readNext();
+                    const QString childName2 = xml->name().toString();
+                    if (xml->isStartElement()) {
+                        if (childName2 == "card_name")
+                            m.set_card_name(xml->readElementText().toStdString());
+                        else if (childName2 == "start_zone")
+                            m.set_start_zone(xml->readElementText().toStdString());
+                        else if (childName2 == "target_zone")
+                            m.set_target_zone(xml->readElementText().toStdString());
+                    } else if (xml->isEndElement() && (childName2 == "move_card_to_zone")) {
+                        moveList.append(m);
+                        break;
+                    }
+                }
+            }
+        } else if (xml->isEndElement() && (childName == "sideboard_plan"))
+            return true;
+    }
+    return false;
+}
+
+void SideboardPlan::write(QXmlStreamWriter *xml)
+{
+    xml->writeStartElement("sideboard_plan");
+    xml->writeTextElement("name", name);
+    for (auto &i : moveList) {
+        xml->writeStartElement("move_card_to_zone");
+        xml->writeTextElement("card_name", QString::fromStdString(i.card_name()));
+        xml->writeTextElement("start_zone", QString::fromStdString(i.start_zone()));
+        xml->writeTextElement("target_zone", QString::fromStdString(i.target_zone()));
+        xml->writeEndElement();
+    }
+    xml->writeEndElement();
+}
+
+DeckList::DeckList()
+{
+    root = new InnerDecklistNode;
+}
+
+// TODO: https://qt-project.org/doc/qt-4.8/qobject.html#no-copy-constructor-or-assignment-operator
+DeckList::DeckList(const DeckList &other)
+    : QObject(), name(other.name), comments(other.comments), bannerCard(other.bannerCard),
+      lastLoadedTimestamp(other.lastLoadedTimestamp), tags(other.tags), cachedDeckHash(other.cachedDeckHash)
+{
+    root = new InnerDecklistNode(other.getRoot());
+
+    QMapIterator<QString, SideboardPlan *> spIterator(other.getSideboardPlans());
+    while (spIterator.hasNext()) {
+        spIterator.next();
+        sideboardPlans.insert(spIterator.key(), new SideboardPlan(spIterator.key(), spIterator.value()->getMoveList()));
+    }
+}
+
+DeckList::DeckList(const QString &nativeString)
+{
+    root = new InnerDecklistNode;
+    loadFromString_Native(nativeString);
+}
+
+DeckList::~DeckList()
+{
+    delete root;
+
+    QMapIterator<QString, SideboardPlan *> i(sideboardPlans);
+    while (i.hasNext())
+        delete i.next().value();
+}
+
+QList<MoveCard_ToZone> DeckList::getCurrentSideboardPlan()
+{
+    SideboardPlan *current = sideboardPlans.value(QString(), 0);
+    if (!current)
+        return QList<MoveCard_ToZone>();
+    else
+        return current->getMoveList();
+}
+
+void DeckList::setCurrentSideboardPlan(const QList<MoveCard_ToZone> &plan)
+{
+    SideboardPlan *current = sideboardPlans.value(QString(), 0);
+    if (!current) {
+        current = new SideboardPlan;
+        sideboardPlans.insert(QString(), current);
+    }
+
+    current->setMoveList(plan);
+}
+
+bool DeckList::readElement(QXmlStreamReader *xml)
+{
+    const QString childName = xml->name().toString();
+    if (xml->isStartElement()) {
+        if (childName == "lastLoadedTimestamp") {
+            lastLoadedTimestamp = xml->readElementText();
+        } else if (childName == "deckname") {
+            name = xml->readElementText();
+        } else if (childName == "comments") {
+            comments = xml->readElementText();
+        } else if (childName == "bannerCard") {
+            QString providerId = xml->attributes().value("providerId").toString();
+            QString cardName = xml->readElementText();
+            bannerCard = {cardName, providerId};
+        } else if (childName == "tags") {
+            tags.clear(); // Clear existing tags
+            while (xml->readNextStartElement()) {
+                if (xml->name().toString() == "tag") {
+                    tags.append(xml->readElementText());
+                }
+            }
+        } else if (childName == "zone") {
+            InnerDecklistNode *newZone = getZoneObjFromName(xml->attributes().value("name").toString());
+            newZone->readElement(xml);
+        } else if (childName == "sideboard_plan") {
+            SideboardPlan *newSideboardPlan = new SideboardPlan;
+            if (newSideboardPlan->readElement(xml)) {
+                sideboardPlans.insert(newSideboardPlan->getName(), newSideboardPlan);
+            } else {
+                delete newSideboardPlan;
+            }
+        }
+    } else if (xml->isEndElement() && (childName == "cockatrice_deck")) {
+        return false;
+    }
+    return true;
+}
+
+void DeckList::write(QXmlStreamWriter *xml) const
+{
+    xml->writeStartElement("cockatrice_deck");
+    xml->writeAttribute("version", "1");
+    xml->writeTextElement("lastLoadedTimestamp", lastLoadedTimestamp);
+    xml->writeTextElement("deckname", name);
+    xml->writeStartElement("bannerCard");
+    xml->writeAttribute("providerId", bannerCard.providerId);
+    xml->writeCharacters(bannerCard.name);
+    xml->writeEndElement();
+    xml->writeTextElement("comments", comments);
+
+    // Write tags
+    xml->writeStartElement("tags");
+    for (const QString &tag : tags) {
+        xml->writeTextElement("tag", tag);
+    }
+    xml->writeEndElement();
+
+    // Write zones
+    for (int i = 0; i < root->size(); i++) {
+        root->at(i)->writeElement(xml);
+    }
+
+    // Write sideboard plans
+    QMapIterator<QString, SideboardPlan *> i(sideboardPlans);
+    while (i.hasNext()) {
+        i.next().value()->write(xml);
+    }
+
+    xml->writeEndElement(); // Close "cockatrice_deck"
+}
+
+bool DeckList::loadFromXml(QXmlStreamReader *xml)
+{
+    if (xml->error()) {
+        qDebug() << "Error loading deck from xml: " << xml->errorString();
+        return false;
+    }
+
+    cleanList();
+    while (!xml->atEnd()) {
+        xml->readNext();
+        if (xml->isStartElement()) {
+            if (xml->name().toString() != "cockatrice_deck")
+                return false;
+            while (!xml->atEnd()) {
+                xml->readNext();
+                if (!readElement(xml))
+                    break;
+            }
+        }
+    }
+    refreshDeckHash();
+    if (xml->error()) {
+        qDebug() << "Error loading deck from xml: " << xml->errorString();
+        return false;
+    }
+    return true;
+}
+
+bool DeckList::loadFromString_Native(const QString &nativeString)
+{
+    QXmlStreamReader xml(nativeString);
+    return loadFromXml(&xml);
+}
+
+QString DeckList::writeToString_Native() const
+{
+    QString result;
+    QXmlStreamWriter xml(&result);
+    xml.writeStartDocument();
+    write(&xml);
+    xml.writeEndDocument();
+    return result;
+}
+
+bool DeckList::loadFromFile_Native(QIODevice *device)
+{
+    QXmlStreamReader xml(device);
+    return loadFromXml(&xml);
+}
+
+bool DeckList::saveToFile_Native(QIODevice *device)
+{
+    QXmlStreamWriter xml(device);
+    xml.setAutoFormatting(true);
+    xml.writeStartDocument();
+
+    write(&xml);
+
+    xml.writeEndDocument();
+    return true;
+}
+
+/**
+ * Clears the decklist and loads in a new deck from text
+ *
+ * @param in The text to load
+ * @param preserveMetadata If true, don't clear the existing metadata
+ * @return False if the input was empty, true otherwise.
+ */
+bool DeckList::loadFromStream_Plain(QTextStream &in, bool preserveMetadata)
+{
+    const QRegularExpression reCardLine(R"(^\s*[\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption);
+    const QRegularExpression reEmpty("^\\s*$");
+    const QRegularExpression reComment(R"([\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption);
+    const QRegularExpression reSBMark("^\\s*sb:\\s*(.+)", QRegularExpression::CaseInsensitiveOption);
+    const QRegularExpression reSBComment("^sideboard\\b.*$", QRegularExpression::CaseInsensitiveOption);
+    const QRegularExpression reDeckComment("^((main)?deck(list)?|mainboard)\\b",
+                                           QRegularExpression::CaseInsensitiveOption);
+
+    // Regex for advanced card parsing
+    const QRegularExpression reMultiplier(R"(^[xX\(\[]*(\d+)[xX\*\)\]]* ?(.+))");
+    const QRegularExpression reSplitCard(R"( ?\/\/ ?)");
+    const QRegularExpression reBrace(R"( ?[\[\{][^\]\}]*[\]\}] ?)"); // not nested
+    const QRegularExpression reRoundBrace(R"(^\([^\)]*\) ?)");       // () are only matched at start of string
+    const QRegularExpression reDigitBrace(R"( ?\(\d*\) ?)");         // () are matched if containing digits
+    const QRegularExpression reBraceDigit(
+        R"( ?\([\dA-Z]+\) *\d+$)"); // () are matched if containing setcode then a number
+    const QRegularExpression reDoubleFacedMarker(R"( ?\(Transform\) ?)");
+
+    // Regex for extracting set code and collector number with attached symbols
+    const QRegularExpression reHyphenFormat(R"(\((\w{3,})\)\s+(\w{3,})-(\d+[^\w\s]*))");
+    const QRegularExpression reRegularFormat(R"(\((\w{3,})\)\s+(\d+[^\w\s]*))");
+
+    const QHash<QRegularExpression, QString> differences{{QRegularExpression("’"), QString("'")},
+                                                         {QRegularExpression("Æ"), QString("Ae")},
+                                                         {QRegularExpression("æ"), QString("ae")},
+                                                         {QRegularExpression(" ?[|/]+ ?"), QString(" // ")}};
+
+    cleanList(preserveMetadata);
+
+    auto inputs = in.readAll().trimmed().split('\n');
+    auto max_line = inputs.size();
+
+    // Start at the first empty line before the first card line
+    auto deckStart = inputs.indexOf(reCardLine);
+    if (deckStart == -1) {
+        if (inputs.indexOf(reComment) == -1) {
+            return false; // Input is empty
+        }
+        deckStart = max_line;
+    } else {
+        deckStart = inputs.lastIndexOf(reEmpty, deckStart);
+        if (deckStart == -1) {
+            deckStart = 0;
+        }
+    }
+
+    // find sideboard position, if marks are used this won't be needed
+    int sBStart = -1;
+    if (inputs.indexOf(reSBMark, deckStart) == -1) {
+        sBStart = inputs.indexOf(reSBComment, deckStart);
+        if (sBStart == -1) {
+            sBStart = inputs.indexOf(reEmpty, deckStart + 1);
+            if (sBStart == -1) {
+                sBStart = max_line;
+            }
+            auto nextCard = inputs.indexOf(reCardLine, sBStart + 1);
+            if (inputs.indexOf(reEmpty, nextCard + 1) != -1) {
+                sBStart = max_line;
+            }
+        }
+    }
+
+    int index = 0;
+    QRegularExpressionMatch match;
+
+    // Parse name and comments
+    while (index < deckStart) {
+        const auto &current = inputs.at(index++);
+        if (!current.contains(reEmpty)) {
+            match = reComment.match(current);
+            name = match.captured();
+            break;
+        }
+    }
+    while (index < deckStart) {
+        const auto &current = inputs.at(index++);
+        if (!current.contains(reEmpty)) {
+            match = reComment.match(current);
+            comments += match.captured() + '\n';
+        }
+    }
+    comments.chop(1);
+
+    // Discard empty lines
+    while (index < max_line && inputs.at(index).contains(reEmpty)) {
+        ++index;
+    }
+
+    // Discard line if it starts with deck or mainboard, all cards until the sideboard starts are in the mainboard
+    if (inputs.at(index).contains(reDeckComment)) {
+        ++index;
+    }
+
+    // Parse decklist
+    for (; index < max_line; ++index) {
+        // check if line is a card
+        match = reCardLine.match(inputs.at(index));
+        if (!match.hasMatch())
+            continue;
+
+        QString cardName = match.captured().simplified();
+        bool sideboard = false;
+
+        // Sideboard detection
+        if (sBStart < 0) {
+            match = reSBMark.match(cardName);
+            if (match.hasMatch()) {
+                sideboard = true;
+                cardName = match.captured(1);
+            }
+        } else {
+            if (index == sBStart)
+                continue;
+            sideboard = index > sBStart;
+        }
+
+        // Extract set code, collector number, and foil
+        QString setCode;
+        QString collectorNumber;
+        bool isFoil = false;
+
+        // Check for foil status at the end of the card name
+        if (cardName.endsWith("*F*", Qt::CaseInsensitive)) {
+            isFoil = true;
+            cardName.chop(3); // Remove the "*F*" from the card name
+        }
+        Q_UNUSED(isFoil);
+
+        // Attempt to match the hyphen-separated format (PLST-2094)
+        match = reHyphenFormat.match(cardName);
+        if (match.hasMatch()) {
+            setCode = match.captured(2).toUpper();
+            collectorNumber = match.captured(3);
+            cardName = cardName.left(match.capturedStart()).trimmed();
+        } else {
+            // Attempt to match the regular format (PLST) 2094
+            match = reRegularFormat.match(cardName);
+            if (match.hasMatch()) {
+                setCode = match.captured(1).toUpper();
+                collectorNumber = match.captured(2);
+                cardName = cardName.left(match.capturedStart()).trimmed();
+            }
+        }
+
+        // check if a specific amount is mentioned
+        int amount = 1;
+        match = reMultiplier.match(cardName);
+        if (match.hasMatch()) {
+            amount = match.captured(1).toInt();
+            cardName = match.captured(2);
+        }
+
+        // Handle advanced card types
+        if (cardName.contains(reSplitCard)) {
+            cardName = cardName.split(reSplitCard).join(" // ");
+        }
+
+        if (cardName.contains(reDoubleFacedMarker)) {
+            QStringList faces = cardName.split(reDoubleFacedMarker);
+            cardName = faces.first().trimmed();
+        }
+
+        // Remove unnecessary characters
+        cardName.remove(reBrace);
+        cardName.remove(reRoundBrace); // I'll be entirely honest here, these are split to accommodate just three cards
+        cardName.remove(reDigitBrace); // from un-sets that have a word in between round braces at the end
+        cardName.remove(reBraceDigit); // very specific format with the set code in () and collectors number after
+
+        // Normalize names
+        for (auto diff = differences.constBegin(); diff != differences.constEnd(); ++diff) {
+            cardName.replace(diff.key(), diff.value());
+        }
+
+        // Resolve complete card name, this function does nothing if the name is not found
+        cardName = getCompleteCardName(cardName);
+
+        // Determine the zone (mainboard/sideboard)
+        QString zoneName = getCardZoneFromName(cardName, sideboard ? DECK_ZONE_SIDE : DECK_ZONE_MAIN);
+
+        // make new entry in decklist
+        new DecklistCardNode(cardName, amount, getZoneObjFromName(zoneName), -1, setCode, collectorNumber);
+    }
+
+    refreshDeckHash();
+    return true;
+}
+
+InnerDecklistNode *DeckList::getZoneObjFromName(const QString &zoneName)
+{
+    for (int i = 0; i < root->size(); i++) {
+        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
+        if (node->getName() == zoneName) {
+            return node;
+        }
+    }
+
+    return new InnerDecklistNode(zoneName, root);
+}
+
+bool DeckList::loadFromFile_Plain(QIODevice *device)
+{
+    QTextStream in(device);
+    return loadFromStream_Plain(in, false);
+}
+
+bool DeckList::saveToStream_Plain(QTextStream &stream, bool prefixSideboardCards, bool slashTappedOutSplitCards)
+{
+    auto writeToStream = [&stream, prefixSideboardCards, slashTappedOutSplitCards](const auto node, const auto card) {
+        if (prefixSideboardCards && node->getName() == DECK_ZONE_SIDE) {
+            stream << "SB: ";
+        }
+        if (!slashTappedOutSplitCards) {
+            stream << QString("%1 %2\n").arg(card->getNumber()).arg(card->getName());
+        } else {
+            stream << QString("%1 %2\n").arg(card->getNumber()).arg(card->getName().replace("//", "/"));
+        }
+    };
+
+    forEachCard(writeToStream);
+    return true;
+}
+
+bool DeckList::saveToFile_Plain(QIODevice *device, bool prefixSideboardCards, bool slashTappedOutSplitCards)
+{
+    QTextStream out(device);
+    return saveToStream_Plain(out, prefixSideboardCards, slashTappedOutSplitCards);
+}
+
+QString DeckList::writeToString_Plain(bool prefixSideboardCards, bool slashTappedOutSplitCards)
+{
+    QString result;
+    QTextStream out(&result);
+    saveToStream_Plain(out, prefixSideboardCards, slashTappedOutSplitCards);
+    return result;
+}
+
+/**
+ * Clears all cards and other data from the decklist
+ *
+ * @param preserveMetadata If true, only clear the cards
+ */
+void DeckList::cleanList(bool preserveMetadata)
+{
+    root->clearTree();
+    if (!preserveMetadata) {
+        setName();
+        setComments();
+        setTags();
+    }
+    refreshDeckHash();
+}
+
+void DeckList::getCardListHelper(InnerDecklistNode *item, QSet<QString> &result)
+{
+    for (int i = 0; i < item->size(); ++i) {
+        auto *node = dynamic_cast<DecklistCardNode *>(item->at(i));
+
+        if (node) {
+            result.insert(node->getName());
+        } else {
+            getCardListHelper(dynamic_cast<InnerDecklistNode *>(item->at(i)), result);
+        }
+    }
+}
+
+void DeckList::getCardRefListHelper(InnerDecklistNode *item, QList<CardRef> &result)
+{
+    for (int i = 0; i < item->size(); ++i) {
+        auto *node = dynamic_cast<DecklistCardNode *>(item->at(i));
+
+        if (node) {
+            result.append(node->toCardRef());
+        } else {
+            getCardRefListHelper(dynamic_cast<InnerDecklistNode *>(item->at(i)), result);
+        }
+    }
+}
+
+QStringList DeckList::getCardList() const
+{
+    QSet<QString> result;
+    getCardListHelper(root, result);
+    return result.values();
+}
+
+QList<CardRef> DeckList::getCardRefList() const
+{
+    QList<CardRef> result;
+    getCardRefListHelper(root, result);
+    return result;
+}
+
+int DeckList::getSideboardSize() const
+{
+    int size = 0;
+    for (int i = 0; i < root->size(); ++i) {
+        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
+        if (node->getName() != DECK_ZONE_SIDE) {
+            continue;
+        }
+
+        for (int j = 0; j < node->size(); j++) {
+            auto *card = dynamic_cast<DecklistCardNode *>(node->at(j));
+            size += card->getNumber();
+        }
+    }
+    return size;
+}
+
+DecklistCardNode *DeckList::addCard(const QString &cardName,
+                                    const QString &zoneName,
+                                    const int position,
+                                    const QString &cardSetName,
+                                    const QString &cardSetCollectorNumber,
+                                    const QString &cardProviderId)
+{
+    auto *zoneNode = dynamic_cast<InnerDecklistNode *>(root->findChild(zoneName));
+    if (zoneNode == nullptr) {
+        zoneNode = new InnerDecklistNode(zoneName, root);
+    }
+
+    auto *node =
+        new DecklistCardNode(cardName, 1, zoneNode, position, cardSetName, cardSetCollectorNumber, cardProviderId);
+    refreshDeckHash();
+
+    return node;
+}
+
+bool DeckList::deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode)
+{
+    if (node == root) {
+        return true;
+    }
+
+    bool updateHash = false;
+    if (rootNode == nullptr) {
+        rootNode = root;
+        updateHash = true;
+    }
+
+    int index = rootNode->indexOf(node);
+    if (index != -1) {
+        delete rootNode->takeAt(index);
+
+        if (rootNode->empty()) {
+            deleteNode(rootNode, rootNode->getParent());
+        }
+
+        if (updateHash) {
+            refreshDeckHash();
+        }
+
+        return true;
+    }
+
+    for (int i = 0; i < rootNode->size(); i++) {
+        auto *inner = dynamic_cast<InnerDecklistNode *>(rootNode->at(i));
+        if (inner) {
+            if (deleteNode(node, inner)) {
+                if (updateHash) {
+                    refreshDeckHash();
+                }
+
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+static QString computeDeckHash(const InnerDecklistNode *root)
+{
+    QStringList cardList;
+    QSet<QString> hashZones, optionalZones;
+
+    hashZones << DECK_ZONE_MAIN << DECK_ZONE_SIDE; // Zones in deck to be included in hashing process
+    optionalZones << DECK_ZONE_TOKENS;             // Optional zones in deck not included in hashing process
+
+    for (int i = 0; i < root->size(); i++) {
+        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
+        for (int j = 0; j < node->size(); j++) {
+            if (hashZones.contains(node->getName())) // Mainboard or Sideboard
+            {
+                auto *card = dynamic_cast<DecklistCardNode *>(node->at(j));
+                for (int k = 0; k < card->getNumber(); ++k) {
+                    cardList.append((node->getName() == DECK_ZONE_SIDE ? "SB:" : "") + card->getName().toLower());
+                }
+            }
+        }
+    }
+    cardList.sort();
+    QByteArray deckHashArray = QCryptographicHash::hash(cardList.join(";").toUtf8(), QCryptographicHash::Sha1);
+    quint64 number = (((quint64)(unsigned char)deckHashArray[0]) << 32) +
+                     (((quint64)(unsigned char)deckHashArray[1]) << 24) +
+                     (((quint64)(unsigned char)deckHashArray[2] << 16)) +
+                     (((quint64)(unsigned char)deckHashArray[3]) << 8) + (quint64)(unsigned char)deckHashArray[4];
+    return QString::number(number, 32).rightJustified(8, '0');
+}
+
+/**
+ * Gets the deck hash.
+ * The hash is computed on the first call to this method, and is cached until the decklist is modified.
+ *
+ * @return The deck hash
+ */
+QString DeckList::getDeckHash() const
+{
+    if (!cachedDeckHash.isEmpty()) {
+        return cachedDeckHash;
+    }
+
+    cachedDeckHash = computeDeckHash(root);
+    return cachedDeckHash;
+}
+
+/**
+ * Invalidates the cached deckHash and emits the deckHashChanged signal.
+ */
+void DeckList::refreshDeckHash()
+{
+    cachedDeckHash = QString();
+    emit deckHashChanged();
+}
+
+/**
+ * Calls a given function on each card in the deck.
+ */
+void DeckList::forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func)
+{
+    // Support for this is only possible if the internal structure
+    // doesn't get more complicated.
+    for (int i = 0; i < root->size(); i++) {
+        InnerDecklistNode *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
+        for (int j = 0; j < node->size(); j++) {
+            DecklistCardNode *card = dynamic_cast<DecklistCardNode *>(node->at(j));
+            func(node, card);
+        }
+    }
+}
\ No newline at end of file
diff --git a/common/deck_list.h b/common/deck_list.h
new file mode 100644
index 000000000..0596b38fd
--- /dev/null
+++ b/common/deck_list.h
@@ -0,0 +1,318 @@
+/**
+ * @file decklist.h
+ * @brief Defines the DeckList class and supporting types for managing a full
+ *        deck structure including cards, zones, sideboard plans, and
+ *        serialization to/from multiple formats. This is a logic class which
+ *        does not care about Qt or user facing views.
+ *        See @c DeckListModel for the actual Qt Model to be used for views
+ */
+
+#ifndef DECKLIST_H
+#define DECKLIST_H
+
+#include "card_ref.h"
+#include "inner_deck_list_node.h"
+
+#include <QMap>
+#include <QVector>
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QXmlStreamWriter>
+#include <common/pb/move_card_to_zone.pb.h>
+
+class AbstractDecklistNode;
+class DecklistCardNode;
+class CardDatabase;
+class QIODevice;
+class QTextStream;
+class InnerDecklistNode;
+
+/**
+ * @class SideboardPlan
+ * @brief Represents a predefined sideboarding strategy for a deck.
+ *
+ * Sideboard plans store a named list of card movements that should be applied
+ * between the mainboard and sideboard for a specific matchup. Each movement
+ * is expressed using a `MoveCard_ToZone` protobuf message.
+ *
+ * ### Responsibilities:
+ * - Store the plan name and list of moves.
+ * - Support XML serialization/deserialization.
+ *
+ * ### Typical usage:
+ * A deck can contain multiple sideboard plans (e.g., "vs Aggro", "vs Control"),
+ * each describing how to transform the main deck into its intended configuration.
+ */
+class SideboardPlan
+{
+private:
+    QString name;                    ///< Human-readable name of this plan.
+    QList<MoveCard_ToZone> moveList; ///< List of move instructions for this plan.
+
+public:
+    /**
+     * @brief Construct a new SideboardPlan.
+     * @param _name The plan name.
+     * @param _moveList Initial list of card move instructions.
+     */
+    explicit SideboardPlan(const QString &_name = QString(),
+                           const QList<MoveCard_ToZone> &_moveList = QList<MoveCard_ToZone>());
+
+    /**
+     * @brief Read a SideboardPlan from an XML stream.
+     * @param xml XML reader positioned at the plan element.
+     * @return true if parsing succeeded.
+     */
+    bool readElement(QXmlStreamReader *xml);
+
+    /**
+     * @brief Write this SideboardPlan to XML.
+     * @param xml Stream to append the serialized element to.
+     */
+    void write(QXmlStreamWriter *xml);
+
+    /// @return The plan name.
+    QString getName() const
+    {
+        return name;
+    }
+
+    /// @return Const reference to the move list.
+    const QList<MoveCard_ToZone> &getMoveList() const
+    {
+        return moveList;
+    }
+
+    /// @brief Replace the move list with a new one.
+    void setMoveList(const QList<MoveCard_ToZone> &_moveList);
+};
+
+/**
+ * @class DeckList
+ * @brief Represents a complete deck, including metadata, zones, cards,
+ *        and sideboard plans.
+ *
+ * A DeckList is a QObject wrapper around an `InnerDecklistNode` tree,
+ * enriched with metadata like deck name, comments, tags, banner card,
+ * and multiple sideboard plans.
+ *
+ * ### Core responsibilities:
+ * - Store and manage the root node tree (zones → groups → cards).
+ * - Provide deck-level metadata (name, comments, tags, banner).
+ * - Support multiple sideboard plans (meta-game strategies).
+ * - Provide import/export in multiple formats:
+ *   - Cockatrice native XML format.
+ *   - Plain-text list format.
+ * - Provide hashing for deck identity (deck hash).
+ *
+ * ### Ownership:
+ * - Owns the root `InnerDecklistNode` tree.
+ * - Owns `SideboardPlan` instances stored in `sideboardPlans`.
+ *
+ * ### Signals:
+ * - @c deckHashChanged() — emitted when the deck contents change.
+ * - @c deckTagsChanged() — emitted when tags are added/removed.
+ *
+ * ### Example workflow:
+ * ```
+ * DeckList deck;
+ * deck.setName("Mono Red Aggro");
+ * deck.addCard("Lightning Bolt", "main", -1);
+ * deck.addTag("Aggro");
+ * deck.saveToFile_Native(device);
+ * ```
+ */
+class DeckList : public QObject
+{
+    Q_OBJECT
+private:
+    QString name;                                  ///< User-defined deck name.
+    QString comments;                              ///< Free-form comments or notes.
+    CardRef bannerCard;                            ///< Optional representative card for the deck.
+    QString lastLoadedTimestamp;                   ///< Timestamp string of last load.
+    QStringList tags;                              ///< User-defined tags for deck classification.
+    QMap<QString, SideboardPlan *> sideboardPlans; ///< Named sideboard plans.
+    InnerDecklistNode *root;                       ///< Root of the deck tree (zones + cards).
+
+    /**
+     * @brief Cached deck hash, recalculated lazily.
+     * An empty string indicates the cache is invalid.
+     */
+    mutable QString cachedDeckHash;
+
+    // Helpers for traversing the tree
+    static void getCardListHelper(InnerDecklistNode *node, QSet<QString> &result);
+    static void getCardRefListHelper(InnerDecklistNode *item, QList<CardRef> &result);
+    InnerDecklistNode *getZoneObjFromName(const QString &zoneName);
+
+protected:
+    /**
+     * @brief Map a card name to its zone.
+     * Override in subclasses for format-specific logic.
+     * @param cardName Card being placed.
+     * @param currentZoneName Zone candidate.
+     * @return Zone name to use.
+     */
+    virtual QString getCardZoneFromName(const QString /*cardName*/, QString currentZoneName)
+    {
+        return currentZoneName;
+    };
+
+    /**
+     * @brief Produce the complete display name of a card.
+     * Override in subclasses to add set suffixes or annotations.
+     * @param cardName Base name.
+     * @return Full display name.
+     */
+    virtual QString getCompleteCardName(const QString &cardName) const
+    {
+        return cardName;
+    };
+
+signals:
+    /// Emitted when the deck hash changes.
+    void deckHashChanged();
+    /// Emitted when the deck tags are modified.
+    void deckTagsChanged();
+
+public slots:
+    /// @name Metadata setters
+    ///@{
+    void setName(const QString &_name = QString())
+    {
+        name = _name;
+    }
+    void setComments(const QString &_comments = QString())
+    {
+        comments = _comments;
+    }
+    void setTags(const QStringList &_tags = QStringList())
+    {
+        tags = _tags;
+        emit deckTagsChanged();
+    }
+    void addTag(const QString &_tag)
+    {
+        tags.append(_tag);
+        emit deckTagsChanged();
+    }
+    void clearTags()
+    {
+        tags.clear();
+        emit deckTagsChanged();
+    }
+    void setBannerCard(const CardRef &_bannerCard = {})
+    {
+        bannerCard = _bannerCard;
+    }
+    void setLastLoadedTimestamp(const QString &_lastLoadedTimestamp = QString())
+    {
+        lastLoadedTimestamp = _lastLoadedTimestamp;
+    }
+    ///@}
+
+public:
+    /// @brief Construct an empty deck.
+    explicit DeckList();
+    /// @brief Deep-copy constructor.
+    DeckList(const DeckList &other);
+    /// @brief Construct from a serialized native-format string.
+    explicit DeckList(const QString &nativeString);
+    ~DeckList() override;
+
+    /// @name Metadata getters
+    ///@{
+    QString getName() const
+    {
+        return name;
+    }
+    QString getComments() const
+    {
+        return comments;
+    }
+    QStringList getTags() const
+    {
+        return tags;
+    }
+    CardRef getBannerCard() const
+    {
+        return bannerCard;
+    }
+    QString getLastLoadedTimestamp() const
+    {
+        return lastLoadedTimestamp;
+    }
+    ///@}
+
+    bool isBlankDeck() const
+    {
+        return name.isEmpty() && comments.isEmpty() && getCardList().isEmpty();
+    }
+
+    /// @name Sideboard plans
+    ///@{
+    QList<MoveCard_ToZone> getCurrentSideboardPlan();
+    void setCurrentSideboardPlan(const QList<MoveCard_ToZone> &plan);
+    const QMap<QString, SideboardPlan *> &getSideboardPlans() const
+    {
+        return sideboardPlans;
+    }
+    ///@}
+
+    /// @name Serialization (XML)
+    ///@{
+    bool readElement(QXmlStreamReader *xml);
+    void write(QXmlStreamWriter *xml) const;
+    bool loadFromXml(QXmlStreamReader *xml);
+    bool loadFromString_Native(const QString &nativeString);
+    QString writeToString_Native() const;
+    bool loadFromFile_Native(QIODevice *device);
+    bool saveToFile_Native(QIODevice *device);
+    ///@}
+
+    /// @name Serialization (Plain text)
+    ///@{
+    bool loadFromStream_Plain(QTextStream &stream, bool preserveMetadata);
+    bool loadFromFile_Plain(QIODevice *device);
+    bool saveToStream_Plain(QTextStream &stream, bool prefixSideboardCards, bool slashTappedOutSplitCards);
+    bool saveToFile_Plain(QIODevice *device, bool prefixSideboardCards = true, bool slashTappedOutSplitCards = false);
+    QString writeToString_Plain(bool prefixSideboardCards = true, bool slashTappedOutSplitCards = false);
+    ///@}
+
+    /// @name Deck manipulation
+    ///@{
+    void cleanList(bool preserveMetadata = false);
+    bool isEmpty() const
+    {
+        return root->isEmpty() && name.isEmpty() && comments.isEmpty() && sideboardPlans.isEmpty();
+    }
+    QStringList getCardList() const;
+    QList<CardRef> getCardRefList() const;
+    int getSideboardSize() const;
+    InnerDecklistNode *getRoot() const
+    {
+        return root;
+    }
+    DecklistCardNode *addCard(const QString &cardName,
+                              const QString &zoneName,
+                              int position,
+                              const QString &cardSetName = QString(),
+                              const QString &cardSetCollectorNumber = QString(),
+                              const QString &cardProviderId = QString());
+    bool deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode = nullptr);
+    ///@}
+
+    /// @name Deck identity
+    ///@{
+    QString getDeckHash() const;
+    void refreshDeckHash();
+    ///@}
+
+    /**
+     * @brief Apply a function to every card in the deck tree.
+     *
+     * @param func Function taking (zone node, card node).
+     */
+    void forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func);
+};
+
+#endif
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.cpp b/common/deck_list_card_node.cpp
similarity index 100%
rename from libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.cpp
rename to common/deck_list_card_node.cpp
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h b/common/deck_list_card_node.h
similarity index 84%
rename from libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h
rename to common/deck_list_card_node.h
index b3d42b89a..3ccb8e062 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h
+++ b/common/deck_list_card_node.h
@@ -13,12 +13,10 @@
 #define COCKATRICE_DECK_LIST_CARD_NODE_H
 
 #include "abstract_deck_list_card_node.h"
-
-#include <libcockatrice/utility/card_ref.h>
+#include "card_ref.h"
 
 /**
  * @class DecklistCardNode
- * @ingroup DeckModels
  * @brief Concrete node type representing an actual card entry in the deck.
  *
  * This class extends AbstractDecklistCardNode to hold all information
@@ -51,7 +49,6 @@ class DecklistCardNode : public AbstractDecklistCardNode
     QString cardSetShortName; ///< Short set code (e.g., "NEO").
     QString cardSetNumber;    ///< Collector number within the set.
     QString cardProviderId;   ///< External provider identifier (e.g., UUID).
-    bool formatLegal;         ///< Format legality
 
 public:
     /**
@@ -64,7 +61,6 @@ public:
      * @param _cardSetShortName Short set code (e.g., "NEO").
      * @param _cardSetNumber Collector number within the set.
      * @param _cardProviderId External provider ID (e.g., UUID).
-     * @param _formatLegality If the card is legal in the format
      *
      * On construction, if a parent is provided, this node is inserted into
      * the parent’s children list automatically.
@@ -75,11 +71,10 @@ public:
                               int position = -1,
                               QString _cardSetShortName = QString(),
                               QString _cardSetNumber = QString(),
-                              QString _cardProviderId = QString(),
-                              bool _formatLegality = true)
+                              QString _cardProviderId = QString())
         : AbstractDecklistCardNode(_parent, position), name(std::move(_name)), number(_number),
           cardSetShortName(std::move(_cardSetShortName)), cardSetNumber(std::move(_cardSetNumber)),
-          cardProviderId(std::move(_cardProviderId)), formatLegal(_formatLegality)
+          cardProviderId(std::move(_cardProviderId))
     {
     }
 
@@ -94,7 +89,7 @@ public:
     explicit DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_parent);
 
     /// @return The quantity of this card.
-    [[nodiscard]] int getNumber() const override
+    int getNumber() const override
     {
         return number;
     }
@@ -106,7 +101,7 @@ public:
     }
 
     /// @return The display name of this card.
-    [[nodiscard]] QString getName() const override
+    QString getName() const override
     {
         return name;
     }
@@ -118,7 +113,7 @@ public:
     }
 
     /// @return The provider identifier for this card.
-    [[nodiscard]] QString getCardProviderId() const override
+    QString getCardProviderId() const override
     {
         return cardProviderId;
     }
@@ -130,7 +125,7 @@ public:
     }
 
     /// @return The short set code (e.g., "NEO").
-    [[nodiscard]] QString getCardSetShortName() const override
+    QString getCardSetShortName() const override
     {
         return cardSetShortName;
     }
@@ -142,7 +137,7 @@ public:
     }
 
     /// @return The collector number of this card within its set.
-    [[nodiscard]] QString getCardCollectorNumber() const override
+    QString getCardCollectorNumber() const override
     {
         return cardSetNumber;
     }
@@ -153,18 +148,6 @@ public:
         cardSetNumber = _cardSetNumber;
     }
 
-    /// @return The format legality of the card
-    [[nodiscard]] bool getFormatLegality() const override
-    {
-        return formatLegal;
-    }
-
-    /// @param _formatLegal If the card is considered legal
-    void setFormatLegality(const bool _formatLegal) override
-    {
-        formatLegal = _formatLegal;
-    }
-
     /// @return Always false; card nodes are not deck headers.
     [[nodiscard]] bool isDeckHeader() const override
     {
@@ -177,7 +160,7 @@ public:
      * @return A CardRef with the card’s name and provider ID, suitable
      *         for database lookups or comparison with other card sources.
      */
-    [[nodiscard]] CardRef toCardRef() const
+    CardRef toCardRef() const
     {
         return {name, cardProviderId};
     }
diff --git a/libcockatrice_utility/libcockatrice/utility/expression.cpp b/common/expression.cpp
similarity index 98%
rename from libcockatrice_utility/libcockatrice/utility/expression.cpp
rename to common/expression.cpp
index 42073670c..9cb40ea3c 100644
--- a/libcockatrice_utility/libcockatrice/utility/expression.cpp
+++ b/common/expression.cpp
@@ -1,6 +1,6 @@
 #include "expression.h"
 
-#include "peglib.h"
+#include "./lib/peglib.h"
 
 #include <QByteArray>
 #include <QString>
@@ -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]*
diff --git a/libcockatrice_utility/libcockatrice/utility/expression.h b/common/expression.h
similarity index 100%
rename from libcockatrice_utility/libcockatrice/utility/expression.h
rename to common/expression.h
diff --git a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp b/common/featureset.cpp
similarity index 99%
rename from libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
rename to common/featureset.cpp
index 1b08c4040..d9f253ab9 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
+++ b/common/featureset.cpp
@@ -1,5 +1,6 @@
 #include "featureset.h"
 
+#include <QDebug>
 #include <QMap>
 
 FeatureSet::FeatureSet()
diff --git a/libcockatrice_protocol/libcockatrice/protocol/featureset.h b/common/featureset.h
similarity index 94%
rename from libcockatrice_protocol/libcockatrice/protocol/featureset.h
rename to common/featureset.h
index 32625d5f8..da495c4b7 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/featureset.h
+++ b/common/featureset.h
@@ -2,10 +2,10 @@
 #define FEATURESET_H
 
 #include <QMap>
-#include <QObject>
+#include <QSet>
 #include <QString>
 
-class FeatureSet : public QObject
+class FeatureSet
 {
 public:
     FeatureSet();
diff --git a/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp b/common/get_pb_extension.cpp
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
rename to common/get_pb_extension.cpp
diff --git a/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h b/common/get_pb_extension.h
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h
rename to common/get_pb_extension.h
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp b/common/inner_deck_list_node.cpp
similarity index 96%
rename from libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
rename to common/inner_deck_list_node.cpp
index eca58963a..c91b3ea14 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
+++ b/common/inner_deck_list_node.cpp
@@ -145,10 +145,10 @@ bool InnerDecklistNode::readElement(QXmlStreamReader *xml)
         const QString childName = xml->name().toString();
         if (xml->isStartElement()) {
             if (childName == "zone") {
-                auto *newZone = new InnerDecklistNode(xml->attributes().value("name").toString(), this);
+                InnerDecklistNode *newZone = new InnerDecklistNode(xml->attributes().value("name").toString(), this);
                 newZone->readElement(xml);
             } else if (childName == "card") {
-                auto *newCard = new DecklistCardNode(
+                DecklistCardNode *newCard = new DecklistCardNode(
                     xml->attributes().value("name").toString(), xml->attributes().value("number").toString().toInt(),
                     this, -1, xml->attributes().value("setShortName").toString(),
                     xml->attributes().value("collectorNumber").toString(), xml->attributes().value("uuid").toString());
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h b/common/inner_deck_list_node.h
similarity index 98%
rename from libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h
rename to common/inner_deck_list_node.h
index f4c48afce..07bb4203f 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h
+++ b/common/inner_deck_list_node.h
@@ -176,7 +176,7 @@ public:
      * @brief Compute the height of this node.
      * @return Maximum depth of descendants + 1.
      */
-    [[nodiscard]] int height() const override;
+    int height() const override;
 
     /**
      * @brief Count cards recursively under this node.
@@ -184,7 +184,7 @@ public:
      *        If false, counts unique card nodes.
      * @return Total count.
      */
-    [[nodiscard]] int recursiveCount(bool countTotalCards = false) const;
+    int recursiveCount(bool countTotalCards = false) const;
 
     /**
      * @brief Compare this node against another for sorting.
diff --git a/common/lib/peglib.h b/common/lib/peglib.h
new file mode 100644
index 000000000..459fa5a27
--- /dev/null
+++ b/common/lib/peglib.h
@@ -0,0 +1,4937 @@
+//
+//  peglib.h
+//
+//  Copyright (c) 2022 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#pragma once
+
+/*
+ * Configuration
+ */
+
+#ifndef CPPPEGLIB_HEURISTIC_ERROR_TOKEN_MAX_CHAR_COUNT
+#define CPPPEGLIB_HEURISTIC_ERROR_TOKEN_MAX_CHAR_COUNT 32
+#endif
+
+#include <algorithm>
+#include <any>
+#include <cassert>
+#include <cctype>
+#if __has_include(<charconv>)
+#include <charconv>
+#endif
+#include <cstring>
+#include <functional>
+#include <initializer_list>
+#include <iostream>
+#include <limits>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <set>
+#include <sstream>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+#if !defined(__cplusplus) || __cplusplus < 201703L
+#error "Requires complete C++17 support"
+#endif
+
+namespace peg {
+
+/*-----------------------------------------------------------------------------
+ *  scope_exit
+ *---------------------------------------------------------------------------*/
+
+// This is based on
+// "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} {}
+
+    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(); }
+    }
+
+    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;
+
+    EF exit_function;
+    bool execute_on_destruction;
+};
+
+/*-----------------------------------------------------------------------------
+ *  UTF8 functions
+ *---------------------------------------------------------------------------*/
+
+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;
+        }
+    }
+    return 0;
+}
+
+inline size_t codepoint_count(const char *s8, size_t l) {
+    size_t count = 0;
+    for (size_t i = 0; i < l; i += codepoint_length(s8 + i, l - i)) {
+        count++;
+    }
+    return count;
+}
+
+inline size_t encode_codepoint(char32_t cp, char *buff) {
+    if (cp < 0x0080) {
+        buff[0] = static_cast<char>(cp & 0x7F);
+        return 1;
+    } else if (cp < 0x0800) {
+        buff[0] = static_cast<char>(0xC0 | ((cp >> 6) & 0x1F));
+        buff[1] = static_cast<char>(0x80 | (cp & 0x3F));
+        return 2;
+    } else if (cp < 0xD800) {
+        buff[0] = static_cast<char>(0xE0 | ((cp >> 12) & 0xF));
+        buff[1] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+        buff[2] = static_cast<char>(0x80 | (cp & 0x3F));
+        return 3;
+    } else if (cp < 0xE000) {
+        // D800 - DFFF is invalid...
+        return 0;
+    } else if (cp < 0x10000) {
+        buff[0] = static_cast<char>(0xE0 | ((cp >> 12) & 0xF));
+        buff[1] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+        buff[2] = static_cast<char>(0x80 | (cp & 0x3F));
+        return 3;
+    } else if (cp < 0x110000) {
+        buff[0] = static_cast<char>(0xF0 | ((cp >> 18) & 0x7));
+        buff[1] = static_cast<char>(0x80 | ((cp >> 12) & 0x3F));
+        buff[2] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+        buff[3] = static_cast<char>(0x80 | (cp & 0x3F));
+        return 4;
+    }
+    return 0;
+}
+
+inline std::string encode_codepoint(char32_t cp) {
+    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;
+            }
+        }
+    }
+    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;
+}
+
+inline char32_t decode_codepoint(const char *s8, size_t l) {
+    char32_t cp = 0;
+    decode_codepoint(s8, l, cp);
+    return cp;
+}
+
+inline std::u32string decode(const char *s8, size_t l) {
+    std::u32string out;
+    size_t i = 0;
+    while (i < l) {
+        auto beg = i++;
+        while (i < l && (s8[i] & 0xc0) == 0x80) {
+            i++;
+        }
+        out += decode_codepoint(&s8[beg], (i - beg));
+    }
+    return out;
+}
+
+template <typename T> const char *u8(const T *s) {
+    return reinterpret_cast<const char *>(s);
+}
+
+/*-----------------------------------------------------------------------------
+ *  escape_characters
+ *---------------------------------------------------------------------------*/
+
+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;
+        }
+    }
+    return str;
+}
+
+inline std::string escape_characters(std::string_view sv) {
+    return escape_characters(sv.data(), sv.size());
+}
+
+/*-----------------------------------------------------------------------------
+ *  resolve_escape_sequence
+ *---------------------------------------------------------------------------*/
+
+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;
+}
+
+inline bool is_digit(char c, int &v) {
+    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);
+}
+
+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);
+}
+
+inline std::string resolve_escape_sequence(const char *s, size_t n) {
+    std::string r;
+    r.reserve(n);
+
+    size_t i = 0;
+    while (i < n) {
+        auto ch = s[i];
+        if (ch == '\\') {
+            i++;
+            if (i == n) { throw std::runtime_error("Invalid escape sequence..."); }
+            switch (s[i]) {
+                case 'f':
+                    r += '\f';
+                    i++;
+                    break;
+                case 'n':
+                    r += '\n';
+                    i++;
+                    break;
+                case 'r':
+                    r += '\r';
+                    i++;
+                    break;
+                case 't':
+                    r += '\t';
+                    i++;
+                    break;
+                case 'v':
+                    r += '\v';
+                    i++;
+                    break;
+                case '\'':
+                    r += '\'';
+                    i++;
+                    break;
+                case '"':
+                    r += '"';
+                    i++;
+                    break;
+                case '[':
+                    r += '[';
+                    i++;
+                    break;
+                case ']':
+                    r += ']';
+                    i++;
+                    break;
+                case '\\':
+                    r += '\\';
+                    i++;
+                    break;
+                case 'x':
+                case 'u': {
+                    char32_t cp;
+                    std::tie(cp, i) = parse_hex_number(s, n, i + 1);
+                    r += encode_codepoint(cp);
+                    break;
+                }
+                default: {
+                    char32_t cp;
+                    std::tie(cp, i) = parse_octal_number(s, n, i);
+                    r += encode_codepoint(cp);
+                    break;
+                }
+            }
+        } else {
+            r += ch;
+            i++;
+        }
+    }
+    return r;
+}
+
+/*-----------------------------------------------------------------------------
+ *  token_to_number_ - This function should be removed eventually
+ *---------------------------------------------------------------------------*/
+
+template <typename T> T token_to_number_(std::string_view sv) {
+    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);
+#else
+    if constexpr (false) {
+#endif
+    } else {
+        auto s = std::string(sv);
+        std::istringstream ss(s);
+        ss >> n;
+    }
+    return n;
+}
+
+/*-----------------------------------------------------------------------------
+ *  Trie
+ *---------------------------------------------------------------------------*/
+
+class Trie {
+public:
+    Trie(const std::vector<std::string> &items, bool ignore_case)
+        : ignore_case_(ignore_case) {
+        size_t id = 0;
+        for (const auto &item : items) {
+            const auto &s = ignore_case ? to_lower(item) : item;
+            for (size_t len = 1; len <= item.size(); len++) {
+                auto last = len == item.size();
+                std::string_view sv(s.data(), len);
+                auto it = dic_.find(sv);
+                if (it == dic_.end()) {
+                    dic_.emplace(sv, Info{last, last, id});
+                } else if (last) {
+                    it->second.match = true;
+                } else {
+                    it->second.done = false;
+                }
+            }
+            id++;
+        }
+    }
+
+    size_t match(const char *text, size_t text_len, size_t &id) const {
+        std::string lower_text;
+        if (ignore_case_) {
+            lower_text = to_lower(text);
+            text = lower_text.data();
+        }
+
+        size_t match_len = 0;
+        auto done = false;
+        size_t len = 1;
+        while (!done && len <= 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;
+    }
+
+    size_t size() const { return dic_.size(); }
+
+private:
+    std::string to_lower(std::string s) const {
+        for (char &c : s) {
+            c = std::tolower(c);
+        }
+        return s;
+    }
+
+    struct Info {
+        bool done;
+        bool match;
+        size_t id;
+    };
+
+    // TODO: Use unordered_map when heterogeneous lookup is supported in C++20
+    // std::unordered_map<std::string, Info> dic_;
+    std::map<std::string, Info, std::less<>> dic_;
+
+    bool ignore_case_;
+};
+
+/*-----------------------------------------------------------------------------
+ *  PEG
+ *---------------------------------------------------------------------------*/
+
+/*
+ * 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;
+
+    while (p < cur) {
+        if (*p == '\n') {
+            no++;
+            col_ptr = p + 1;
+        }
+        p++;
+    }
+
+    auto col = codepoint_count(col_ptr, p - col_ptr) + 1;
+
+    return std::pair(no, col);
+}
+
+/*
+ * String tag
+ */
+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));
+}
+
+inline constexpr unsigned int str2tag(std::string_view sv) {
+    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);
+}
+
+} // namespace udl
+
+/*
+ * Semantic values
+ */
+class Context;
+
+struct SemanticValues : protected std::vector<std::any> {
+    SemanticValues() = default;
+    SemanticValues(Context *c) : c_(c) {}
+
+    // Input text
+    const char *path = nullptr;
+    const char *ss = nullptr;
+
+    // Matched string
+    std::string_view sv() const { return sv_; }
+
+    // Definition name
+    const std::string &name() const { return name_; }
+
+    std::vector<unsigned int> tags;
+
+    // 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 number (0 based index)
+    size_t choice() const { return choice_; }
+
+    // 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]));
+        }
+        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;
+
+    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)...));
+    }
+}
+
+template <typename T>
+struct argument_count : argument_count<decltype(&T::operator())> {};
+template <typename R, typename... Args>
+struct argument_count<R (*)(Args...)>
+    : std::integral_constant<unsigned, sizeof...(Args)> {};
+template <typename R, typename C, typename... Args>
+struct argument_count<R (C::*)(Args...)>
+    : std::integral_constant<unsigned, sizeof...(Args)> {};
+template <typename R, typename C, typename... Args>
+struct argument_count<R (C::*)(Args...) const>
+    : std::integral_constant<unsigned, sizeof...(Args)> {};
+
+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;
+
+    operator bool() const { return bool(fn_); }
+
+    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)>;
+
+    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_;
+};
+
+/*
+ * Parse result helper
+ */
+inline bool success(size_t len) { return len != static_cast<size_t>(-1); }
+
+inline bool fail(size_t len) { return len == static_cast<size_t>(-1); }
+
+/*
+ * Log
+ */
+using Log = std::function<void(size_t line, size_t col, const std::string &msg,
+                               const std::string &rule)>;
+
+/*
+ * ErrorInfo
+ */
+class Definition;
+
+struct ErrorInfo {
+    const char *error_pos = nullptr;
+    std::vector<std::pair<const char *, const Definition *>> expected_tokens;
+    const char *message_pos = nullptr;
+    std::string message;
+    std::string label;
+    const char *last_output_pos = nullptr;
+    bool keep_previous_token = false;
+
+    void clear() {
+        error_pos = nullptr;
+        expected_tokens.clear();
+        message_pos = nullptr;
+        message.clear();
+    }
+
+    void add(const char *error_literal, const Definition *error_rule) {
+        for (const auto &[t, r] : expected_tokens) {
+            if (t == error_literal && r == error_rule) { return; }
+        }
+        expected_tokens.emplace_back(error_literal, error_rule);
+    }
+
+    void output_log(const Log &log, const char *s, size_t n);
+
+private:
+    int cast_char(char c) const { return static_cast<unsigned char>(c); }
+
+    std::string heuristic_error_token(const char *s, size_t n,
+                                      const char *pos) const {
+        auto len = n - std::distance(s, pos);
+        if (len) {
+            size_t i = 0;
+            auto c = cast_char(pos[i++]);
+            if (!std::ispunct(c) && !std::isspace(c)) {
+                while (i < len && !std::ispunct(cast_char(pos[i])) &&
+                       !std::isspace(cast_char(pos[i]))) {
+                    i++;
+                }
+            }
+
+            size_t count = CPPPEGLIB_HEURISTIC_ERROR_TOKEN_MAX_CHAR_COUNT;
+            size_t j = 0;
+            while (count > 0 && j < i) {
+                j += codepoint_length(&pos[j], i - j);
+                count--;
+            }
+
+            return escape_characters(pos, j);
+        }
+        return std::string();
+    }
+
+    std::string replace_all(std::string str, const std::string &from,
+                            const std::string &to) const {
+        size_t pos = 0;
+        while ((pos = str.find(from, pos)) != std::string::npos) {
+            str.replace(pos, from.length(), to);
+            pos += to.length();
+        }
+        return str;
+    }
+};
+
+/*
+ * Context
+ */
+class Ope;
+
+using TracerEnter = std::function<void(
+    const Ope &name, const char *s, size_t n, const SemanticValues &vs,
+    const Context &c, const std::any &dt, std::any &trace_data)>;
+
+using TracerLeave = std::function<void(
+    const Ope &ope, const char *s, size_t n, const SemanticValues &vs,
+    const Context &c, const std::any &dt, size_t, std::any &trace_data)>;
+
+using TracerStartOrEnd = std::function<void(std::any &trace_data)>;
+
+class Context {
+public:
+    const char *path;
+    const char *s;
+    const size_t l;
+
+    ErrorInfo error_info;
+    bool recovered = false;
+
+    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;
+
+    size_t in_token_boundary_count = 0;
+
+    std::shared_ptr<Ope> whitespaceOpe;
+    bool in_whitespace = false;
+
+    std::shared_ptr<Ope> wordOpe;
+
+    std::vector<std::map<std::string_view, std::string>> capture_scope_stack;
+    size_t capture_scope_stack_size = 0;
+
+    std::vector<bool> cut_stack;
+
+    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;
+
+    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({});
+        push_capture_scope();
+    }
+
+    ~Context() {
+        pop_capture_scope();
+
+        assert(!value_stack_size);
+        assert(!capture_scope_stack_size);
+        assert(cut_stack.empty());
+    }
+
+    Context(const Context &) = delete;
+    Context(Context &&) = delete;
+    Context operator=(const Context &) = delete;
+
+    template <typename T>
+    void packrat(const char *a_s, size_t def_id, size_t &len, std::any &val,
+                 T fn) {
+        if (!enablePackratParsing) {
+            fn(val);
+            return;
+        }
+
+        auto col = a_s - s;
+        auto idx = def_count * static_cast<size_t>(col) + def_id;
+
+        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;
+        }
+    }
+
+    SemanticValues &push() {
+        push_capture_scope();
+        return push_semantic_values_scope();
+    }
+
+    void pop() {
+        pop_capture_scope();
+        pop_semantic_values_scope();
+    }
+
+    // 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(); }
+        }
+
+        auto &vs = *value_stack[value_stack_size++];
+        vs.path = path;
+        vs.ss = s;
+        return vs;
+    }
+
+    void pop_semantic_values_scope() { value_stack_size--; }
+
+    // Arguments
+    void push_args(std::vector<std::shared_ptr<Ope>> &&args) {
+        args_stack.emplace_back(args);
+    }
+
+    void pop_args() { args_stack.pop_back(); }
+
+    const std::vector<std::shared_ptr<Ope>> &top_args() const {
+        return args_stack[args_stack.size() - 1];
+    }
+
+    // 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++;
+    }
+
+    void pop_capture_scope() { capture_scope_stack_size--; }
+
+    void shift_capture_values() {
+        assert(capture_scope_stack_size >= 2);
+        auto curr = &capture_scope_stack[capture_scope_stack_size - 1];
+        auto prev = curr - 1;
+        for (const auto &[k, v] : *curr) {
+            (*prev)[k] = v;
+        }
+    }
+
+    // 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;
+};
+
+/*
+ * Parser operators
+ */
+class Ope {
+public:
+    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;
+};
+
+class Sequence : public Ope {
+public:
+    template <typename... Args>
+    Sequence(const Args &...args)
+        : opes_{static_cast<std::shared_ptr<Ope>>(args)...} {}
+    Sequence(const std::vector<std::shared_ptr<Ope>> &opes) : opes_(opes) {}
+    Sequence(std::vector<std::shared_ptr<Ope>> &&opes) : opes_(opes) {}
+
+    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;
+    }
+
+    void accept(Visitor &v) override;
+
+    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) {}
+    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);
+
+        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_) {
+            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++;
+        }
+
+        return len;
+    }
+
+    void accept(Visitor &v) override;
+
+    size_t size() const { return opes_.size(); }
+
+    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) {}
+
+    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++;
+        }
+
+        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++;
+        }
+        return i;
+    }
+
+    void accept(Visitor &v) override;
+
+    bool is_zom() const {
+        return min_ == 0 && max_ == std::numeric_limits<size_t>::max();
+    }
+
+    static std::shared_ptr<Repetition> zom(const std::shared_ptr<Ope> &ope) {
+        return std::make_shared<Repetition>(ope, 0,
+                                            std::numeric_limits<size_t>::max());
+    }
+
+    static std::shared_ptr<Repetition> oom(const std::shared_ptr<Ope> &ope) {
+        return std::make_shared<Repetition>(ope, 1,
+                                            std::numeric_limits<size_t>::max());
+    }
+
+    static std::shared_ptr<Repetition> opt(const std::shared_ptr<Ope> &ope) {
+        return std::make_shared<Repetition>(ope, 0, 1);
+    }
+
+    std::shared_ptr<Ope> ope_;
+    size_t min_;
+    size_t max_;
+};
+
+class AndPredicate : public Ope {
+public:
+    AndPredicate(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
+
+    size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
+                      Context &c, std::any &dt) const override {
+        auto &chvs = c.push();
+        auto se = scope_exit([&]() { c.pop(); });
+
+        auto len = ope_->parse(s, n, chvs, c, dt);
+
+        if (success(len)) {
+            return 0;
+        } else {
+            return len;
+        }
+    }
+
+    void accept(Visitor &v) override;
+
+    std::shared_ptr<Ope> ope_;
+};
+
+class NotPredicate : public Ope {
+public:
+    NotPredicate(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
+
+    size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
+                      Context &c, std::any &dt) const override {
+        auto &chvs = c.push();
+        auto se = scope_exit([&]() { c.pop(); });
+        auto len = ope_->parse(s, n, chvs, c, dt);
+        if (success(len)) {
+            c.set_error_pos(s);
+            return static_cast<size_t>(-1);
+        } else {
+            return 0;
+        }
+    }
+
+    void accept(Visitor &v) override;
+
+    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) {}
+
+    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                      std::any &dt) const override;
+
+    void accept(Visitor &v) override;
+
+    Trie trie_;
+};
+
+class LiteralString : public Ope,
+                      public std::enable_shared_from_this<LiteralString> {
+public:
+    LiteralString(std::string &&s, bool ignore_case)
+        : lit_(s), ignore_case_(ignore_case), is_word_(false) {}
+
+    LiteralString(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;
+
+    void accept(Visitor &v) override;
+
+    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());
+    }
+
+    CharacterClass(const std::vector<std::pair<char32_t, char32_t>> &ranges,
+                   bool negated, bool ignore_case)
+        : ranges_(ranges), negated_(negated), ignore_case_(ignore_case) {
+        assert(!ranges_.empty());
+    }
+
+    size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
+                      Context &c, std::any & /*dt*/) const override {
+        if (n < 1) {
+            c.set_error_pos(s);
+            return static_cast<size_t>(-1);
+        }
+
+        char32_t cp = 0;
+        auto len = decode_codepoint(s, n, cp);
+
+        for (const auto &range : ranges_) {
+            if (in_range(range, cp)) {
+                if (negated_) {
+                    c.set_error_pos(s);
+                    return static_cast<size_t>(-1);
+                } else {
+                    return len;
+                }
+            }
+        }
+
+        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;
+        }
+    }
+
+    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(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 || s[0] != ch_) {
+            c.set_error_pos(s);
+            return static_cast<size_t>(-1);
+        }
+        return 1;
+    }
+
+    void accept(Visitor &v) override;
+
+    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);
+        }
+        return len;
+    }
+
+    void accept(Visitor &v) override;
+};
+
+class CaptureScope : public Ope {
+public:
+    CaptureScope(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
+
+    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                      std::any &dt) const override {
+        c.push_capture_scope();
+        auto se = scope_exit([&]() { c.pop_capture_scope(); });
+        return ope_->parse(s, n, vs, c, dt);
+    }
+
+    void accept(Visitor &v) override;
+
+    std::shared_ptr<Ope> ope_;
+};
+
+class Capture : public Ope {
+public:
+    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) {}
+
+    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;
+
+    std::shared_ptr<Ope> ope_;
+    MatchAction match_action_;
+};
+
+class TokenBoundary : public Ope {
+public:
+    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;
+
+    void accept(Visitor &v) override;
+
+    std::shared_ptr<Ope> ope_;
+};
+
+class Ignore : public Ope {
+public:
+    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);
+    }
+
+    void accept(Visitor &v) override;
+
+    std::shared_ptr<Ope> ope_;
+};
+
+using Parser = std::function<size_t(const char *s, size_t n, SemanticValues &vs,
+                                    std::any &dt)>;
+
+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_;
+};
+
+class WeakHolder : public Ope {
+public:
+    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);
+    }
+
+    void accept(Visitor &v) override;
+
+    std::weak_ptr<Ope> weak_;
+};
+
+class Holder : public Ope {
+public:
+    Holder(Definition *outer) : outer_(outer) {}
+
+    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                      std::any &dt) const override;
+
+    void accept(Visitor &v) override;
+
+    std::any reduce(SemanticValues &vs, std::any &dt) 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_;
+
+    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) {}
+
+    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                      std::any &dt) const override;
+
+    void accept(Visitor &v) override;
+
+    std::shared_ptr<Ope> get_core_operator() const;
+
+    const Grammar &grammar_;
+    const std::string name_;
+    const char *s_;
+
+    const bool is_macro_;
+    const std::vector<std::shared_ptr<Ope>> args_;
+
+    Definition *rule_;
+    size_t iarg_;
+};
+
+class Whitespace : public Ope {
+public:
+    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);
+    }
+
+    void accept(Visitor &v) override;
+
+    std::shared_ptr<Ope> ope_;
+};
+
+class BackReference : public Ope {
+public:
+    BackReference(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;
+
+    void accept(Visitor &v) override;
+
+    std::string name_;
+};
+
+class PrecedenceClimbing : public Ope {
+public:
+    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) {}
+
+    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;
+
+    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;
+
+    Definition &get_reference_for_binop(Context &c) const;
+};
+
+class Recovery : public Ope {
+public:
+    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;
+
+    void accept(Visitor &v) override;
+
+    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;
+    }
+
+    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)...);
+}
+
+template <typename... Args> std::shared_ptr<Ope> cho(Args &&...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)...);
+}
+
+inline std::shared_ptr<Ope> zom(const std::shared_ptr<Ope> &ope) {
+    return Repetition::zom(ope);
+}
+
+inline std::shared_ptr<Ope> oom(const std::shared_ptr<Ope> &ope) {
+    return Repetition::oom(ope);
+}
+
+inline std::shared_ptr<Ope> opt(const std::shared_ptr<Ope> &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);
+}
+
+inline std::shared_ptr<Ope> apd(const std::shared_ptr<Ope> &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);
+}
+
+inline std::shared_ptr<Ope> dic(const std::vector<std::string> &v,
+                                bool 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);
+}
+
+inline std::shared_ptr<Ope> liti(std::string &&s) {
+    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);
+}
+
+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);
+}
+
+inline std::shared_ptr<Ope> ncls(const std::string &s) {
+    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);
+}
+
+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);
+}
+
+inline std::shared_ptr<Ope> cap(const std::shared_ptr<Ope> &ope,
+                                Capture::MatchAction 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);
+}
+
+inline std::shared_ptr<Ope> ign(const std::shared_ptr<Ope> &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);
+}
+
+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);
+}
+
+inline std::shared_ptr<Ope> wsp(const std::shared_ptr<Ope> &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);
+}
+
+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);
+}
+
+inline std::shared_ptr<Ope> rec(const std::shared_ptr<Ope> &ope) {
+    return std::make_shared<Recovery>(ope);
+}
+
+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 TraceOpeName : public Ope::Visitor {
+    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"; }
+
+    static std::string get(Ope &ope) {
+        TraceOpeName vis;
+        ope.accept(vis);
+        return vis.name_;
+    }
+
+private:
+    const char *name_ = nullptr;
+};
+
+struct AssignIDToDefinition : 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;
+    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;
+};
+
+struct IsLiteralToken : public Ope::Visitor {
+    using Ope::Visitor::visit;
+
+    void visit(PrioritizedChoice &ope) override {
+        for (auto op : ope.opes_) {
+            if (!IsLiteralToken::check(*op)) { return; }
+        }
+        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_;
+    }
+
+private:
+    bool result_ = false;
+};
+
+struct TokenChecker : 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(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; }
+
+        TokenChecker vis;
+        ope.accept(vis);
+        return vis.has_token_boundary_ || !vis.has_rule_;
+    }
+
+private:
+    bool has_token_boundary_ = false;
+    bool has_rule_ = false;
+};
+
+struct FindLiteralToken : public Ope::Visitor {
+    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); }
+
+    static const char *token(Ope &ope) {
+        FindLiteralToken vis;
+        ope.accept(vis);
+        return vis.token_;
+    }
+
+private:
+    const char *token_ = nullptr;
+};
+
+struct DetectLeftRecursion : public Ope::Visitor {
+    using Ope::Visitor::visit;
+
+    DetectLeftRecursion(const std::string &name) : name_(name) {}
+
+    void visit(Sequence &ope) override {
+        for (auto op : ope.opes_) {
+            op->accept(*this);
+            if (done_) {
+                break;
+            } else if (error_s) {
+                done_ = true;
+                break;
+            }
+        }
+    }
+    void visit(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(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;
+
+private:
+    std::string name_;
+    std::unordered_set<std::string> refs_;
+    bool done_ = false;
+};
+
+struct HasEmptyElement : public Ope::Visitor {
+    using Ope::Visitor::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 (auto op : ope.opes_) {
+            op->accept(*this);
+            if (is_empty) { return; }
+        }
+    }
+    void visit(Repetition &ope) override {
+        if (ope.min_ == 0) {
+            set_error();
+        } else {
+            ope.ope_->accept(*this);
+        }
+    }
+    void visit(AndPredicate &) override { set_error(); }
+    void visit(NotPredicate &) override { set_error(); }
+    void visit(LiteralString &ope) override {
+        if (ope.lit_.empty()) { set_error(); }
+    }
+    void visit(CaptureScope &ope) override { ope.ope_->accept(*this); }
+    void visit(Capture &ope) override { ope.ope_->accept(*this); }
+    void visit(TokenBoundary &ope) override { ope.ope_->accept(*this); }
+    void visit(Ignore &ope) override { ope.ope_->accept(*this); }
+    void visit(WeakHolder &ope) override { ope.weak_.lock()->accept(*this); }
+    void visit(Holder &ope) override { ope.ope_->accept(*this); }
+    void visit(Reference &ope) override;
+    void visit(Whitespace &ope) override { ope.ope_->accept(*this); }
+    void visit(PrecedenceClimbing &ope) override { ope.atom_->accept(*this); }
+    void visit(Recovery &ope) override { ope.ope_->accept(*this); }
+
+    bool is_empty = false;
+    const char *error_s = nullptr;
+    std::string error_name;
+
+private:
+    void set_error() {
+        is_empty = true;
+        tie(error_s, error_name) = refs_.back();
+    }
+    std::vector<std::pair<const char *, std::string>> &refs_;
+    std::unordered_map<std::string, bool> &has_error_cache_;
+};
+
+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 (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_;
+};
+
+struct ReferenceChecker : public Ope::Visitor {
+    using Ope::Visitor::visit;
+
+    ReferenceChecker(const Grammar &grammar,
+                     const std::vector<std::string> &params)
+        : grammar_(grammar), params_(params) {}
+
+    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;
+
+private:
+    const Grammar &grammar_;
+    const std::vector<std::string> &params_;
+};
+
+struct LinkReferences : public Ope::Visitor {
+    using Ope::Visitor::visit;
+
+    LinkReferences(Grammar &grammar, const std::vector<std::string> &params)
+        : grammar_(grammar), params_(params) {}
+
+    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_;
+};
+
+struct FindReference : public Ope::Visitor {
+    using Ope::Visitor::visit;
+
+    FindReference(const std::vector<std::shared_ptr<Ope>> &args,
+                  const std::vector<std::string> &params)
+        : args_(args), params_(params) {}
+
+    void visit(Sequence &ope) override {
+        std::vector<std::shared_ptr<Ope>> opes;
+        for (auto o : ope.opes_) {
+            o->accept(*this);
+            opes.push_back(found_ope);
+        }
+        found_ope = std::make_shared<Sequence>(opes);
+    }
+    void visit(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);
+    }
+    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_;
+};
+
+/*
+ * Keywords
+ */
+static const char *WHITESPACE_DEFINITION_NAME = "%whitespace";
+static const char *WORD_DEFINITION_NAME = "%word";
+static const char *RECOVER_DEFINITION_NAME = "%recover";
+
+/*
+ * Definition
+ */
+class Definition {
+public:
+    struct Result {
+        bool ret;
+        bool recovered;
+        size_t len;
+        ErrorInfo error_info;
+    };
+
+    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]);
+        }
+        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, 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, 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, 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, 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; }
+
+    template <typename T> Definition &operator,(T fn) {
+        operator=(fn);
+        return *this;
+    }
+
+    Definition &operator~() {
+        ignoreSemanticValue = true;
+        return *this;
+    }
+
+    void accept(Ope::Visitor &v) { holder_->accept(v); }
+
+    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_;
+    }
+
+    std::string name;
+    const char *s_ = nullptr;
+    std::pair<size_t, size_t> line_ = {1, 1};
+
+    std::function<bool(const SemanticValues &vs, const std::any &dt,
+                       std::string &msg)>
+        predicate;
+
+    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;
+
+    std::string error_message;
+    bool no_ast_opt = false;
+
+    bool eoi_check = true;
+
+private:
+    friend class Reference;
+    friend class ParserGenerator;
+
+    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);
+        });
+    }
+
+    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 se1 = scope_exit([&]() {
+            if (tracer_end) { tracer_end(trace_data); }
+        });
+
+        Context c(path, s, n, definition_ids_.size(), whitespaceOpe, wordOpe,
+                  enablePackratParsing, tracer_enter, tracer_leave, trace_data,
+                  verbose_trace, log);
+
+        size_t i = 0;
+
+        if (whitespaceOpe) {
+            auto save_ignore_trace_state = c.ignore_trace_state;
+            c.ignore_trace_state = !c.verbose_trace;
+            auto se2 =
+                scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
+
+            auto len = whitespaceOpe->parse(s, n, vs, c, dt);
+            if (fail(len)) { return Result{false, c.recovered, i, c.error_info}; }
+
+            i = len;
+        }
+
+        auto len = ope->parse(s + i, n - i, vs, c, dt);
+        auto ret = success(len);
+        if (ret) {
+            i += len;
+            if (eoi_check) {
+                if (i < n) {
+                    if (c.error_info.error_pos - c.s < s + i - c.s) {
+                        c.error_info.message_pos = s + i;
+                        c.error_info.message = "expected end of input";
+                    }
+                    ret = false;
+                }
+            }
+        }
+        return Result{ret, c.recovered, i, c.error_info};
+    }
+
+    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_;
+};
+
+/*
+ * Implementations
+ */
+
+inline size_t parse_literal(const char *s, size_t n, SemanticValues &vs,
+                            Context &c, std::any &dt, const std::string &lit,
+                            std::once_flag &init_is_word, bool &is_word,
+                            bool ignore_case) {
+    size_t i = 0;
+    for (; i < lit.size(); i++) {
+        if (i >= n || (ignore_case ? (std::tolower(s[i]) != std::tolower(lit[i]))
+                                   : (s[i] != lit[i]))) {
+            c.set_error_pos(s, lit.data());
+            return static_cast<size_t>(-1);
+        }
+    }
+
+    // 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;
+
+            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;
+
+            NotPredicate ope(c.wordOpe);
+            auto len = ope.parse(s + i, n - i, dummy_vs, dummy_c, dummy_dt);
+            if (fail(len)) {
+                c.set_error_pos(s, lit.data());
+                return len;
+            }
+            i += len;
+        }
+    }
+
+    // Skip whitespace
+    if (!c.in_token_boundary_count && c.whitespaceOpe) {
+        auto save_ignore_trace_state = c.ignore_trace_state;
+        c.ignore_trace_state = !c.verbose_trace;
+        auto se =
+            scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
+
+        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());
+}
+
+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);
+
+                auto unexpected_char = unexpected_token.substr(
+                    0,
+                    codepoint_length(unexpected_token.data(), unexpected_token.size()));
+
+                msg = replace_all(msg, "%c", unexpected_char);
+            } else {
+                msg = message;
+            }
+            log(line.first, line.second, msg, label);
+        }
+    } else if (error_pos) {
+        if (error_pos > last_output_pos) {
+            last_output_pos = error_pos;
+            auto line = line_info(s, error_pos);
+
+            std::string msg;
+            if (expected_tokens.empty()) {
+                msg = "syntax error.";
+            } else {
+                msg = "syntax error";
+
+                // unexpected token
+                if (auto unexpected_token = heuristic_error_token(s, n, error_pos);
+                    !unexpected_token.empty()) {
+                    msg += ", unexpected '";
+                    msg += unexpected_token;
+                    msg += "'";
+                }
+
+                auto first_item = true;
+                size_t i = 0;
+                while (i < expected_tokens.size()) {
+                    auto [error_literal, error_rule] = expected_tokens[i];
+
+                    // Skip rules start with '_'
+                    if (!(error_rule && error_rule->name[0] == '_')) {
+                        msg += (first_item ? ", expecting " : ", ");
+                        if (error_literal) {
+                            msg += "'";
+                            msg += error_literal;
+                            msg += "'";
+                        } else {
+                            msg += "<" + error_rule->name + ">";
+                            if (label.empty()) { label = error_rule->name; }
+                        }
+                        first_item = false;
+                    }
+
+                    i++;
+                }
+                msg += ".";
+            }
+            log(line.first, line.second, msg, label);
+        }
+    }
+}
+
+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();
+            }
+
+            const char *error_literal = nullptr;
+            const Definition *error_rule = nullptr;
+
+            if (literal) {
+                error_literal = literal;
+            } else if (!rule_stack.empty()) {
+                auto rule = rule_stack.back();
+                auto ope = rule->get_core_operator();
+                if (auto token = FindLiteralToken::token(*ope);
+                    token && token[0] != '\0') {
+                    error_literal = token;
+                }
+            }
+
+            for (auto r : rule_stack) {
+                error_rule = r;
+                if (r->is_token()) { break; }
+            }
+
+            if (error_literal || error_rule) {
+                error_info.add(error_literal, error_rule);
+            }
+        }
+    }
+}
+
+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);
+}
+
+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();
+}
+
+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;
+}
+
+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);
+}
+
+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);
+
+    if (i == 0) {
+        c.set_error_pos(s);
+        return static_cast<size_t>(-1);
+    }
+
+    vs.choice_count_ = trie_.size();
+    vs.choice_ = id;
+
+    // Word check
+    if (c.wordOpe) {
+        auto save_ignore_trace_state = c.ignore_trace_state;
+        c.ignore_trace_state = !c.verbose_trace;
+        auto se =
+            scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
+
+        {
+            SemanticValues dummy_vs;
+            Context dummy_c(nullptr, c.s, c.l, 0, nullptr, nullptr, false, nullptr,
+                            nullptr, nullptr, false, nullptr);
+            std::any dummy_dt;
+
+            NotPredicate ope(c.wordOpe);
+            auto len = ope.parse(s + i, n - i, dummy_vs, dummy_c, dummy_dt);
+            if (fail(len)) {
+                c.set_error_pos(s);
+                return 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_);
+}
+
+inline size_t TokenBoundary::parse_core(const char *s, size_t n,
+                                        SemanticValues &vs, Context &c,
+                                        std::any &dt) const {
+    auto save_ignore_trace_state = c.ignore_trace_state;
+    c.ignore_trace_state = !c.verbose_trace;
+    auto se1 =
+        scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
+
+    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 (!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...");
+    }
+
+    // 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;
+
+    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); }
+        });
+
+        c.rule_stack.push_back(outer_);
+        len = ope_->parse(s, n, chvs, c, dt);
+        c.rule_stack.pop_back();
+
+        // Invoke action
+        if (success(len)) {
+            chvs.sv_ = std::string_view(s, len);
+            chvs.name_ = outer_->name;
+
+            auto ope_ptr = ope_.get();
+            {
+                auto tok_ptr = dynamic_cast<const peg::TokenBoundary *>(ope_ptr);
+                if (tok_ptr) { ope_ptr = tok_ptr->ope_.get(); }
+            }
+            if (!dynamic_cast<const peg::PrioritizedChoice *>(ope_ptr) &&
+                !dynamic_cast<const peg::Dictionary *>(ope_ptr)) {
+                chvs.choice_count_ = 0;
+                chvs.choice_ = 0;
+            }
+
+            std::string msg;
+            if (outer_->predicate && !outer_->predicate(chvs, dt, msg)) {
+                if (c.log && !msg.empty() && c.error_info.message_pos < s) {
+                    c.error_info.message_pos = s;
+                    c.error_info.message = msg;
+                    c.error_info.label = outer_->name;
+                }
+                len = static_cast<size_t>(-1);
+            }
+
+            if (success(len)) {
+                if (!c.recovered) { a_val = reduce(chvs, dt); }
+            } else {
+                if (c.log && !msg.empty() && c.error_info.message_pos < s) {
+                    c.error_info.message_pos = s;
+                    c.error_info.message = msg;
+                    c.error_info.label = outer_->name;
+                }
+            }
+        } else {
+            if (c.log && !outer_->error_message.empty() &&
+                c.error_info.message_pos < s) {
+                c.error_info.message_pos = s;
+                c.error_info.message = outer_->error_message;
+                c.error_info.label = outer_->name;
+            }
+        }
+    });
+
+    if (success(len)) {
+        if (!outer_->ignoreSemanticValue) {
+            vs.emplace_back(std::move(val));
+            vs.tags.emplace_back(str2tag(outer_->name));
+        }
+    }
+
+    return len;
+}
+
+inline std::any Holder::reduce(SemanticValues &vs, std::any &dt) const {
+    if (outer_->action && !outer_->disable_action) {
+        return outer_->action(vs, dt);
+    } else if (vs.empty()) {
+        return std::any();
+    } else {
+        return std::move(vs.front());
+    }
+}
+
+inline 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_;
+}
+
+inline size_t Reference::parse_core(const char *s, size_t n, SemanticValues &vs,
+                                    Context &c, std::any &dt) const {
+    auto save_ignore_trace_state = c.ignore_trace_state;
+    if (rule_ && rule_->ignoreSemanticValue) {
+        c.ignore_trace_state = !c.verbose_trace;
+    }
+    auto se1 =
+        scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
+
+    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);
+    }
+}
+
+inline std::shared_ptr<Ope> Reference::get_core_operator() const {
+    return rule_->holder_;
+}
+
+inline size_t BackReference::parse_core(const char *s, size_t n,
+                                        SemanticValues &vs, Context &c,
+                                        std::any &dt) const {
+    auto size = static_cast<int>(c.capture_scope_stack_size);
+    for (auto i = size - 1; i >= 0; i--) {
+        auto index = static_cast<size_t>(i);
+        const auto &cs = c.capture_scope_stack[index];
+        if (cs.find(name_) != cs.end()) {
+            const auto &lit = cs.at(name_);
+            std::once_flag init_is_word;
+            auto is_word = false;
+            return parse_literal(s, n, vs, c, dt, lit, init_is_word, is_word, false);
+        }
+    }
+
+    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_;
+    }
+
+    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; }
+
+    std::string tok;
+    auto &rule = get_reference_for_binop(c);
+    auto action = std::move(rule.action);
+
+    rule.action = [&](SemanticValues &vs2, std::any &dt2) {
+        tok = vs2.token();
+        if (action) {
+            return action(vs2, dt2);
+        } else if (!vs2.empty()) {
+            return vs2[0];
+        }
+        return std::any();
+    };
+    auto action_se = scope_exit([&]() { rule.action = std::move(action); });
+
+    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();
+
+        if (fail(chlen)) { 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);
+
+        if (level < min_prec) { break; }
+
+        vs.emplace_back(std::move(chvs[0]));
+        i += chlen;
+
+        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();
+
+        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));
+    }
+
+    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;
+
+        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); }
+inline void PrioritizedChoice::accept(Visitor &v) { v.visit(*this); }
+inline void Repetition::accept(Visitor &v) { v.visit(*this); }
+inline void AndPredicate::accept(Visitor &v) { v.visit(*this); }
+inline void NotPredicate::accept(Visitor &v) { v.visit(*this); }
+inline void Dictionary::accept(Visitor &v) { v.visit(*this); }
+inline void LiteralString::accept(Visitor &v) { v.visit(*this); }
+inline void CharacterClass::accept(Visitor &v) { v.visit(*this); }
+inline void Character::accept(Visitor &v) { v.visit(*this); }
+inline void AnyCharacter::accept(Visitor &v) { v.visit(*this); }
+inline void CaptureScope::accept(Visitor &v) { v.visit(*this); }
+inline void Capture::accept(Visitor &v) { v.visit(*this); }
+inline void TokenBoundary::accept(Visitor &v) { v.visit(*this); }
+inline void Ignore::accept(Visitor &v) { v.visit(*this); }
+inline void User::accept(Visitor &v) { v.visit(*this); }
+inline void WeakHolder::accept(Visitor &v) { v.visit(*this); }
+inline void Holder::accept(Visitor &v) { v.visit(*this); }
+inline void Reference::accept(Visitor &v) { v.visit(*this); }
+inline void Whitespace::accept(Visitor &v) { v.visit(*this); }
+inline void BackReference::accept(Visitor &v) { v.visit(*this); }
+inline void PrecedenceClimbing::accept(Visitor &v) { v.visit(*this); }
+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);
+}
+
+inline void AssignIDToDefinition::visit(Reference &ope) {
+    if (ope.rule_) {
+        for (auto arg : ope.args_) {
+            arg->accept(*this);
+        }
+        ope.rule_->accept(*this);
+    }
+}
+
+inline void AssignIDToDefinition::visit(PrecedenceClimbing &ope) {
+    ope.atom_->accept(*this);
+    ope.binop_->accept(*this);
+}
+
+inline void TokenChecker::visit(Reference &ope) {
+    if (ope.is_macro_) {
+        for (auto arg : ope.args_) {
+            arg->accept(*this);
+        }
+    } else {
+        has_rule_ = true;
+    }
+}
+
+inline void FindLiteralToken::visit(Reference &ope) {
+    if (ope.is_macro_) {
+        ope.rule_->accept(*this);
+        for (auto arg : ope.args_) {
+            arg->accept(*this);
+        }
+    }
+}
+
+inline void DetectLeftRecursion::visit(Reference &ope) {
+    if (ope.name_ == name_) {
+        error_s = ope.s_;
+    } else if (!refs_.count(ope.name_)) {
+        refs_.insert(ope.name_);
+        if (ope.rule_) {
+            ope.rule_->accept(*this);
+            if (done_ == false) { return; }
+        }
+    }
+    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 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;
+    }
+
+    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; }
+
+    if (ope.rule_) {
+        refs_.emplace_back(ope.s_, ope.name_);
+        ope.rule_->accept(*this);
+        refs_.pop_back();
+    }
+}
+
+inline void DetectInfiniteLoop::visit(Reference &ope) {
+    auto it1 = std::find_if(refs_.begin(), refs_.end(),
+                           [&](const std::pair<const char *, std::string> &ref) {
+                               return ope.name_ == ref.second;
+                           });
+    if (it1 != refs_.end()) { return; }
+
+    if (ope.rule_) {
+        auto it = has_error_cache_.find(ope.name_);
+        if (it != has_error_cache_.end()) {
+            has_error = it->second;
+        } else {
+            refs_.emplace_back(ope.s_, ope.name_);
+            ope.rule_->accept(*this);
+            refs_.pop_back();
+            has_error_cache_[ope.name_] = has_error;
+        }
+    }
+
+    if (ope.is_macro_) {
+        for (auto arg : ope.args_) {
+            arg->accept(*this);
+        }
+    }
+}
+
+inline void ReferenceChecker::visit(Reference &ope) {
+    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()) {
+                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);
+        }
+    }
+}
+
+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 definition rule
+    if (!found_param && grammar_.count(ope.name_)) {
+        auto &rule = grammar_.at(ope.name_);
+        ope.rule_ = &rule;
+    }
+
+    for (auto arg : ope.args_) {
+        arg->accept(*this);
+    }
+}
+
+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;
+        }
+    }
+    found_ope = ope.shared_from_this();
+}
+
+/*-----------------------------------------------------------------------------
+ *  PEG parser generator
+ *---------------------------------------------------------------------------*/
+
+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;
+    };
+
+    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;
+
+        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));
+    }
+#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>()) {}
+    };
+
+    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; }
+            }
+
+            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;
+    }
+
+    ParserContext perform_core(const char *s, size_t n, const Rules &rules,
+                               Log log, std::string requested_start) {
+        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"};
+            }
+        }
+
+        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 {};
+        }
+
+        // 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);
+        }
+
+        // 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;
+    }
+
+    Grammar g;
+};
+
+/*-----------------------------------------------------------------------------
+ *  AST
+ *---------------------------------------------------------------------------*/
+
+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::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) {}
+
+    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 bool is_token;
+    const std::string_view token;
+
+    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);
+    }
+
+    template <typename T> T token_to_number() const {
+        return token_to_number_<T>(token);
+    }
+};
+
+template <typename T>
+void ast_to_s_core(const std::shared_ptr<T> &ptr, std::string &s, int level,
+                   std::function<std::string(const T &ast, int level)> fn) {
+    const auto &ast = *ptr;
+    for (auto i = 0; i < level; i++) {
+        s += "  ";
+    }
+    auto name = ast.original_name;
+    if (ast.original_choice_count > 0) {
+        name += "/" + std::to_string(ast.original_choice);
+    }
+    if (ast.name != ast.original_name) { name += "[" + ast.name + "]"; }
+    if (ast.is_token) {
+        s += "- " + name + " (";
+        s += ast.token;
+        s += ")\n";
+    } else {
+        s += "+ " + name + "\n";
+    }
+    if (fn) { s += fn(ast, level + 1); }
+    for (auto node : ast.nodes) {
+        ast_to_s_core(node, s, level + 1, fn);
+    }
+}
+
+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;
+}
+
+struct AstOptimizer {
+    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;
+
+        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;
+    }
+
+private:
+    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();
+
+        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());
+
+        for (auto node : ast->nodes) {
+            node->parent = ast;
+        }
+        return ast;
+    };
+}
+
+#define PEG_EXPAND(...) __VA_ARGS__
+#define PEG_CONCAT(a, b) a##b
+#define PEG_CONCAT2(a, b) PEG_CONCAT(a, b)
+
+#define PEG_PICK(                                                              \
+    a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, \
+    a17, a18, a19, a20, a21, a22, a23, a24, a25, a26, a27, a28, a29, a30, a31, \
+    a32, a33, a34, a35, a36, a37, a38, a39, a40, a41, a42, a43, a44, a45, a46, \
+    a47, a48, a49, a50, a51, a52, a53, a54, a55, a56, a57, a58, a59, a60, a61, \
+    a62, a63, a64, a65, a66, a67, a68, a69, a70, a71, a72, a73, a74, a75, a76, \
+    a77, a78, a79, a80, a81, a82, a83, a84, a85, a86, a87, a88, a89, a90, a91, \
+    a92, a93, a94, a95, a96, a97, a98, a99, a100, ...)                         \
+  a100
+
+#define PEG_COUNT(...)                                                         \
+  PEG_EXPAND(PEG_PICK(                                                         \
+      __VA_ARGS__, 100, 99, 98, 97, 96, 95, 94, 93, 92, 91, 90, 89, 88, 87,    \
+      86, 85, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69,  \
+      68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51,  \
+      50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33,  \
+      32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15,  \
+      14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
+
+#define PEG_DEF_1(r)                                                           \
+  peg::Definition r;                                                           \
+  r.name = #r;                                                                 \
+  peg::add_ast_action(r);
+
+#define PEG_DEF_2(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_1(__VA_ARGS__))
+#define PEG_DEF_3(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_2(__VA_ARGS__))
+#define PEG_DEF_4(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_3(__VA_ARGS__))
+#define PEG_DEF_5(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_4(__VA_ARGS__))
+#define PEG_DEF_6(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_5(__VA_ARGS__))
+#define PEG_DEF_7(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_6(__VA_ARGS__))
+#define PEG_DEF_8(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_7(__VA_ARGS__))
+#define PEG_DEF_9(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_8(__VA_ARGS__))
+#define PEG_DEF_10(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_9(__VA_ARGS__))
+#define PEG_DEF_11(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_10(__VA_ARGS__))
+#define PEG_DEF_12(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_11(__VA_ARGS__))
+#define PEG_DEF_13(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_12(__VA_ARGS__))
+#define PEG_DEF_14(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_13(__VA_ARGS__))
+#define PEG_DEF_15(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_14(__VA_ARGS__))
+#define PEG_DEF_16(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_15(__VA_ARGS__))
+#define PEG_DEF_17(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_16(__VA_ARGS__))
+#define PEG_DEF_18(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_17(__VA_ARGS__))
+#define PEG_DEF_19(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_18(__VA_ARGS__))
+#define PEG_DEF_20(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_19(__VA_ARGS__))
+#define PEG_DEF_21(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_20(__VA_ARGS__))
+#define PEG_DEF_22(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_21(__VA_ARGS__))
+#define PEG_DEF_23(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_22(__VA_ARGS__))
+#define PEG_DEF_24(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_23(__VA_ARGS__))
+#define PEG_DEF_25(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_24(__VA_ARGS__))
+#define PEG_DEF_26(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_25(__VA_ARGS__))
+#define PEG_DEF_27(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_26(__VA_ARGS__))
+#define PEG_DEF_28(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_27(__VA_ARGS__))
+#define PEG_DEF_29(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_28(__VA_ARGS__))
+#define PEG_DEF_30(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_29(__VA_ARGS__))
+#define PEG_DEF_31(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_30(__VA_ARGS__))
+#define PEG_DEF_32(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_31(__VA_ARGS__))
+#define PEG_DEF_33(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_32(__VA_ARGS__))
+#define PEG_DEF_34(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_33(__VA_ARGS__))
+#define PEG_DEF_35(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_34(__VA_ARGS__))
+#define PEG_DEF_36(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_35(__VA_ARGS__))
+#define PEG_DEF_37(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_36(__VA_ARGS__))
+#define PEG_DEF_38(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_37(__VA_ARGS__))
+#define PEG_DEF_39(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_38(__VA_ARGS__))
+#define PEG_DEF_40(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_39(__VA_ARGS__))
+#define PEG_DEF_41(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_40(__VA_ARGS__))
+#define PEG_DEF_42(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_41(__VA_ARGS__))
+#define PEG_DEF_43(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_42(__VA_ARGS__))
+#define PEG_DEF_44(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_43(__VA_ARGS__))
+#define PEG_DEF_45(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_44(__VA_ARGS__))
+#define PEG_DEF_46(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_45(__VA_ARGS__))
+#define PEG_DEF_47(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_46(__VA_ARGS__))
+#define PEG_DEF_48(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_47(__VA_ARGS__))
+#define PEG_DEF_49(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_48(__VA_ARGS__))
+#define PEG_DEF_50(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_49(__VA_ARGS__))
+#define PEG_DEF_51(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_50(__VA_ARGS__))
+#define PEG_DEF_52(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_51(__VA_ARGS__))
+#define PEG_DEF_53(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_52(__VA_ARGS__))
+#define PEG_DEF_54(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_53(__VA_ARGS__))
+#define PEG_DEF_55(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_54(__VA_ARGS__))
+#define PEG_DEF_56(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_55(__VA_ARGS__))
+#define PEG_DEF_57(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_56(__VA_ARGS__))
+#define PEG_DEF_58(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_57(__VA_ARGS__))
+#define PEG_DEF_59(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_58(__VA_ARGS__))
+#define PEG_DEF_60(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_59(__VA_ARGS__))
+#define PEG_DEF_61(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_60(__VA_ARGS__))
+#define PEG_DEF_62(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_61(__VA_ARGS__))
+#define PEG_DEF_63(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_62(__VA_ARGS__))
+#define PEG_DEF_64(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_63(__VA_ARGS__))
+#define PEG_DEF_65(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_64(__VA_ARGS__))
+#define PEG_DEF_66(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_65(__VA_ARGS__))
+#define PEG_DEF_67(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_66(__VA_ARGS__))
+#define PEG_DEF_68(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_67(__VA_ARGS__))
+#define PEG_DEF_69(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_68(__VA_ARGS__))
+#define PEG_DEF_70(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_69(__VA_ARGS__))
+#define PEG_DEF_71(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_70(__VA_ARGS__))
+#define PEG_DEF_72(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_71(__VA_ARGS__))
+#define PEG_DEF_73(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_72(__VA_ARGS__))
+#define PEG_DEF_74(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_73(__VA_ARGS__))
+#define PEG_DEF_75(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_74(__VA_ARGS__))
+#define PEG_DEF_76(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_75(__VA_ARGS__))
+#define PEG_DEF_77(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_76(__VA_ARGS__))
+#define PEG_DEF_78(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_77(__VA_ARGS__))
+#define PEG_DEF_79(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_78(__VA_ARGS__))
+#define PEG_DEF_80(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_79(__VA_ARGS__))
+#define PEG_DEF_81(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_80(__VA_ARGS__))
+#define PEG_DEF_82(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_81(__VA_ARGS__))
+#define PEG_DEF_83(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_82(__VA_ARGS__))
+#define PEG_DEF_84(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_83(__VA_ARGS__))
+#define PEG_DEF_85(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_84(__VA_ARGS__))
+#define PEG_DEF_86(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_85(__VA_ARGS__))
+#define PEG_DEF_87(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_86(__VA_ARGS__))
+#define PEG_DEF_88(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_87(__VA_ARGS__))
+#define PEG_DEF_89(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_88(__VA_ARGS__))
+#define PEG_DEF_90(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_89(__VA_ARGS__))
+#define PEG_DEF_91(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_90(__VA_ARGS__))
+#define PEG_DEF_92(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_91(__VA_ARGS__))
+#define PEG_DEF_93(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_92(__VA_ARGS__))
+#define PEG_DEF_94(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_93(__VA_ARGS__))
+#define PEG_DEF_95(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_94(__VA_ARGS__))
+#define PEG_DEF_96(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_95(__VA_ARGS__))
+#define PEG_DEF_97(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_96(__VA_ARGS__))
+#define PEG_DEF_98(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_97(__VA_ARGS__))
+#define PEG_DEF_99(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_98(__VA_ARGS__))
+#define PEG_DEF_100(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_99(__VA_ARGS__))
+
+#define AST_DEFINITIONS(...)                                                   \
+  PEG_EXPAND(PEG_CONCAT2(PEG_DEF_, PEG_COUNT(__VA_ARGS__))(__VA_ARGS__))
+
+/*-----------------------------------------------------------------------------
+ *  parser
+ *---------------------------------------------------------------------------*/
+
+class parser {
+public:
+    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, 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, 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, std::string_view start = {})
+        : parser(reinterpret_cast<const char *>(sv.data()), sv.size(), Rules(),
+                 start) {}
+#endif
+
+    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);
+        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(), 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 {
+        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, 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, 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]; }
+
+    const Definition &operator[](const char *s) const { return (*grammar_)[s]; }
+
+    const Grammar &get_grammar() const { return *grammar_; }
+
+    void disable_eoi_check() {
+        if (grammar_ != nullptr) {
+            auto &rule = (*grammar_)[start_];
+            rule.eoi_check = false;
+        }
+    }
+
+    void enable_packrat_parsing() {
+        if (grammar_ != nullptr) {
+            auto &rule = (*grammar_)[start_];
+            rule.enablePackratParsing = enablePackratParsing_;
+        }
+    }
+
+    void enable_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 set_verbose_trace(bool verbose_trace) {
+        if (grammar_ != nullptr) {
+            auto &rule = (*grammar_)[start_];
+            rule.verbose_trace = verbose_trace;
+        }
+    }
+
+    template <typename T = Ast> parser &enable_ast() {
+        for (auto &[_, rule] : *grammar_) {
+            if (!rule.action) { add_ast_action<T>(rule); }
+        }
+        return *this;
+    }
+
+    template <typename T>
+    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(
+        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); }
+        }
+        return rules;
+    }
+
+    std::shared_ptr<Grammar> grammar_;
+    std::string start_;
+    bool enablePackratParsing_ = false;
+    Log log_;
+};
+
+/*-----------------------------------------------------------------------------
+ *  enable_tracing
+ *---------------------------------------------------------------------------*/
+
+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));
+
+                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 &) {});
+}
+
+/*-----------------------------------------------------------------------------
+ *  enable_profiling
+ *---------------------------------------------------------------------------*/
+
+inline void enable_profiling(parser &parser, std::ostream &os) {
+    struct Stats {
+        struct Item {
+            std::string name;
+            size_t success;
+            size_t fail;
+        };
+        std::vector<Item> items;
+        std::map<std::string, size_t> index;
+        size_t total = 0;
+        std::chrono::steady_clock::time_point start;
+    };
+
+    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;
+                    }
+
+                    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;
+        });
+}
+} // namespace peg
diff --git a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp b/common/passwordhasher.cpp
similarity index 96%
rename from libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
rename to common/passwordhasher.cpp
index c40c5f94f..bc5f072e8 100644
--- a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
+++ b/common/passwordhasher.cpp
@@ -1,7 +1,8 @@
 #include "passwordhasher.h"
 
+#include "rng_sfmt.h"
+
 #include <QCryptographicHash>
-#include <libcockatrice/rng/rng_sfmt.h>
 
 QString PasswordHasher::computeHash(const QString &password, const QString &salt)
 {
diff --git a/libcockatrice_utility/libcockatrice/utility/passwordhasher.h b/common/passwordhasher.h
similarity index 100%
rename from libcockatrice_utility/libcockatrice/utility/passwordhasher.h
rename to common/passwordhasher.h
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt b/common/pb/CMakeLists.txt
similarity index 86%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
rename to common/pb/CMakeLists.txt
index 212ab69dd..dc48823fd 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
+++ b/common/pb/CMakeLists.txt
@@ -165,25 +165,18 @@ set(PROTO_FILES
     session_event.proto
 )
 
-if(MSVC)
-  set(unused_warning /wd4100)
-else()
-  set(unused_warning -Wno-unused-parameter)
-endif()
-
 if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0")
   message(STATUS "Using Protobuf Legacy Mode")
   include_directories(${PROTOBUF_INCLUDE_DIRS})
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
   protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_FILES})
 
-  add_library(libcockatrice_protocol_pb ${PROTO_SRCS} ${PROTO_HDRS})
-  target_compile_options(libcockatrice_protocol_pb PRIVATE ${unused_warning})
-  set(libcockatrice_protocol_pb_LIBS ${PROTOBUF_LIBRARIES})
+  add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS})
+  set(cockatrice_protocol_LIBS ${PROTOBUF_LIBRARIES})
   if(UNIX)
-    set(libcockatrice_protocol_pb_LIBS ${libcockatrice_protocol_pb_LIBS} -lpthread)
+    set(cockatrice_protocol_LIBS ${cockatrice_protocol_LIBS} -lpthread)
   endif(UNIX)
-  target_link_libraries(libcockatrice_protocol_pb ${libcockatrice_protocol_pb_LIBS})
+  target_link_libraries(cockatrice_protocol ${cockatrice_protocol_LIBS})
 
   # ubuntu uses an outdated package for protobuf, 3.1.0 is required
   if(${Protobuf_VERSION} VERSION_LESS "3.1.0")
@@ -195,11 +188,12 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0")
     )
   endif()
 else()
-  add_library(libcockatrice_protocol_pb ${PROTO_FILES})
-  target_compile_options(libcockatrice_protocol_pb PRIVATE ${unused_warning})
-  target_link_libraries(libcockatrice_protocol_pb PUBLIC protobuf::libprotobuf)
+  add_library(cockatrice_protocol ${PROTO_FILES})
+  target_link_libraries(cockatrice_protocol PUBLIC protobuf::libprotobuf)
   set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-  target_include_directories(libcockatrice_protocol_pb PUBLIC "${PROTOBUF_INCLUDE_DIRS}")
+  target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}")
 
-  protobuf_generate(TARGET libcockatrice_protocol_pb IMPORT_DIRS "." PROTOC_OUT_DIR "${PROTO_BINARY_DIR}")
+  protobuf_generate(
+    TARGET cockatrice_protocol IMPORT_DIRS "${CMAKE_CURRENT_LIST_DIR}" PROTOC_OUT_DIR "${PROTO_BINARY_DIR}"
+  )
 endif()
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto b/common/pb/admin_commands.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto
rename to common/pb/admin_commands.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/card_attributes.proto b/common/pb/card_attributes.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/card_attributes.proto
rename to common/pb/card_attributes.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/color.proto b/common/pb/color.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/color.proto
rename to common/pb/color.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_attach_card.proto b/common/pb/command_attach_card.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_attach_card.proto
rename to common/pb/command_attach_card.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_change_zone_properties.proto b/common/pb/command_change_zone_properties.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_change_zone_properties.proto
rename to common/pb/command_change_zone_properties.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_concede.proto b/common/pb/command_concede.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_concede.proto
rename to common/pb/command_concede.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_create_arrow.proto b/common/pb/command_create_arrow.proto
similarity index 77%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_create_arrow.proto
rename to common/pb/command_create_arrow.proto
index cb3871b60..fcfa028a6 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_create_arrow.proto
+++ b/common/pb/command_create_arrow.proto
@@ -27,9 +27,4 @@ message Command_CreateArrow {
 
     // the color of the arrow
     optional color arrow_color = 7;
-
-    // the phase that this arrow is deleted in, arrows are deleted when this or a later phase is activated and also
-    // when the phase moves back before the current phase or the turn is passed, when not set the arrow is deleted
-    // immediately when the phase is changed
-    optional sint32 delete_in_phase = 8;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_create_counter.proto b/common/pb/command_create_counter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_create_counter.proto
rename to common/pb/command_create_counter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_create_token.proto b/common/pb/command_create_token.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_create_token.proto
rename to common/pb/command_create_token.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del.proto b/common/pb/command_deck_del.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del.proto
rename to common/pb/command_deck_del.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del_dir.proto b/common/pb/command_deck_del_dir.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_del_dir.proto
rename to common/pb/command_deck_del_dir.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download.proto b/common/pb/command_deck_download.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download.proto
rename to common/pb/command_deck_download.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list.proto b/common/pb/command_deck_list.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list.proto
rename to common/pb/command_deck_list.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_new_dir.proto b/common/pb/command_deck_new_dir.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_new_dir.proto
rename to common/pb/command_deck_new_dir.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_select.proto b/common/pb/command_deck_select.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_select.proto
rename to common/pb/command_deck_select.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto b/common/pb/command_deck_upload.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto
rename to common/pb/command_deck_upload.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_del_counter.proto b/common/pb/command_del_counter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_del_counter.proto
rename to common/pb/command_del_counter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_delete_arrow.proto b/common/pb/command_delete_arrow.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_delete_arrow.proto
rename to common/pb/command_delete_arrow.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_draw_cards.proto b/common/pb/command_draw_cards.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_draw_cards.proto
rename to common/pb/command_draw_cards.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_dump_zone.proto b/common/pb/command_dump_zone.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_dump_zone.proto
rename to common/pb/command_dump_zone.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_flip_card.proto b/common/pb/command_flip_card.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_flip_card.proto
rename to common/pb/command_flip_card.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_game_say.proto b/common/pb/command_game_say.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_game_say.proto
rename to common/pb/command_game_say.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_card_counter.proto b/common/pb/command_inc_card_counter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_card_counter.proto
rename to common/pb/command_inc_card_counter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_counter.proto b/common/pb/command_inc_counter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_inc_counter.proto
rename to common/pb/command_inc_counter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_kick_from_game.proto b/common/pb/command_kick_from_game.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_kick_from_game.proto
rename to common/pb/command_kick_from_game.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_leave_game.proto b/common/pb/command_leave_game.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_leave_game.proto
rename to common/pb/command_leave_game.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto b/common/pb/command_move_card.proto
similarity index 89%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto
rename to common/pb/command_move_card.proto
index a5b96da2e..6e9301d27 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto
+++ b/common/pb/command_move_card.proto
@@ -6,9 +6,7 @@ message CardToMove {
     // Id of the card in its current zone
     optional sint32 card_id = 1 [default = -1];
 
-    // If true, places the card face down, hiding its name.
-    // If false, forcibly turns the card face up.
-    // If not set, defers the resulting face down state to the server.
+    // Places the card face down, hiding its name
     optional bool face_down = 2;
 
     // When moving add this value to the power/toughness field of the card
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_mulligan.proto b/common/pb/command_mulligan.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_mulligan.proto
rename to common/pb/command_mulligan.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_next_turn.proto b/common/pb/command_next_turn.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_next_turn.proto
rename to common/pb/command_next_turn.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_ready_start.proto b/common/pb/command_ready_start.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_ready_start.proto
rename to common/pb/command_ready_start.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_delete_match.proto b/common/pb/command_replay_delete_match.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_delete_match.proto
rename to common/pb/command_replay_delete_match.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_download.proto b/common/pb/command_replay_download.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_download.proto
rename to common/pb/command_replay_download.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_get_code.proto b/common/pb/command_replay_get_code.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_get_code.proto
rename to common/pb/command_replay_get_code.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_list.proto b/common/pb/command_replay_list.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_list.proto
rename to common/pb/command_replay_list.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_modify_match.proto b/common/pb/command_replay_modify_match.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_modify_match.proto
rename to common/pb/command_replay_modify_match.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_submit_code.proto b/common/pb/command_replay_submit_code.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_submit_code.proto
rename to common/pb/command_replay_submit_code.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_reveal_cards.proto b/common/pb/command_reveal_cards.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_reveal_cards.proto
rename to common/pb/command_reveal_cards.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_reverse_turn.proto b/common/pb/command_reverse_turn.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_reverse_turn.proto
rename to common/pb/command_reverse_turn.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_roll_die.proto b/common/pb/command_roll_die.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_roll_die.proto
rename to common/pb/command_roll_die.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_active_phase.proto b/common/pb/command_set_active_phase.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_set_active_phase.proto
rename to common/pb/command_set_active_phase.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_attr.proto b/common/pb/command_set_card_attr.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_attr.proto
rename to common/pb/command_set_card_attr.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_counter.proto b/common/pb/command_set_card_counter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_set_card_counter.proto
rename to common/pb/command_set_card_counter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_counter.proto b/common/pb/command_set_counter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_set_counter.proto
rename to common/pb/command_set_counter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_lock.proto b/common/pb/command_set_sideboard_lock.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_lock.proto
rename to common/pb/command_set_sideboard_lock.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_plan.proto b/common/pb/command_set_sideboard_plan.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_set_sideboard_plan.proto
rename to common/pb/command_set_sideboard_plan.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_shuffle.proto b/common/pb/command_shuffle.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_shuffle.proto
rename to common/pb/command_shuffle.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_undo_draw.proto b/common/pb/command_undo_draw.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/command_undo_draw.proto
rename to common/pb/command_undo_draw.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto b/common/pb/commands.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto
rename to common/pb/commands.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/context_concede.proto b/common/pb/context_concede.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/context_concede.proto
rename to common/pb/context_concede.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/context_connection_state_changed.proto b/common/pb/context_connection_state_changed.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/context_connection_state_changed.proto
rename to common/pb/context_connection_state_changed.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/context_deck_select.proto b/common/pb/context_deck_select.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/context_deck_select.proto
rename to common/pb/context_deck_select.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/context_move_card.proto b/common/pb/context_move_card.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/context_move_card.proto
rename to common/pb/context_move_card.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/context_mulligan.proto b/common/pb/context_mulligan.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/context_mulligan.proto
rename to common/pb/context_mulligan.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/context_ping_changed.proto b/common/pb/context_ping_changed.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/context_ping_changed.proto
rename to common/pb/context_ping_changed.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/context_ready_start.proto b/common/pb/context_ready_start.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/context_ready_start.proto
rename to common/pb/context_ready_start.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/context_set_sideboard_lock.proto b/common/pb/context_set_sideboard_lock.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/context_set_sideboard_lock.proto
rename to common/pb/context_set_sideboard_lock.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/context_undo_draw.proto b/common/pb/context_undo_draw.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/context_undo_draw.proto
rename to common/pb/context_undo_draw.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_add_to_list.proto b/common/pb/event_add_to_list.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_add_to_list.proto
rename to common/pb/event_add_to_list.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_attach_card.proto b/common/pb/event_attach_card.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_attach_card.proto
rename to common/pb/event_attach_card.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_change_zone_properties.proto b/common/pb/event_change_zone_properties.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_change_zone_properties.proto
rename to common/pb/event_change_zone_properties.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_connection_closed.proto b/common/pb/event_connection_closed.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_connection_closed.proto
rename to common/pb/event_connection_closed.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_create_arrow.proto b/common/pb/event_create_arrow.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_create_arrow.proto
rename to common/pb/event_create_arrow.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_create_counter.proto b/common/pb/event_create_counter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_create_counter.proto
rename to common/pb/event_create_counter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_create_token.proto b/common/pb/event_create_token.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_create_token.proto
rename to common/pb/event_create_token.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_del_counter.proto b/common/pb/event_del_counter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_del_counter.proto
rename to common/pb/event_del_counter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_delete_arrow.proto b/common/pb/event_delete_arrow.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_delete_arrow.proto
rename to common/pb/event_delete_arrow.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_destroy_card.proto b/common/pb/event_destroy_card.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_destroy_card.proto
rename to common/pb/event_destroy_card.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_draw_cards.proto b/common/pb/event_draw_cards.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_draw_cards.proto
rename to common/pb/event_draw_cards.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_dump_zone.proto b/common/pb/event_dump_zone.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_dump_zone.proto
rename to common/pb/event_dump_zone.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_flip_card.proto b/common/pb/event_flip_card.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_flip_card.proto
rename to common/pb/event_flip_card.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_closed.proto b/common/pb/event_game_closed.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_game_closed.proto
rename to common/pb/event_game_closed.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_host_changed.proto b/common/pb/event_game_host_changed.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_game_host_changed.proto
rename to common/pb/event_game_host_changed.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_joined.proto b/common/pb/event_game_joined.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_game_joined.proto
rename to common/pb/event_game_joined.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_say.proto b/common/pb/event_game_say.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_game_say.proto
rename to common/pb/event_game_say.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto b/common/pb/event_game_state_changed.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto
rename to common/pb/event_game_state_changed.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_join.proto b/common/pb/event_join.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_join.proto
rename to common/pb/event_join.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_join_room.proto b/common/pb/event_join_room.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_join_room.proto
rename to common/pb/event_join_room.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_kicked.proto b/common/pb/event_kicked.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_kicked.proto
rename to common/pb/event_kicked.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_leave.proto b/common/pb/event_leave.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_leave.proto
rename to common/pb/event_leave.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_leave_room.proto b/common/pb/event_leave_room.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_leave_room.proto
rename to common/pb/event_leave_room.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_list_games.proto b/common/pb/event_list_games.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_list_games.proto
rename to common/pb/event_list_games.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_list_rooms.proto b/common/pb/event_list_rooms.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_list_rooms.proto
rename to common/pb/event_list_rooms.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_move_card.proto b/common/pb/event_move_card.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_move_card.proto
rename to common/pb/event_move_card.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_notify_user.proto b/common/pb/event_notify_user.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_notify_user.proto
rename to common/pb/event_notify_user.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_player_properties_changed.proto b/common/pb/event_player_properties_changed.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_player_properties_changed.proto
rename to common/pb/event_player_properties_changed.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_from_list.proto b/common/pb/event_remove_from_list.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_from_list.proto
rename to common/pb/event_remove_from_list.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_messages.proto b/common/pb/event_remove_messages.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_remove_messages.proto
rename to common/pb/event_remove_messages.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_replay_added.proto b/common/pb/event_replay_added.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_replay_added.proto
rename to common/pb/event_replay_added.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_reveal_cards.proto b/common/pb/event_reveal_cards.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_reveal_cards.proto
rename to common/pb/event_reveal_cards.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_reverse_turn.proto b/common/pb/event_reverse_turn.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_reverse_turn.proto
rename to common/pb/event_reverse_turn.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_roll_die.proto b/common/pb/event_roll_die.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_roll_die.proto
rename to common/pb/event_roll_die.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_room_say.proto b/common/pb/event_room_say.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_room_say.proto
rename to common/pb/event_room_say.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_complete_list.proto b/common/pb/event_server_complete_list.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_server_complete_list.proto
rename to common/pb/event_server_complete_list.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_identification.proto b/common/pb/event_server_identification.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_server_identification.proto
rename to common/pb/event_server_identification.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_message.proto b/common/pb/event_server_message.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_server_message.proto
rename to common/pb/event_server_message.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_server_shutdown.proto b/common/pb/event_server_shutdown.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_server_shutdown.proto
rename to common/pb/event_server_shutdown.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_phase.proto b/common/pb/event_set_active_phase.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_phase.proto
rename to common/pb/event_set_active_phase.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_player.proto b/common/pb/event_set_active_player.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_set_active_player.proto
rename to common/pb/event_set_active_player.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_attr.proto b/common/pb/event_set_card_attr.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_attr.proto
rename to common/pb/event_set_card_attr.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_counter.proto b/common/pb/event_set_card_counter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_set_card_counter.proto
rename to common/pb/event_set_card_counter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_set_counter.proto b/common/pb/event_set_counter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_set_counter.proto
rename to common/pb/event_set_counter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_shuffle.proto b/common/pb/event_shuffle.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_shuffle.proto
rename to common/pb/event_shuffle.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_user_joined.proto b/common/pb/event_user_joined.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_user_joined.proto
rename to common/pb/event_user_joined.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_user_left.proto b/common/pb/event_user_left.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_user_left.proto
rename to common/pb/event_user_left.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_user_message.proto b/common/pb/event_user_message.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/event_user_message.proto
rename to common/pb/event_user_message.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto b/common/pb/game_commands.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto
rename to common/pb/game_commands.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto b/common/pb/game_event.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto
rename to common/pb/game_event.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event_container.proto b/common/pb/game_event_container.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/game_event_container.proto
rename to common/pb/game_event_container.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event_context.proto b/common/pb/game_event_context.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/game_event_context.proto
rename to common/pb/game_event_context.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_replay.proto b/common/pb/game_replay.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/game_replay.proto
rename to common/pb/game_replay.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/isl_message.proto b/common/pb/isl_message.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/isl_message.proto
rename to common/pb/isl_message.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto b/common/pb/moderator_commands.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto
rename to common/pb/moderator_commands.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/move_card_to_zone.proto b/common/pb/move_card_to_zone.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/move_card_to_zone.proto
rename to common/pb/move_card_to_zone.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto b/common/pb/response.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response.proto
rename to common/pb/response.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_activate.proto b/common/pb/response_activate.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_activate.proto
rename to common/pb/response_activate.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_adjust_mod.proto b/common/pb/response_adjust_mod.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_adjust_mod.proto
rename to common/pb/response_adjust_mod.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_ban_history.proto b/common/pb/response_ban_history.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_ban_history.proto
rename to common/pb/response_ban_history.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_download.proto b/common/pb/response_deck_download.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_download.proto
rename to common/pb/response_deck_download.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_list.proto b/common/pb/response_deck_list.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_list.proto
rename to common/pb/response_deck_list.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_upload.proto b/common/pb/response_deck_upload.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_upload.proto
rename to common/pb/response_deck_upload.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_dump_zone.proto b/common/pb/response_dump_zone.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_dump_zone.proto
rename to common/pb/response_dump_zone.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_forgotpasswordrequest.proto b/common/pb/response_forgotpasswordrequest.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_forgotpasswordrequest.proto
rename to common/pb/response_forgotpasswordrequest.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_admin_notes.proto b/common/pb/response_get_admin_notes.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_get_admin_notes.proto
rename to common/pb/response_get_admin_notes.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_games_of_user.proto b/common/pb/response_get_games_of_user.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_get_games_of_user.proto
rename to common/pb/response_get_games_of_user.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_user_info.proto b/common/pb/response_get_user_info.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_get_user_info.proto
rename to common/pb/response_get_user_info.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_join_room.proto b/common/pb/response_join_room.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_join_room.proto
rename to common/pb/response_join_room.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_list_users.proto b/common/pb/response_list_users.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_list_users.proto
rename to common/pb/response_list_users.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_login.proto b/common/pb/response_login.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_login.proto
rename to common/pb/response_login.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_password_salt.proto b/common/pb/response_password_salt.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_password_salt.proto
rename to common/pb/response_password_salt.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_register.proto b/common/pb/response_register.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_register.proto
rename to common/pb/response_register.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_download.proto b/common/pb/response_replay_download.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_download.proto
rename to common/pb/response_replay_download.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_get_code.proto b/common/pb/response_replay_get_code.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_get_code.proto
rename to common/pb/response_replay_get_code.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_list.proto b/common/pb/response_replay_list.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_list.proto
rename to common/pb/response_replay_list.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto b/common/pb/response_viewlog_history.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto
rename to common/pb/response_viewlog_history.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_history.proto b/common/pb/response_warn_history.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_history.proto
rename to common/pb/response_warn_history.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_list.proto b/common/pb/response_warn_list.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_list.proto
rename to common/pb/response_warn_list.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto b/common/pb/room_commands.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto
rename to common/pb/room_commands.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/room_event.proto b/common/pb/room_event.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/room_event.proto
rename to common/pb/room_event.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/server_message.proto b/common/pb/server_message.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/server_message.proto
rename to common/pb/server_message.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_arrow.proto b/common/pb/serverinfo_arrow.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_arrow.proto
rename to common/pb/serverinfo_arrow.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_ban.proto b/common/pb/serverinfo_ban.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_ban.proto
rename to common/pb/serverinfo_ban.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_card.proto b/common/pb/serverinfo_card.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_card.proto
rename to common/pb/serverinfo_card.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_cardcounter.proto b/common/pb/serverinfo_cardcounter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_cardcounter.proto
rename to common/pb/serverinfo_cardcounter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_chat_message.proto b/common/pb/serverinfo_chat_message.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_chat_message.proto
rename to common/pb/serverinfo_chat_message.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_counter.proto b/common/pb/serverinfo_counter.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_counter.proto
rename to common/pb/serverinfo_counter.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto b/common/pb/serverinfo_deckstorage.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto
rename to common/pb/serverinfo_deckstorage.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto b/common/pb/serverinfo_game.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto
rename to common/pb/serverinfo_game.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_gametype.proto b/common/pb/serverinfo_gametype.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_gametype.proto
rename to common/pb/serverinfo_gametype.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_player.proto b/common/pb/serverinfo_player.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_player.proto
rename to common/pb/serverinfo_player.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerping.proto b/common/pb/serverinfo_playerping.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerping.proto
rename to common/pb/serverinfo_playerping.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerproperties.proto b/common/pb/serverinfo_playerproperties.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerproperties.proto
rename to common/pb/serverinfo_playerproperties.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay.proto b/common/pb/serverinfo_replay.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay.proto
rename to common/pb/serverinfo_replay.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay_match.proto b/common/pb/serverinfo_replay_match.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_replay_match.proto
rename to common/pb/serverinfo_replay_match.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_room.proto b/common/pb/serverinfo_room.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_room.proto
rename to common/pb/serverinfo_room.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto b/common/pb/serverinfo_user.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto
rename to common/pb/serverinfo_user.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_warning.proto b/common/pb/serverinfo_warning.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_warning.proto
rename to common/pb/serverinfo_warning.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_zone.proto b/common/pb/serverinfo_zone.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_zone.proto
rename to common/pb/serverinfo_zone.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto b/common/pb/session_commands.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto
rename to common/pb/session_commands.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/session_event.proto b/common/pb/session_event.proto
similarity index 100%
rename from libcockatrice_protocol/libcockatrice/protocol/pb/session_event.proto
rename to common/pb/session_event.proto
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp b/common/rng_abstract.cpp
similarity index 100%
rename from libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
rename to common/rng_abstract.cpp
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_abstract.h b/common/rng_abstract.h
similarity index 84%
rename from libcockatrice_rng/libcockatrice/rng/rng_abstract.h
rename to common/rng_abstract.h
index 903e6ef1a..ffd45b9d7 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_abstract.h
+++ b/common/rng_abstract.h
@@ -13,7 +13,7 @@ public:
     }
     virtual unsigned int rand(int min, int max) = 0;
     QVector<int> makeNumbersVector(int n, int min, int max);
-    [[nodiscard]] double testRandom(const QVector<int> &numbers) const;
+    double testRandom(const QVector<int> &numbers) const;
 };
 
 extern RNG_Abstract *rng;
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp b/common/rng_sfmt.cpp
similarity index 100%
rename from libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
rename to common/rng_sfmt.cpp
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h b/common/rng_sfmt.h
similarity index 100%
rename from libcockatrice_rng/libcockatrice/rng/rng_sfmt.h
rename to common/rng_sfmt.h
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/room_message_type.h b/common/room_message_type.h
similarity index 86%
rename from libcockatrice_network/libcockatrice/network/server/remote/room_message_type.h
rename to common/room_message_type.h
index 5559db965..7b7ad9aca 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/room_message_type.h
+++ b/common/room_message_type.h
@@ -6,8 +6,9 @@
 // https://github.com/protocolbuffers/protobuf/issues/119
 #undef TYPE_BOOL
 #endif
+#include "pb/event_room_say.pb.h"
+
 #include <QFlags>
-#include <libcockatrice/protocol/pb/event_room_say.pb.h>
 
 Q_DECLARE_FLAGS(RoomMessageTypeFlags, Event_RoomSay::RoomMessageType)
 Q_DECLARE_OPERATORS_FOR_FLAGS(RoomMessageTypeFlags)
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp b/common/server/game/server_abstract_participant.cpp
similarity index 88%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
rename to common/server/game/server_abstract_participant.cpp
index 493b8e966..1ef765d8b 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
+++ b/common/server/game/server_abstract_participant.cpp
@@ -1,54 +1,91 @@
 #include "server_abstract_participant.h"
 
+#include "../../color.h"
+#include "../../deck_list.h"
+#include "../../deck_list_card_node.h"
+#include "../../get_pb_extension.h"
+#include "../../rng_abstract.h"
+#include "../../trice_limits.h"
 #include "../server.h"
 #include "../server_abstractuserinterface.h"
 #include "../server_database_interface.h"
 #include "../server_room.h"
+#include "pb/command_attach_card.pb.h"
+#include "pb/command_change_zone_properties.pb.h"
+#include "pb/command_concede.pb.h"
+#include "pb/command_create_arrow.pb.h"
+#include "pb/command_create_counter.pb.h"
+#include "pb/command_create_token.pb.h"
+#include "pb/command_deck_select.pb.h"
+#include "pb/command_del_counter.pb.h"
+#include "pb/command_delete_arrow.pb.h"
+#include "pb/command_draw_cards.pb.h"
+#include "pb/command_dump_zone.pb.h"
+#include "pb/command_flip_card.pb.h"
+#include "pb/command_game_say.pb.h"
+#include "pb/command_inc_card_counter.pb.h"
+#include "pb/command_inc_counter.pb.h"
+#include "pb/command_kick_from_game.pb.h"
+#include "pb/command_leave_game.pb.h"
+#include "pb/command_move_card.pb.h"
+#include "pb/command_mulligan.pb.h"
+#include "pb/command_next_turn.pb.h"
+#include "pb/command_ready_start.pb.h"
+#include "pb/command_reveal_cards.pb.h"
+#include "pb/command_reverse_turn.pb.h"
+#include "pb/command_roll_die.pb.h"
+#include "pb/command_set_active_phase.pb.h"
+#include "pb/command_set_card_attr.pb.h"
+#include "pb/command_set_card_counter.pb.h"
+#include "pb/command_set_counter.pb.h"
+#include "pb/command_set_sideboard_lock.pb.h"
+#include "pb/command_set_sideboard_plan.pb.h"
+#include "pb/command_shuffle.pb.h"
+#include "pb/command_undo_draw.pb.h"
+#include "pb/context_concede.pb.h"
+#include "pb/context_connection_state_changed.pb.h"
+#include "pb/context_deck_select.pb.h"
+#include "pb/context_move_card.pb.h"
+#include "pb/context_mulligan.pb.h"
+#include "pb/context_ready_start.pb.h"
+#include "pb/context_set_sideboard_lock.pb.h"
+#include "pb/context_undo_draw.pb.h"
+#include "pb/event_attach_card.pb.h"
+#include "pb/event_change_zone_properties.pb.h"
+#include "pb/event_create_arrow.pb.h"
+#include "pb/event_create_counter.pb.h"
+#include "pb/event_create_token.pb.h"
+#include "pb/event_del_counter.pb.h"
+#include "pb/event_delete_arrow.pb.h"
+#include "pb/event_destroy_card.pb.h"
+#include "pb/event_draw_cards.pb.h"
+#include "pb/event_dump_zone.pb.h"
+#include "pb/event_flip_card.pb.h"
+#include "pb/event_game_say.pb.h"
+#include "pb/event_move_card.pb.h"
+#include "pb/event_player_properties_changed.pb.h"
+#include "pb/event_reveal_cards.pb.h"
+#include "pb/event_reverse_turn.pb.h"
+#include "pb/event_roll_die.pb.h"
+#include "pb/event_set_card_attr.pb.h"
+#include "pb/event_set_card_counter.pb.h"
+#include "pb/event_set_counter.pb.h"
+#include "pb/event_shuffle.pb.h"
+#include "pb/response.pb.h"
+#include "pb/response_deck_download.pb.h"
+#include "pb/response_dump_zone.pb.h"
+#include "pb/serverinfo_player.pb.h"
+#include "pb/serverinfo_user.pb.h"
+#include "server_arrow.h"
 #include "server_card.h"
+#include "server_cardzone.h"
+#include "server_counter.h"
 #include "server_game.h"
 #include "server_player.h"
 
-#include <libcockatrice/protocol/get_pb_extension.h>
-#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
-#include <libcockatrice/protocol/pb/command_concede.pb.h>
-#include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
-#include <libcockatrice/protocol/pb/command_create_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_create_token.pb.h>
-#include <libcockatrice/protocol/pb/command_deck_select.pb.h>
-#include <libcockatrice/protocol/pb/command_del_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
-#include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
-#include <libcockatrice/protocol/pb/command_dump_zone.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_card_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
-#include <libcockatrice/protocol/pb/command_leave_game.pb.h>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
-#include <libcockatrice/protocol/pb/command_mulligan.pb.h>
-#include <libcockatrice/protocol/pb/command_next_turn.pb.h>
-#include <libcockatrice/protocol/pb/command_ready_start.pb.h>
-#include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
-#include <libcockatrice/protocol/pb/command_reverse_turn.pb.h>
-#include <libcockatrice/protocol/pb/command_roll_die.pb.h>
-#include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_set_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
-#include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
-#include <libcockatrice/protocol/pb/command_shuffle.pb.h>
-#include <libcockatrice/protocol/pb/command_undo_draw.pb.h>
-#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_game_say.pb.h>
-#include <libcockatrice/protocol/pb/event_player_properties_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_reverse_turn.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <QDebug>
+#include <QRegularExpression>
+#include <algorithm>
 
 Server_AbstractParticipant::Server_AbstractParticipant(Server_Game *_game,
                                                        int _playerId,
@@ -165,7 +202,7 @@ Server_AbstractParticipant::cmdJudge(const Command_Judge &cmd, ResponseContainer
         return Response::RespFunctionNotAllowed;
     }
 
-    auto *player = this->game->getPlayer(cmd.target_id());
+    Server_Player *player = this->game->getPlayer(cmd.target_id());
 
     ges.setForcedByJudge(playerId);
     if (player == nullptr) {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h b/common/server/game/server_abstract_participant.h
similarity index 97%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
rename to common/server/game/server_abstract_participant.h
index a24fa5799..dcae09741 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
+++ b/common/server/game/server_abstract_participant.h
@@ -1,12 +1,12 @@
 #ifndef ABSTRACT_PARTICIPANT_H
 #define ABSTRACT_PARTICIPANT_H
 
-#include "../serverinfo_user_container.h"
+#include "../../serverinfo_user_container.h"
+#include "pb/card_attributes.pb.h"
+#include "pb/response.pb.h"
 #include "server_arrowtarget.h"
 
 #include <QMutex>
-#include <libcockatrice/protocol/pb/card_attributes.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
 
 class Server_Game;
 class Server_AbstractUserInterface;
@@ -76,7 +76,7 @@ public:
     virtual void prepareDestroy()
     {
         removeFromGame();
-    }
+    };
     void removeFromGame();
     Server_AbstractUserInterface *getUserInterface() const
     {
@@ -89,11 +89,11 @@ public:
     {
         return playerId;
     }
-    bool isSpectator() const
+    bool getSpectator() const
     {
         return spectator;
     }
-    bool isJudge() const
+    bool getJudge() const
     {
         return judge;
     }
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp b/common/server/game/server_arrow.cpp
similarity index 63%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
rename to common/server/game/server_arrow.cpp
index f6787baa2..fe02995d3 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
+++ b/common/server/game/server_arrow.cpp
@@ -1,19 +1,12 @@
 #include "server_arrow.h"
 
+#include "pb/serverinfo_arrow.pb.h"
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_player.h"
 
-#include <libcockatrice/protocol/pb/serverinfo_arrow.pb.h>
-
-Server_Arrow::Server_Arrow(int _id,
-                           Server_Card *_startCard,
-                           Server_ArrowTarget *_targetItem,
-                           const color &_arrowColor,
-                           int _phaseCreated,
-                           int _phaseDeleted)
-    : id(_id), startCard(_startCard), targetItem(_targetItem), arrowColor(_arrowColor), phaseCreated(_phaseCreated),
-      phaseDeleted(_phaseDeleted)
+Server_Arrow::Server_Arrow(int _id, Server_Card *_startCard, Server_ArrowTarget *_targetItem, const color &_arrowColor)
+    : id(_id), startCard(_startCard), targetItem(_targetItem), arrowColor(_arrowColor)
 {
 }
 
@@ -25,7 +18,7 @@ void Server_Arrow::getInfo(ServerInfo_Arrow *info)
     info->set_start_card_id(startCard->getId());
     info->mutable_arrow_color()->CopyFrom(arrowColor);
 
-    auto *targetCard = qobject_cast<Server_Card *>(targetItem);
+    Server_Card *targetCard = qobject_cast<Server_Card *>(targetItem);
     if (targetCard) {
         info->set_target_player_id(targetCard->getZone()->getPlayer()->getPlayerId());
         info->set_target_zone(targetCard->getZone()->getName().toStdString());
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.h b/common/server/game/server_arrow.h
similarity index 62%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.h
rename to common/server/game/server_arrow.h
index 1f302358b..13a6ea2d8 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.h
+++ b/common/server/game/server_arrow.h
@@ -1,7 +1,7 @@
 #ifndef SERVER_ARROW_H
 #define SERVER_ARROW_H
 
-#include <libcockatrice/protocol/pb/color.pb.h>
+#include "pb/color.pb.h"
 
 class Server_Card;
 class Server_ArrowTarget;
@@ -14,15 +14,9 @@ private:
     Server_Card *startCard;
     Server_ArrowTarget *targetItem;
     color arrowColor;
-    int phaseCreated, phaseDeleted;
 
 public:
-    Server_Arrow(int _id,
-                 Server_Card *_startCard,
-                 Server_ArrowTarget *_targetItem,
-                 const color &_arrowColor,
-                 int _phaseCreated,
-                 int _phaseDeleted);
+    Server_Arrow(int _id, Server_Card *_startCard, Server_ArrowTarget *_targetItem, const color &_arrowColor);
     int getId() const
     {
         return id;
@@ -51,10 +45,6 @@ public:
     {
         return arrowColor;
     }
-    bool checkPhaseDeletion(int phase) const // returns true if the arrow should be deleted in this phase
-    {
-        return phase < phaseCreated || phase >= phaseDeleted;
-    }
 
     void getInfo(ServerInfo_Arrow *info);
 };
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.cpp b/common/server/game/server_arrowtarget.cpp
similarity index 100%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.cpp
rename to common/server/game/server_arrowtarget.cpp
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h b/common/server/game/server_arrowtarget.h
similarity index 100%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
rename to common/server/game/server_arrowtarget.h
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp b/common/server/game/server_card.cpp
similarity index 96%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
rename to common/server/game/server_card.cpp
index 86ff2f008..323b4d827 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
+++ b/common/server/game/server_card.cpp
@@ -19,13 +19,13 @@
  ***************************************************************************/
 #include "server_card.h"
 
+#include "pb/event_set_card_attr.pb.h"
+#include "pb/event_set_card_counter.pb.h"
+#include "pb/serverinfo_card.pb.h"
 #include "server_cardzone.h"
 #include "server_player.h"
 
 #include <QVariant>
-#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>
 
 Server_Card::Server_Card(const CardRef &cardRef, int _id, int _coord_x, int _coord_y, Server_CardZone *_zone)
     : zone(_zone), id(_id), coord_x(_coord_x), coord_y(_coord_y), cardRef(cardRef), tapped(false), attacking(false),
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h b/common/server/game/server_card.h
similarity index 97%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
rename to common/server/game/server_card.h
index bc326bbc4..a24be2046 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
+++ b/common/server/game/server_card.h
@@ -20,13 +20,13 @@
 #ifndef SERVER_CARD_H
 #define SERVER_CARD_H
 
+#include "../../card_ref.h"
+#include "pb/card_attributes.pb.h"
+#include "pb/serverinfo_card.pb.h"
 #include "server_arrowtarget.h"
 
 #include <QMap>
 #include <QString>
-#include <libcockatrice/protocol/pb/card_attributes.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
-#include <libcockatrice/utility/card_ref.h>
 
 class Server_CardZone;
 class Event_SetCardCounter;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp b/common/server/game/server_cardzone.cpp
similarity index 97%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
rename to common/server/game/server_cardzone.cpp
index f2a35e548..44b946fa0 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
+++ b/common/server/game/server_cardzone.cpp
@@ -19,15 +19,15 @@
  ***************************************************************************/
 #include "server_cardzone.h"
 
-#include "server_abstract_player.h"
+#include "../rng_abstract.h"
+#include "pb/command_move_card.pb.h"
 #include "server_card.h"
+#include "server_player.h"
 
 #include <QDebug>
 #include <QSet>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
-#include <libcockatrice/rng/rng_abstract.h>
 
-Server_CardZone::Server_CardZone(Server_AbstractPlayer *_player,
+Server_CardZone::Server_CardZone(Server_Player *_player,
                                  const QString &_name,
                                  bool _has_coords,
                                  ServerInfo_Zone::ZoneType _type)
@@ -63,7 +63,11 @@ void Server_CardZone::shuffle(int start, int end)
 
     for (int i = end; i > start; i--) {
         int j = rng->rand(start, i);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
         cards.swapItemsAt(j, i);
+#else
+        cards.swap(j, i);
+#endif
     }
     playersWithWritePermission.clear();
 }
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h b/common/server/game/server_cardzone.h
similarity index 77%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
rename to common/server/game/server_cardzone.h
index 77fea54ca..4c7318f08 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
+++ b/common/server/game/server_cardzone.h
@@ -20,13 +20,15 @@
 #ifndef SERVER_CARDZONE_H
 #define SERVER_CARDZONE_H
 
+#include "pb/serverinfo_zone.pb.h"
+
+#include <QList>
 #include <QMap>
 #include <QSet>
 #include <QString>
-#include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
 
 class Server_Card;
-class Server_AbstractPlayer;
+class Server_Player;
 class Server_AbstractParticipant;
 class Server_Game;
 class GameEventStorage;
@@ -34,7 +36,7 @@ class GameEventStorage;
 class Server_CardZone
 {
 private:
-    Server_AbstractPlayer *player;
+    Server_Player *player;
     QString name;
     bool has_coords; // having coords means this zone has x and y coordinates
     ServerInfo_Zone::ZoneType type;
@@ -50,13 +52,10 @@ private:
     void insertCardIntoCoordMap(Server_Card *card, int x, int y);
 
 public:
-    Server_CardZone(Server_AbstractPlayer *_player,
-                    const QString &_name,
-                    bool _has_coords,
-                    ServerInfo_Zone::ZoneType _type);
+    Server_CardZone(Server_Player *_player, const QString &_name, bool _has_coords, ServerInfo_Zone::ZoneType _type);
     ~Server_CardZone();
 
-    [[nodiscard]] const QList<Server_Card *> &getCards() const
+    const QList<Server_Card *> &getCards() const
     {
         return cards;
     }
@@ -64,7 +63,7 @@ public:
     int removeCard(Server_Card *card, bool &wasLookedAt);
     Server_Card *getCard(int id, int *position = nullptr, bool remove = false);
 
-    [[nodiscard]] int getCardsBeingLookedAt() const
+    int getCardsBeingLookedAt() const
     {
         return cardsBeingLookedAt;
     }
@@ -72,28 +71,28 @@ public:
     {
         cardsBeingLookedAt = qMax(0, _cardsBeingLookedAt);
     }
-    [[nodiscard]] bool isCardAtPosLookedAt(int pos) const;
-    [[nodiscard]] bool hasCoords() const
+    bool isCardAtPosLookedAt(int pos) const;
+    bool hasCoords() const
     {
         return has_coords;
     }
-    [[nodiscard]] ServerInfo_Zone::ZoneType getType() const
+    ServerInfo_Zone::ZoneType getType() const
     {
         return type;
     }
-    [[nodiscard]] QString getName() const
+    QString getName() const
     {
         return name;
     }
-    [[nodiscard]] Server_AbstractPlayer *getPlayer() const
+    Server_Player *getPlayer() const
     {
         return player;
     }
     void getInfo(ServerInfo_Zone *info, Server_AbstractParticipant *recipient, bool omniscient);
 
-    [[nodiscard]] int getFreeGridColumn(int x, int y, const QString &cardName, bool dontStackSameName) const;
-    [[nodiscard]] bool isColumnEmpty(int x, int y) const;
-    [[nodiscard]] bool isColumnStacked(int x, int y) const;
+    int getFreeGridColumn(int x, int y, const QString &cardName, bool dontStackSameName) const;
+    bool isColumnEmpty(int x, int y) const;
+    bool isColumnStacked(int x, int y) const;
     void fixFreeSpaces(GameEventStorage &ges);
     void moveCardInRow(GameEventStorage &ges, Server_Card *card, int x, int y);
     void insertCard(Server_Card *card, int x, int y);
@@ -101,11 +100,11 @@ public:
     void shuffle(int start = 0, int end = -1);
     void clear();
     void addWritePermission(int playerId);
-    [[nodiscard]] const QSet<int> &getPlayersWithWritePermission() const
+    const QSet<int> &getPlayersWithWritePermission() const
     {
         return playersWithWritePermission;
     }
-    [[nodiscard]] bool getAlwaysRevealTopCard() const
+    bool getAlwaysRevealTopCard() const
     {
         return alwaysRevealTopCard;
     }
@@ -113,7 +112,7 @@ public:
     {
         alwaysRevealTopCard = _alwaysRevealTopCard;
     }
-    [[nodiscard]] bool getAlwaysLookAtTopCard() const
+    bool getAlwaysLookAtTopCard() const
     {
         return alwaysLookAtTopCard;
     }
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp b/common/server/game/server_counter.cpp
similarity index 88%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
rename to common/server/game/server_counter.cpp
index b18e11c2b..3dc5c6d66 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
+++ b/common/server/game/server_counter.cpp
@@ -1,6 +1,6 @@
 #include "server_counter.h"
 
-#include <libcockatrice/protocol/pb/serverinfo_counter.pb.h>
+#include "pb/serverinfo_counter.pb.h"
 
 Server_Counter::Server_Counter(int _id, const QString &_name, const color &_counterColor, int _radius, int _count)
     : id(_id), name(_name), counterColor(_counterColor), radius(_radius), count(_count)
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h b/common/server/game/server_counter.h
similarity index 97%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h
rename to common/server/game/server_counter.h
index 55aad991c..3a5f837ae 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h
+++ b/common/server/game/server_counter.h
@@ -20,8 +20,9 @@
 #ifndef SERVER_COUNTER_H
 #define SERVER_COUNTER_H
 
+#include "pb/color.pb.h"
+
 #include <QString>
-#include <libcockatrice/protocol/pb/color.pb.h>
 
 class ServerInfo_Counter;
 
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp b/common/server/game/server_game.cpp
similarity index 82%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
rename to common/server/game/server_game.cpp
index 2224ddb13..eb064d878 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
+++ b/common/server/game/server_game.cpp
@@ -19,12 +19,28 @@
  ***************************************************************************/
 #include "server_game.h"
 
+#include "../../deck_list.h"
 #include "../server.h"
 #include "../server_database_interface.h"
 #include "../server_protocolhandler.h"
 #include "../server_room.h"
-#include "libcockatrice/protocol/pb/command_move_card.pb.h"
-#include "server_abstract_player.h"
+#include "pb/context_connection_state_changed.pb.h"
+#include "pb/context_deck_select.pb.h"
+#include "pb/context_ping_changed.pb.h"
+#include "pb/event_delete_arrow.pb.h"
+#include "pb/event_game_closed.pb.h"
+#include "pb/event_game_host_changed.pb.h"
+#include "pb/event_game_joined.pb.h"
+#include "pb/event_game_state_changed.pb.h"
+#include "pb/event_join.pb.h"
+#include "pb/event_kicked.pb.h"
+#include "pb/event_leave.pb.h"
+#include "pb/event_player_properties_changed.pb.h"
+#include "pb/event_replay_added.pb.h"
+#include "pb/event_set_active_phase.pb.h"
+#include "pb/event_set_active_player.pb.h"
+#include "pb/game_replay.pb.h"
+#include "pb/serverinfo_playerping.pb.h"
 #include "server_arrow.h"
 #include "server_card.h"
 #include "server_cardzone.h"
@@ -32,26 +48,8 @@
 #include "server_spectator.h"
 
 #include <QDebug>
-#include <QRegularExpression>
 #include <QTimer>
 #include <google/protobuf/descriptor.h>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
-#include <libcockatrice/protocol/pb/context_ping_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_delete_arrow.pb.h>
-#include <libcockatrice/protocol/pb/event_game_closed.pb.h>
-#include <libcockatrice/protocol/pb/event_game_host_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
-#include <libcockatrice/protocol/pb/event_game_state_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_join.pb.h>
-#include <libcockatrice/protocol/pb/event_kicked.pb.h>
-#include <libcockatrice/protocol/pb/event_leave.pb.h>
-#include <libcockatrice/protocol/pb/event_player_properties_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_replay_added.pb.h>
-#include <libcockatrice/protocol/pb/event_set_active_phase.pb.h>
-#include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
-#include <libcockatrice/protocol/pb/game_replay.pb.h>
-#include <libcockatrice/utility/zone_names.h>
 
 Server_Game::Server_Game(const ServerInfo_User &_creatorInfo,
                          int _gameId,
@@ -76,7 +74,11 @@ Server_Game::Server_Game(const ServerInfo_User &_creatorInfo,
       spectatorsSeeEverything(_spectatorsSeeEverything), startingLifeTotal(_startingLifeTotal),
       shareDecklistsOnLoad(_shareDecklistsOnLoad), inactivityCounter(0), startTimeOfThisGame(0), secondsElapsed(0),
       firstGameStarted(false), turnOrderReversed(false), startTime(QDateTime::currentDateTime()), pingClock(nullptr),
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
       gameMutex()
+#else
+      gameMutex(QMutex::Recursive)
+#endif
 {
     currentReplay = new GameReplay;
     currentReplay->set_replay_id(room->getServer()->getDatabaseInterface()->getNextReplayId());
@@ -192,7 +194,7 @@ void Server_Game::pingClockTimeout()
         if (participant == nullptr)
             continue;
 
-        if (!participant->isSpectator()) {
+        if (!participant->getSpectator()) {
             ++playerCount;
         }
 
@@ -203,7 +205,7 @@ void Server_Game::pingClockTimeout()
         }
 
         if ((participant->getPingTime() != -1) &&
-            (!participant->isSpectator() || participant->getPlayerId() == hostId)) {
+            (!participant->getSpectator() || participant->getPlayerId() == hostId)) {
             allPlayersInactive = false;
         }
     }
@@ -219,24 +221,24 @@ void Server_Game::pingClockTimeout()
     }
 }
 
-QMap<int, Server_AbstractPlayer *> Server_Game::getPlayers() const // copies pointers to new map
+QMap<int, Server_Player *> Server_Game::getPlayers() const // copies pointers to new map
 {
-    QMap<int, Server_AbstractPlayer *> players;
+    QMap<int, Server_Player *> players;
     QMutexLocker locker(&gameMutex);
     for (int id : participants.keys()) {
         auto *participant = participants[id];
-        if (!participant->isSpectator()) {
-            players[id] = static_cast<Server_AbstractPlayer *>(participant);
+        if (!participant->getSpectator()) {
+            players[id] = static_cast<Server_Player *>(participant);
         }
     }
     return players;
 }
 
-Server_AbstractPlayer *Server_Game::getPlayer(int id) const
+Server_Player *Server_Game::getPlayer(int id) const
 {
     auto *participant = participants.value(id);
-    if (participant && !participant->isSpectator()) {
-        return static_cast<Server_AbstractPlayer *>(participant);
+    if (!participant->getSpectator()) {
+        return static_cast<Server_Player *>(participant);
     } else {
         return nullptr;
     }
@@ -253,7 +255,7 @@ int Server_Game::getSpectatorCount() const
 
     int result = 0;
     for (Server_AbstractParticipant *participant : participants.values()) {
-        if (participant->isSpectator())
+        if (participant->getSpectator())
             ++result;
     }
     return result;
@@ -298,8 +300,8 @@ void Server_Game::sendGameStateToPlayers()
     // send game state info to clients according to their role in the game
     for (auto *participant : participants.values()) {
         GameEventContainer *gec;
-        if (participant->isSpectator()) {
-            if (spectatorsSeeEverything || participant->isJudge()) {
+        if (participant->getSpectator()) {
+            if (spectatorsSeeEverything || participant->getJudge()) {
                 gec = prepareGameEvent(omniscientEvent, -1);
             } else {
                 gec = prepareGameEvent(spectatorNormalEvent, -1);
@@ -337,8 +339,7 @@ void Server_Game::doStartGameIfReady(bool forceStartGame)
         }
     }
 
-    players = getPlayers(); // players could have been kicked, get new list of players
-    for (Server_AbstractPlayer *player : players.values()) {
+    for (Server_Player *player : players.values()) {
         player->setupZones();
     }
 
@@ -500,7 +501,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
+        // FIXME: transferring host to spectators has side effects
         if (newParticipant->getUserInfo()->name() == creatorInfo->name()) {
             hostId = newParticipant->getPlayerId();
             sendGameEventContainer(prepareGameEvent(Event_GameHostChanged(), hostId));
@@ -530,10 +531,10 @@ void Server_Game::removeParticipant(Server_AbstractParticipant *participant, Eve
                                               gameId, participant->getPlayerId());
     participants.remove(participant->getPlayerId());
 
-    bool spectator = participant->isSpectator();
+    bool spectator = participant->getSpectator();
     GameEventStorage ges;
     if (!spectator) {
-        auto *player = static_cast<Server_AbstractPlayer *>(participant);
+        auto *player = static_cast<Server_Player *>(participant);
         removeArrowsRelatedToPlayer(ges, player);
         unattachCards(ges, player);
     }
@@ -576,39 +577,40 @@ void Server_Game::removeParticipant(Server_AbstractParticipant *participant, Eve
     emit gameInfoChanged(gameInfo);
 }
 
-void Server_Game::removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_AbstractPlayer *player)
+void Server_Game::removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Player *player)
 {
     QMutexLocker locker(&gameMutex);
 
     // Remove all arrows of other players pointing to the player being removed or to one of his cards.
     // Also remove all arrows starting at one of his cards. This is necessary since players can create
     // arrows that start at another person's cards.
-    for (Server_AbstractPlayer *anyPlayer : getPlayers().values()) {
+    for (Server_Player *anyPlayer : getPlayers().values()) {
+        QList<Server_Arrow *> arrows = anyPlayer->getArrows().values();
         QList<Server_Arrow *> toDelete;
-        for (auto *arrow : anyPlayer->getArrows().values()) {
-            auto *targetCard = qobject_cast<Server_Card *>(arrow->getTargetItem());
+        for (int i = 0; i < arrows.size(); ++i) {
+            Server_Arrow *arrow = arrows[i];
+            Server_Card *targetCard = qobject_cast<Server_Card *>(arrow->getTargetItem());
             if (targetCard) {
                 if (targetCard->getZone() != nullptr && targetCard->getZone()->getPlayer() == player)
                     toDelete.append(arrow);
-            } else if (arrow->getTargetItem() == player) {
+            } else if (static_cast<Server_Player *>(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)
                 toDelete.append(arrow);
         }
-        for (auto *arrow : toDelete) {
+        for (int i = 0; i < toDelete.size(); ++i) {
             Event_DeleteArrow event;
-            event.set_arrow_id(arrow->getId());
-            ges.enqueueGameEvent(event, anyPlayer->getPlayerId());
+            event.set_arrow_id(toDelete[i]->getId());
+            ges.enqueueGameEvent(event, player->getPlayerId());
 
-            anyPlayer->deleteArrow(arrow->getId());
+            player->deleteArrow(toDelete[i]->getId());
         }
     }
 }
 
-void Server_Game::unattachCards(GameEventStorage &ges, Server_AbstractPlayer *player)
+void Server_Game::unattachCards(GameEventStorage &ges, Server_Player *player)
 {
     QMutexLocker locker(&gameMutex);
 
@@ -651,8 +653,6 @@ void Server_Game::setActivePlayer(int _activePlayer)
 {
     QMutexLocker locker(&gameMutex);
 
-    removeArrows(0, true);
-
     activePlayer = _activePlayer;
 
     Event_SetActivePlayer event;
@@ -662,35 +662,30 @@ void Server_Game::setActivePlayer(int _activePlayer)
     setActivePhase(0);
 }
 
-void Server_Game::setActivePhase(int newPhase)
+void Server_Game::setActivePhase(int _activePhase)
 {
     QMutexLocker locker(&gameMutex);
 
-    removeArrows(newPhase);
-    activePhase = newPhase;
+    for (auto *player : getPlayers().values()) {
+        QList<Server_Arrow *> toDelete = player->getArrows().values();
+        for (int i = 0; i < toDelete.size(); ++i) {
+            Server_Arrow *a = toDelete[i];
+
+            Event_DeleteArrow event;
+            event.set_arrow_id(a->getId());
+            sendGameEventContainer(prepareGameEvent(event, player->getPlayerId()));
+
+            player->deleteArrow(a->getId());
+        }
+    }
+
+    activePhase = _activePhase;
 
     Event_SetActivePhase event;
     event.set_phase(activePhase);
     sendGameEventContainer(prepareGameEvent(event, -1));
 }
 
-void Server_Game::removeArrows(int newPhase, bool force)
-{
-    QMutexLocker locker(&gameMutex);
-
-    for (auto *anyPlayer : getPlayers().values()) {
-        for (auto *arrowToDelete : anyPlayer->getArrows().values()) { // values creates a copy
-            if (force || arrowToDelete->checkPhaseDeletion(newPhase)) {
-                Event_DeleteArrow event;
-                event.set_arrow_id(arrowToDelete->getId());
-                sendGameEventContainer(prepareGameEvent(event, anyPlayer->getPlayerId()));
-
-                anyPlayer->deleteArrow(arrowToDelete->getId());
-            }
-        }
-    }
-}
-
 void Server_Game::nextTurn()
 {
     QMutexLocker locker(&gameMutex);
@@ -731,8 +726,8 @@ void Server_Game::createGameJoinedEvent(Server_AbstractParticipant *joiningParti
     getInfo(*event1.mutable_game_info());
     event1.set_host_id(hostId);
     event1.set_player_id(joiningParticipant->getPlayerId());
-    event1.set_spectator(joiningParticipant->isSpectator());
-    event1.set_judge(joiningParticipant->isJudge());
+    event1.set_spectator(joiningParticipant->getSpectator());
+    event1.set_judge(joiningParticipant->getJudge());
     event1.set_resuming(resuming);
     if (resuming) {
         const QStringList &allGameTypes = room->getGameTypes();
@@ -750,7 +745,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->getSpectator() && (spectatorsSeeEverything || joiningParticipant->getJudge());
     for (auto *participant : participants.values()) {
         participant->getInfo(event2.add_player_list(), joiningParticipant, omniscient, true);
     }
@@ -766,8 +761,9 @@ void Server_Game::sendGameEventContainer(GameEventContainer *cont,
 
     cont->set_game_id(gameId);
     for (auto *participant : participants.values()) {
-        const bool playerPrivate = (participant->getPlayerId() == privatePlayerId) ||
-                                   (participant->isSpectator() && (spectatorsSeeEverything || participant->isJudge()));
+        const bool playerPrivate =
+            (participant->getPlayerId() == privatePlayerId) ||
+            (participant->getSpectator() && (spectatorsSeeEverything || participant->getJudge()));
         if ((recipients.testFlag(GameEventStorageItem::SendToPrivate) && playerPrivate) ||
             (recipients.testFlag(GameEventStorageItem::SendToOthers) && !playerPrivate))
             participant->sendGameEvent(*cont);
@@ -784,7 +780,7 @@ void Server_Game::sendGameEventContainer(GameEventContainer *cont,
 GameEventContainer *
 Server_Game::prepareGameEvent(const ::google::protobuf::Message &gameEvent, int playerId, GameEventContext *context)
 {
-    auto *cont = new GameEventContainer;
+    GameEventContainer *cont = new GameEventContainer;
     cont->set_game_id(gameId);
     if (context)
         cont->mutable_context()->CopyFrom(*context);
@@ -827,46 +823,3 @@ void Server_Game::getInfo(ServerInfo_Game &result) const
         result.set_start_time(startTime.toSecsSinceEpoch());
     }
 }
-
-void Server_Game::returnCardsFromPlayer(GameEventStorage &ges, Server_AbstractPlayer *player)
-{
-    QMutexLocker locker(&gameMutex);
-    // Return cards to their rightful owners before conceding the game
-    static const QRegularExpression ownerRegex{"Owner: ?([^\n]+)"};
-    const auto &playerTable = player->getZones().value(ZoneNames::TABLE);
-    for (const auto &card : playerTable->getCards()) {
-        if (card == nullptr) {
-            continue;
-        }
-
-        const auto &regexResult = ownerRegex.match(card->getAnnotation());
-        if (!regexResult.hasMatch()) {
-            continue;
-        }
-
-        CardToMove cardToMove;
-        cardToMove.set_card_id(card->getId());
-
-        for (const auto *otherPlayer : getPlayers()) {
-            if (otherPlayer == nullptr || otherPlayer->getUserInfo() == nullptr) {
-                continue;
-            }
-
-            const auto &ownerToReturnTo = regexResult.captured(1);
-            const auto &correctOwner = QString::compare(QString::fromStdString(otherPlayer->getUserInfo()->name()),
-                                                        ownerToReturnTo, Qt::CaseInsensitive) == 0;
-            if (!correctOwner) {
-                continue;
-            }
-
-            const auto &targetZone = otherPlayer->getZones().value(ZoneNames::TABLE);
-
-            if (playerTable == nullptr || targetZone == nullptr) {
-                continue;
-            }
-
-            player->moveCard(ges, playerTable, QList<const CardToMove *>() << &cardToMove, targetZone, 0, 0, false);
-            break;
-        }
-    }
-}
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h b/common/server/game/server_game.h
similarity index 91%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
rename to common/server/game/server_game.h
index 1c658f2ba..6bb162763 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
+++ b/common/server/game/server_game.h
@@ -21,6 +21,9 @@
 #define SERVERGAME_H
 
 #include "../server_response_containers.h"
+#include "pb/event_leave.pb.h"
+#include "pb/response.pb.h"
+#include "pb/serverinfo_game.pb.h"
 
 #include <QDateTime>
 #include <QMap>
@@ -28,15 +31,12 @@
 #include <QObject>
 #include <QSet>
 #include <QStringList>
-#include <libcockatrice/protocol/pb/event_leave.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 
 class QTimer;
 class GameEventContainer;
 class GameReplay;
 class Server_Room;
-class Server_AbstractPlayer;
+class Server_Player;
 class Server_AbstractParticipant;
 class ServerInfo_User;
 class ServerInfo_Game;
@@ -90,7 +90,11 @@ private slots:
     void doStartGameIfReady(bool forceStartGame = false);
 
 public:
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     mutable QRecursiveMutex gameMutex;
+#else
+    mutable QMutex gameMutex;
+#endif
     Server_Game(const ServerInfo_User &_creatorInfo,
                 int _gameId,
                 const QString &_description,
@@ -126,8 +130,8 @@ public:
     }
     int getPlayerCount() const;
     int getSpectatorCount() const;
-    QMap<int, Server_AbstractPlayer *> getPlayers() const;
-    Server_AbstractPlayer *getPlayer(int id) const;
+    QMap<int, Server_Player *> getPlayers() const;
+    Server_Player *getPlayer(int id) const;
     const QMap<int, Server_AbstractParticipant *> &getParticipants() const
     {
         return participants;
@@ -181,8 +185,8 @@ public:
                    bool judge,
                    bool broadcastUpdate = true);
     void removeParticipant(Server_AbstractParticipant *participant, Event_Leave::LeaveReason reason);
-    void removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_AbstractPlayer *player);
-    void unattachCards(GameEventStorage &ges, Server_AbstractPlayer *player);
+    void removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Player *player);
+    void unattachCards(GameEventStorage &ges, Server_Player *player);
     bool kickParticipant(int playerId);
     void startGameIfReady(bool forceStartGame);
     void stopGameIfFinished();
@@ -194,9 +198,8 @@ public:
     {
         return activePhase;
     }
-    void setActivePlayer(int newPlayer);
-    void setActivePhase(int newPhase);
-    void removeArrows(int newPhase, bool force = false);
+    void setActivePlayer(int _activePlayer);
+    void setActivePhase(int _activePhase);
     void nextTurn();
     int getSecondsElapsed() const
     {
@@ -218,7 +221,6 @@ public:
                                 GameEventStorageItem::EventRecipients recipients = GameEventStorageItem::SendToPrivate |
                                                                                    GameEventStorageItem::SendToOthers,
                                 int privatePlayerId = -1);
-    void returnCardsFromPlayer(GameEventStorage &ges, Server_AbstractPlayer *player);
 };
 
 #endif
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp b/common/server/game/server_player.cpp
similarity index 54%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
rename to common/server/game/server_player.cpp
index 7c0437bf0..b8b9b7cd5 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
+++ b/common/server/game/server_player.cpp
@@ -1,70 +1,124 @@
-#include "server_abstract_player.h"
+#include "server_player.h"
 
+#include "../../color.h"
+#include "../../deck_list.h"
+#include "../../deck_list_card_node.h"
+#include "../../get_pb_extension.h"
+#include "../../rng_abstract.h"
+#include "../../trice_limits.h"
+#include "../server.h"
+#include "../server_abstractuserinterface.h"
+#include "../server_database_interface.h"
+#include "../server_room.h"
+#include "pb/command_attach_card.pb.h"
+#include "pb/command_change_zone_properties.pb.h"
+#include "pb/command_concede.pb.h"
+#include "pb/command_create_arrow.pb.h"
+#include "pb/command_create_counter.pb.h"
+#include "pb/command_create_token.pb.h"
+#include "pb/command_deck_select.pb.h"
+#include "pb/command_del_counter.pb.h"
+#include "pb/command_delete_arrow.pb.h"
+#include "pb/command_draw_cards.pb.h"
+#include "pb/command_dump_zone.pb.h"
+#include "pb/command_flip_card.pb.h"
+#include "pb/command_game_say.pb.h"
+#include "pb/command_inc_card_counter.pb.h"
+#include "pb/command_inc_counter.pb.h"
+#include "pb/command_kick_from_game.pb.h"
+#include "pb/command_leave_game.pb.h"
+#include "pb/command_move_card.pb.h"
+#include "pb/command_mulligan.pb.h"
+#include "pb/command_next_turn.pb.h"
+#include "pb/command_ready_start.pb.h"
+#include "pb/command_reveal_cards.pb.h"
+#include "pb/command_reverse_turn.pb.h"
+#include "pb/command_roll_die.pb.h"
+#include "pb/command_set_active_phase.pb.h"
+#include "pb/command_set_card_attr.pb.h"
+#include "pb/command_set_card_counter.pb.h"
+#include "pb/command_set_counter.pb.h"
+#include "pb/command_set_sideboard_lock.pb.h"
+#include "pb/command_set_sideboard_plan.pb.h"
+#include "pb/command_shuffle.pb.h"
+#include "pb/command_undo_draw.pb.h"
+#include "pb/context_concede.pb.h"
+#include "pb/context_connection_state_changed.pb.h"
+#include "pb/context_deck_select.pb.h"
+#include "pb/context_move_card.pb.h"
+#include "pb/context_mulligan.pb.h"
+#include "pb/context_ready_start.pb.h"
+#include "pb/context_set_sideboard_lock.pb.h"
+#include "pb/context_undo_draw.pb.h"
+#include "pb/event_attach_card.pb.h"
+#include "pb/event_change_zone_properties.pb.h"
+#include "pb/event_create_arrow.pb.h"
+#include "pb/event_create_counter.pb.h"
+#include "pb/event_create_token.pb.h"
+#include "pb/event_del_counter.pb.h"
+#include "pb/event_delete_arrow.pb.h"
+#include "pb/event_destroy_card.pb.h"
+#include "pb/event_draw_cards.pb.h"
+#include "pb/event_dump_zone.pb.h"
+#include "pb/event_flip_card.pb.h"
+#include "pb/event_game_say.pb.h"
+#include "pb/event_move_card.pb.h"
+#include "pb/event_player_properties_changed.pb.h"
+#include "pb/event_reveal_cards.pb.h"
+#include "pb/event_reverse_turn.pb.h"
+#include "pb/event_roll_die.pb.h"
+#include "pb/event_set_card_attr.pb.h"
+#include "pb/event_set_card_counter.pb.h"
+#include "pb/event_set_counter.pb.h"
+#include "pb/event_shuffle.pb.h"
+#include "pb/response.pb.h"
+#include "pb/response_deck_download.pb.h"
+#include "pb/response_dump_zone.pb.h"
+#include "pb/serverinfo_player.pb.h"
+#include "pb/serverinfo_user.pb.h"
 #include "server_arrow.h"
 #include "server_card.h"
 #include "server_cardzone.h"
+#include "server_counter.h"
 #include "server_game.h"
-#include "server_move_card_struct.h"
 
 #include <QDebug>
 #include <QRegularExpression>
 #include <algorithm>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
-#include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
-#include <libcockatrice/protocol/pb/command_create_token.pb.h>
-#include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
-#include <libcockatrice/protocol/pb/command_dump_zone.pb.h>
-#include <libcockatrice/protocol/pb/command_flip_card.pb.h>
-#include <libcockatrice/protocol/pb/command_inc_card_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
-#include <libcockatrice/protocol/pb/command_ready_start.pb.h>
-#include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
-#include <libcockatrice/protocol/pb/command_roll_die.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
-#include <libcockatrice/protocol/pb/context_concede.pb.h>
-#include <libcockatrice/protocol/pb/context_move_card.pb.h>
-#include <libcockatrice/protocol/pb/context_ready_start.pb.h>
-#include <libcockatrice/protocol/pb/context_undo_draw.pb.h>
-#include <libcockatrice/protocol/pb/event_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/event_change_zone_properties.pb.h>
-#include <libcockatrice/protocol/pb/event_create_arrow.pb.h>
-#include <libcockatrice/protocol/pb/event_create_token.pb.h>
-#include <libcockatrice/protocol/pb/event_delete_arrow.pb.h>
-#include <libcockatrice/protocol/pb/event_destroy_card.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_move_card.pb.h>
-#include <libcockatrice/protocol/pb/event_player_properties_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_reveal_cards.pb.h>
-#include <libcockatrice/protocol/pb/event_roll_die.pb.h>
-#include <libcockatrice/protocol/pb/event_set_card_attr.pb.h>
-#include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/response_dump_zone.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/rng/rng_abstract.h>
-#include <libcockatrice/utility/trice_limits.h>
-#include <libcockatrice/utility/zone_names.h>
-#include <ranges>
 
-Server_AbstractPlayer::Server_AbstractPlayer(Server_Game *_game,
-                                             int _playerId,
-                                             const ServerInfo_User &_userInfo,
-                                             bool _judge,
-                                             Server_AbstractUserInterface *_userInterface)
-    : Server_AbstractParticipant(_game, _playerId, _userInfo, _judge, _userInterface), conceded(false), deck(nullptr),
-      sideboardLocked(true), readyStart(false), nextCardId(0)
+struct MoveCardStruct
+{
+    Server_Card *card;
+    int position;
+    const CardToMove *cardToMove;
+    int xCoord, yCoord;
+    MoveCardStruct(Server_Card *_card, int _position, const CardToMove *_cardToMove)
+        : card(_card), position(_position), cardToMove(_cardToMove), xCoord(_card->getX()), yCoord(_card->getY())
+
+    {
+    }
+    bool operator<(const MoveCardStruct &other) const
+    {
+        return (yCoord == other.yCoord &&
+                ((xCoord == other.xCoord && position < other.position) || xCoord < other.xCoord)) ||
+               yCoord < other.yCoord;
+    }
+};
+
+Server_Player::Server_Player(Server_Game *_game,
+                             int _playerId,
+                             const ServerInfo_User &_userInfo,
+                             bool _judge,
+                             Server_AbstractUserInterface *_userInterface)
+    : Server_AbstractParticipant(_game, _playerId, _userInfo, _judge, _userInterface), deck(nullptr), nextCardId(0),
+      readyStart(false), conceded(false), sideboardLocked(true)
 {
     spectator = false;
 }
 
-Server_AbstractPlayer::~Server_AbstractPlayer() = default;
+Server_Player::~Server_Player() = default;
 
-void Server_AbstractPlayer::prepareDestroy()
+void Server_Player::prepareDestroy()
 {
     delete deck;
     deck = nullptr;
@@ -75,12 +129,25 @@ void Server_AbstractPlayer::prepareDestroy()
     deleteLater();
 }
 
-int Server_AbstractPlayer::newCardId()
+int Server_Player::newCardId()
 {
     return nextCardId++;
 }
 
-int Server_AbstractPlayer::newArrowId() const
+int Server_Player::newCounterId() const
+{
+    int id = 0;
+    QMapIterator<int, Server_Counter *> i(counters);
+    while (i.hasNext()) {
+        Server_Counter *c = i.next().value();
+        if (c->getId() > id) {
+            id = c->getId();
+        }
+    }
+    return id + 1;
+}
+
+int Server_Player::newArrowId() const
 {
     int id = 0;
     for (Server_Arrow *a : arrows) {
@@ -91,41 +158,128 @@ int Server_AbstractPlayer::newArrowId() const
     return id + 1;
 }
 
-void Server_AbstractPlayer::setupZones()
+void Server_Player::setupZones()
 {
+    // This may need to be customized according to the game rules.
+    // ------------------------------------------------------------------
+
+    // Create zones
+    auto *deckZone = new Server_CardZone(this, "deck", false, ServerInfo_Zone::HiddenZone);
+    addZone(deckZone);
+    auto *sbZone = new Server_CardZone(this, "sb", false, ServerInfo_Zone::HiddenZone);
+    addZone(sbZone);
+    addZone(new Server_CardZone(this, "table", true, ServerInfo_Zone::PublicZone));
+    addZone(new Server_CardZone(this, "hand", false, ServerInfo_Zone::PrivateZone));
+    addZone(new Server_CardZone(this, "stack", false, ServerInfo_Zone::PublicZone));
+    addZone(new Server_CardZone(this, "grave", false, ServerInfo_Zone::PublicZone));
+    addZone(new Server_CardZone(this, "rfg", false, ServerInfo_Zone::PublicZone));
+
+    addCounter(new Server_Counter(0, "life", makeColor(255, 255, 255), 25, game->getStartingLifeTotal()));
+    addCounter(new Server_Counter(1, "w", makeColor(255, 255, 150), 20, 0));
+    addCounter(new Server_Counter(2, "u", makeColor(150, 150, 255), 20, 0));
+    addCounter(new Server_Counter(3, "b", makeColor(150, 150, 150), 20, 0));
+    addCounter(new Server_Counter(4, "r", makeColor(250, 150, 150), 20, 0));
+    addCounter(new Server_Counter(5, "g", makeColor(150, 255, 150), 20, 0));
+    addCounter(new Server_Counter(6, "x", makeColor(255, 255, 255), 20, 0));
+    addCounter(new Server_Counter(7, "storm", makeColor(255, 150, 30), 20, 0));
+
+    // ------------------------------------------------------------------
+
+    // Assign card ids and create deck from deck list
+    InnerDecklistNode *listRoot = deck->getRoot();
     nextCardId = 0;
+    for (int i = 0; i < listRoot->size(); ++i) {
+        auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+        Server_CardZone *z;
+        if (currentZone->getName() == DECK_ZONE_MAIN) {
+            z = deckZone;
+        } else if (currentZone->getName() == DECK_ZONE_SIDE) {
+            z = sbZone;
+        } else {
+            continue;
+        }
+
+        for (int j = 0; j < currentZone->size(); ++j) {
+            auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+            if (!currentCard) {
+                continue;
+            }
+            for (int k = 0; k < currentCard->getNumber(); ++k) {
+                z->insertCard(new Server_Card(currentCard->toCardRef(), nextCardId++, 0, 0, z), -1, 0);
+            }
+        }
+    }
+
+    const QList<MoveCard_ToZone> &sideboardPlan = deck->getCurrentSideboardPlan();
+    for (const auto &m : sideboardPlan) {
+        const QString startZone = nameFromStdString(m.start_zone());
+        const QString targetZone = nameFromStdString(m.target_zone());
+
+        Server_CardZone *start, *target;
+        if (startZone == DECK_ZONE_MAIN) {
+            start = deckZone;
+        } else if (startZone == DECK_ZONE_SIDE) {
+            start = sbZone;
+        } else {
+            continue;
+        }
+        if (targetZone == DECK_ZONE_MAIN) {
+            target = deckZone;
+        } else if (targetZone == DECK_ZONE_SIDE) {
+            target = sbZone;
+        } else {
+            continue;
+        }
+
+        for (int j = 0; j < start->getCards().size(); ++j) {
+            if (start->getCards()[j]->getName() == nameFromStdString(m.card_name())) {
+                Server_Card *card = start->getCard(j, nullptr, true);
+                target->insertCard(card, -1, 0);
+                break;
+            }
+        }
+    }
+
+    deckZone->shuffle();
 }
 
-void Server_AbstractPlayer::clearZones()
+void Server_Player::clearZones()
 {
     for (Server_CardZone *zone : zones) {
         delete zone;
     }
     zones.clear();
 
+    for (Server_Counter *counter : counters) {
+        delete counter;
+    }
+    counters.clear();
+
     for (Server_Arrow *arrow : arrows) {
         delete arrow;
     }
     arrows.clear();
+
+    lastDrawList.clear();
 }
 
-void Server_AbstractPlayer::addZone(Server_CardZone *zone)
+void Server_Player::addZone(Server_CardZone *zone)
 {
     zones.insert(zone->getName(), zone);
 }
 
-void Server_AbstractPlayer::addArrow(Server_Arrow *arrow)
+void Server_Player::addArrow(Server_Arrow *arrow)
 {
     arrows.insert(arrow->getId(), arrow);
 }
 
-void Server_AbstractPlayer::updateArrowId(int id)
+void Server_Player::updateArrowId(int id)
 {
     auto *arrow = arrows.take(id);
     arrows.insert(arrow->getId(), arrow);
 }
 
-bool Server_AbstractPlayer::deleteArrow(int arrowId)
+bool Server_Player::deleteArrow(int arrowId)
 {
     Server_Arrow *arrow = arrows.value(arrowId, 0);
     if (!arrow) {
@@ -136,6 +290,76 @@ bool Server_AbstractPlayer::deleteArrow(int arrowId)
     return true;
 }
 
+void Server_Player::addCounter(Server_Counter *counter)
+{
+    counters.insert(counter->getId(), counter);
+}
+
+Response::ResponseCode Server_Player::drawCards(GameEventStorage &ges, int number)
+{
+    Server_CardZone *deckZone = zones.value("deck");
+    Server_CardZone *handZone = zones.value("hand");
+    if (deckZone->getCards().size() < number) {
+        number = deckZone->getCards().size();
+    }
+
+    Event_DrawCards eventOthers;
+    eventOthers.set_number(number);
+    Event_DrawCards eventPrivate(eventOthers);
+
+    for (int i = 0; i < number; ++i) {
+        Server_Card *card = deckZone->getCard(0, nullptr, true);
+        handZone->insertCard(card, -1, 0);
+        lastDrawList.append(card->getId());
+
+        ServerInfo_Card *cardInfo = eventPrivate.add_cards();
+        cardInfo->set_id(card->getId());
+        cardInfo->set_name(card->getName().toStdString());
+        cardInfo->set_provider_id(card->getProviderId().toStdString());
+    }
+
+    ges.enqueueGameEvent(eventPrivate, playerId, GameEventStorageItem::SendToPrivate, playerId);
+    ges.enqueueGameEvent(eventOthers, playerId, GameEventStorageItem::SendToOthers);
+
+    if (number > 0) {
+        revealTopCardIfNeeded(deckZone, ges);
+        int currentKnownCards = deckZone->getCardsBeingLookedAt();
+        deckZone->setCardsBeingLookedAt(currentKnownCards - number);
+    }
+
+    return Response::RespOk;
+}
+
+void Server_Player::revealTopCardIfNeeded(Server_CardZone *zone, GameEventStorage &ges)
+{
+    if (zone->getCards().isEmpty()) {
+        return;
+    }
+    if (zone->getAlwaysRevealTopCard()) {
+        Event_RevealCards revealEvent;
+        revealEvent.set_zone_name(zone->getName().toStdString());
+        revealEvent.add_card_id(0);
+        zone->getCards().first()->getInfo(revealEvent.add_cards());
+
+        ges.enqueueGameEvent(revealEvent, playerId);
+        return;
+    }
+    if (zone->getAlwaysLookAtTopCard()) {
+        Event_DumpZone dumpEvent;
+        dumpEvent.set_zone_owner_id(playerId);
+        dumpEvent.set_zone_name(zone->getName().toStdString());
+        dumpEvent.set_number_cards(1);
+        ges.enqueueGameEvent(dumpEvent, playerId, GameEventStorageItem::SendToOthers);
+
+        Event_RevealCards revealEvent;
+        revealEvent.set_zone_name(zone->getName().toStdString());
+        revealEvent.set_number_of_cards(1);
+        revealEvent.add_card_id(0);
+        zone->getCards().first()->getInfo(revealEvent.add_cards());
+        ges.enqueueGameEvent(revealEvent, playerId, GameEventStorageItem::SendToPrivate, playerId);
+    }
+}
+
 /**
  * Creates the create token event.
  * By default, will set event's name and color fields to empty if the token is face-down
@@ -161,7 +385,6 @@ makeCreateTokenEvent(Server_CardZone *zone, Server_Card *card, int xCoord, int y
     event.set_y(yCoord);
     return event;
 }
-
 static Event_AttachCard makeAttachCardEvent(Server_Card *attachedCard, Server_Card *parentCard = nullptr)
 {
     Event_AttachCard event;
@@ -192,83 +415,23 @@ shouldDestroyOnMove(const Server_Card *card, const Server_CardZone *startZone, c
     }
 
     // Allow tokens on the stack
-    if ((startZone->getName() == ZoneNames::TABLE || startZone->getName() == ZoneNames::STACK) &&
-        (targetZone->getName() == ZoneNames::TABLE || targetZone->getName() == ZoneNames::STACK)) {
+    if ((startZone->getName() == "table" || startZone->getName() == "stack") &&
+        (targetZone->getName() == "table" || targetZone->getName() == "stack")) {
         return false;
     }
 
     return true;
 }
 
-/**
- * @brief Determines whether the moved card should be face-down
- */
-static bool
-shouldBeFaceDown(const MoveCardStruct &cardStruct, const Server_CardZone *startZone, const Server_CardZone *targetZone)
-{
-    if (!targetZone) {
-        return false;
-    }
-
-    // being face-down only makes sense for public zones
-    if (targetZone->getType() != ServerInfo_Zone::PublicZone) {
-        return false;
-    }
-
-    // face-down property in proto takes precedence
-    if (cardStruct.cardToMove->has_face_down()) {
-        return cardStruct.cardToMove->face_down();
-    }
-
-    // Default to keep face-down the same if zone didn't change.
-    // Compare using zone names because face-down is maintained when changing controllers.
-    if (startZone && startZone->getName() == targetZone->getName()) {
-        return cardStruct.card->getFaceDown();
-    }
-
-    return false;
-}
-
-/**
- * @brief Determines whether a set of moved cards is from the bottom of the deck
- */
-static bool shouldBeFromTheBottom(const Server_CardZone *startZone, const std::set<MoveCardStruct> &cardsToMove)
-{
-    if (!startZone) {
-        return false;
-    }
-
-    if (startZone->getName() != ZoneNames::DECK) {
-        return false;
-    }
-
-    int movedCount = static_cast<int>(cardsToMove.size());
-    int tailStart = startZone->getCards().size() - movedCount;
-    if (tailStart <= 0) { // if the entire deck is moved it should not be considered from the bottom
-        return false;
-    }
-
-    // check if the move is a contiguous block at the end of the deck, fail fast when not
-    int expectedPosition = tailStart;
-    for (const auto &card : cardsToMove) {
-        if (card.position != expectedPosition) {
-            return false;
-        }
-        ++expectedPosition;
-    }
-
-    return true;
-}
-
-Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
-                                                       Server_CardZone *startzone,
-                                                       const QList<const CardToMove *> &_cards,
-                                                       Server_CardZone *targetzone,
-                                                       int xCoord,
-                                                       int yCoord,
-                                                       bool fixFreeSpaces,
-                                                       bool undoingDraw,
-                                                       bool isReversed)
+Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
+                                               Server_CardZone *startzone,
+                                               const QList<const CardToMove *> &_cards,
+                                               Server_CardZone *targetzone,
+                                               int xCoord,
+                                               int yCoord,
+                                               bool fixFreeSpaces,
+                                               bool undoingDraw,
+                                               bool isReversed)
 {
     // Disallow controller change to other zones than the table.
     if (((targetzone->getType() != ServerInfo_Zone::PublicZone) || !targetzone->hasCoords()) &&
@@ -276,11 +439,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;
@@ -300,7 +460,7 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
         }
 
         // do not allow attached cards to move around on the table
-        if (card->getParentCard() && targetzone->getName() == ZoneNames::TABLE) {
+        if (card->getParentCard() && targetzone->getName() == "table") {
             continue;
         }
 
@@ -320,21 +480,196 @@ 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;
+        const CardToMove *thisCardProperties = cardStruct.cardToMove;
+        int originalPosition = cardStruct.position;
+        bool faceDown = targetzone->hasCoords() &&
+                        (thisCardProperties->has_face_down() ? thisCardProperties->face_down() : card->getFaceDown());
 
-    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);
+
+        // "Undo draw" should only remain valid if the just-drawn card stays within the user's hand (e.g., they only
+        // reorder their hand). If a just-drawn card leaves the hand then remove cards before it from the list
+        // (Ignore the case where the card is currently being un-drawn.)
+        if (startzone->getName() == "hand" && targetzone->getName() != "hand" && !undoingDraw) {
+            int index = lastDrawList.lastIndexOf(card->getId());
+            if (index != -1) {
+                lastDrawList.erase(lastDrawList.begin(), lastDrawList.begin() + index);
+            }
         }
-    } else {
-        for (auto card : cardsToMove) {
-            processMoveCard(ges, startzone, targetzone, card, xCoord, yCoord, xIndex, revealTopStart, revealTopTarget,
-                            isReversed, undoingDraw);
+
+        // 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) {
+                    player->deleteArrow(j);
+                }
+            }
+        }
+
+        if (shouldDestroyOnMove(card, startzone, targetzone)) {
+            Event_DestroyCard event;
+            event.set_zone_name(startzone->getName().toStdString());
+            event.set_card_id(static_cast<google::protobuf::uint32>(card->getId()));
+            ges.enqueueGameEvent(event, playerId);
+
+            if (Server_Card *stashedCard = card->takeStashedCard()) {
+                stashedCard->setId(newCardId());
+                ges.enqueueGameEvent(makeCreateTokenEvent(startzone, stashedCard, card->getX(), card->getY()),
+                                     playerId);
+                card->deleteLater();
+                card = stashedCard;
+            } else {
+                card->deleteLater();
+                card = nullptr;
+            }
+        }
+
+        if (card) {
+            ++xIndex;
+            int newX = isReversed ? targetzone->getCards().size() - xCoord + xIndex : xCoord + xIndex;
+
+            if (targetzone->hasCoords()) {
+                newX = targetzone->getFreeGridColumn(newX, yCoord, card->getName(), faceDown);
+            } else {
+                yCoord = 0;
+                card->resetState(targetzone->getName() == "stack");
+            }
+
+            targetzone->insertCard(card, newX, yCoord);
+            int targetLookedCards = targetzone->getCardsBeingLookedAt();
+            bool sourceKnownToPlayer = isReversed || (sourceBeingLookedAt && !card->getFaceDown());
+            if (targetzone->getType() == ServerInfo_Zone::HiddenZone && targetLookedCards >= newX) {
+                if (sourceKnownToPlayer) {
+                    targetLookedCards += 1;
+                } else {
+                    targetLookedCards = newX;
+                }
+                targetzone->setCardsBeingLookedAt(targetLookedCards);
+            }
+
+            bool targetHiddenToOthers = faceDown || (targetzone->getType() != ServerInfo_Zone::PublicZone);
+            bool sourceHiddenToOthers = card->getFaceDown() || (startzone->getType() != ServerInfo_Zone::PublicZone);
+
+            int oldCardId = card->getId();
+            if ((faceDown && (startzone != targetzone)) || (targetzone->getPlayer() != startzone->getPlayer())) {
+                card->setId(targetzone->getPlayer()->newCardId());
+            }
+            card->setFaceDown(faceDown);
+
+            Event_MoveCard eventOthers;
+            eventOthers.set_start_player_id(startzone->getPlayer()->getPlayerId());
+            eventOthers.set_start_zone(startzone->getName().toStdString());
+            eventOthers.set_target_player_id(targetzone->getPlayer()->getPlayerId());
+            if (startzone != targetzone) {
+                eventOthers.set_target_zone(targetzone->getName().toStdString());
+            }
+            eventOthers.set_y(yCoord);
+            eventOthers.set_face_down(faceDown);
+
+            Event_MoveCard eventPrivate(eventOthers);
+            if (sourceBeingLookedAt || targetzone->getType() != ServerInfo_Zone::HiddenZone ||
+                startzone->getType() != ServerInfo_Zone::HiddenZone) {
+                eventPrivate.set_card_id(oldCardId);
+                eventPrivate.set_new_card_id(card->getId());
+            } else {
+                eventPrivate.set_card_id(-1);
+                eventPrivate.set_new_card_id(-1);
+            }
+            if (sourceKnownToPlayer || !(faceDown || targetzone->getType() == ServerInfo_Zone::HiddenZone)) {
+                QString privateCardName = card->getName();
+                eventPrivate.set_card_name(privateCardName.toStdString());
+                eventPrivate.set_new_card_provider_id(card->getProviderId().toStdString());
+            }
+            if (startzone->getType() == ServerInfo_Zone::HiddenZone) {
+                eventPrivate.set_position(position);
+            } else {
+                eventPrivate.set_position(-1);
+            }
+
+            eventPrivate.set_x(newX);
+
+            // Other players do not get to see the start and/or target position of the card if the respective
+            // part of the zone is being looked at. The information is not needed anyway because in hidden zones,
+            // all cards are equal.
+            if (((startzone->getType() == ServerInfo_Zone::HiddenZone) &&
+                 ((startzone->getCardsBeingLookedAt() > position) || (startzone->getCardsBeingLookedAt() == -1))) ||
+                (startzone->getType() == ServerInfo_Zone::PublicZone)) {
+                eventOthers.set_position(-1);
+            } else {
+                eventOthers.set_position(position);
+            }
+            if ((targetzone->getType() == ServerInfo_Zone::HiddenZone) &&
+                ((targetzone->getCardsBeingLookedAt() > newX) || (targetzone->getCardsBeingLookedAt() == -1))) {
+                eventOthers.set_x(-1);
+            } else {
+                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 (thisCardProperties->tapped()) {
+                setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(),
+                                  AttrTapped, "1");
+            }
+            QString ptString = QString::fromStdString(thisCardProperties->pt());
+            if (!ptString.isEmpty()) {
+                setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(),
+                                  AttrPT, ptString);
+            }
+
+            // If card is transferring to a different player, leave an annotation of who actually "owns" the card
+            const auto &priorAnnotation = card->getAnnotation();
+            if (startzone->getPlayer() != targetzone->getPlayer() && !priorAnnotation.contains("Owner:")) {
+                const auto &ownerAnnotation =
+                    "Owner: " + QString::fromStdString(startzone->getPlayer()->getUserInfo()->name());
+                const auto &newAnnotation =
+                    priorAnnotation.isEmpty() ? ownerAnnotation : ownerAnnotation + "\n\n" + priorAnnotation;
+                setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(),
+                                  AttrAnnotation, newAnnotation, card);
+            }
+
+            if (originalPosition == 0) {
+                revealTopStart = true;
+            }
+            if (newX == 0) {
+                revealTopTarget = true;
+            }
         }
     }
-
     if (revealTopStart) {
         revealTopCardIfNeeded(startzone, ges);
     }
@@ -354,238 +689,7 @@ 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) {
-                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,
-                                             Server_CardZone *targetzone,
-                                             bool /*undoingDraw*/)
-{
-    Server_Card *card = cardStruct.card;
-    const CardToMove *thisCardProperties = cardStruct.cardToMove;
-
-    // set card to be tapped
-    if (thisCardProperties->tapped()) {
-        setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(), AttrTapped,
-                          "1");
-    }
-
-    // set card pt
-    QString ptString = QString::fromStdString(thisCardProperties->pt());
-    if (!ptString.isEmpty()) {
-        setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(), AttrPT,
-                          ptString);
-    }
-
-    // If card is transferring to a different player, leave an annotation of who actually "owns" the card
-    const auto &priorAnnotation = card->getAnnotation();
-    if (startzone->getPlayer() != targetzone->getPlayer() && !priorAnnotation.contains("Owner:")) {
-        const auto &ownerAnnotation = "Owner: " + QString::fromStdString(startzone->getPlayer()->getUserInfo()->name());
-        const auto &newAnnotation =
-            priorAnnotation.isEmpty() ? ownerAnnotation : ownerAnnotation + "\n\n" + priorAnnotation;
-        setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(),
-                          AttrAnnotation, newAnnotation, card);
-    }
-}
-
-void Server_AbstractPlayer::revealTopCardIfNeeded(Server_CardZone *zone, GameEventStorage &ges)
-{
-    if (zone->getCards().isEmpty()) {
-        return;
-    }
-    if (zone->getAlwaysRevealTopCard()) {
-        Event_RevealCards revealEvent;
-        revealEvent.set_zone_name(zone->getName().toStdString());
-        revealEvent.add_card_id(0);
-        zone->getCards().first()->getInfo(revealEvent.add_cards());
-
-        ges.enqueueGameEvent(revealEvent, playerId);
-        return;
-    }
-    if (zone->getAlwaysLookAtTopCard()) {
-        Event_DumpZone dumpEvent;
-        dumpEvent.set_zone_owner_id(playerId);
-        dumpEvent.set_zone_name(zone->getName().toStdString());
-        dumpEvent.set_number_cards(1);
-        ges.enqueueGameEvent(dumpEvent, playerId, GameEventStorageItem::SendToOthers);
-
-        Event_RevealCards revealEvent;
-        revealEvent.set_zone_name(zone->getName().toStdString());
-        revealEvent.set_number_of_cards(1);
-        revealEvent.add_card_id(0);
-        zone->getCards().first()->getInfo(revealEvent.add_cards());
-        ges.enqueueGameEvent(revealEvent, playerId, GameEventStorageItem::SendToPrivate, playerId);
-    }
-}
-
-void Server_AbstractPlayer::unattachCard(GameEventStorage &ges, Server_Card *card)
+void Server_Player::unattachCard(GameEventStorage &ges, Server_Card *card)
 {
     Server_CardZone *zone = card->getZone();
     Server_Card *parentCard = card->getParentCard();
@@ -603,13 +707,13 @@ void Server_AbstractPlayer::unattachCard(GameEventStorage &ges, Server_Card *car
     }
 }
 
-Response::ResponseCode Server_AbstractPlayer::setCardAttrHelper(GameEventStorage &ges,
-                                                                int targetPlayerId,
-                                                                const QString &zoneName,
-                                                                int cardId,
-                                                                CardAttribute attribute,
-                                                                const QString &attrValue,
-                                                                Server_Card *unzonedCard)
+Response::ResponseCode Server_Player::setCardAttrHelper(GameEventStorage &ges,
+                                                        int targetPlayerId,
+                                                        const QString &zoneName,
+                                                        int cardId,
+                                                        CardAttribute attribute,
+                                                        const QString &attrValue,
+                                                        Server_Card *unzonedCard)
 {
     Server_CardZone *zone = getZones().value(zoneName);
     if (!zone) {
@@ -652,7 +756,100 @@ Response::ResponseCode Server_AbstractPlayer::setCardAttrHelper(GameEventStorage
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdConcede(const Command_Concede & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges)
+Server_Player::cmdDeckSelect(const Command_DeckSelect &cmd, ResponseContainer &rc, GameEventStorage &ges)
+{
+    DeckList *newDeck;
+    if (cmd.has_deck_id()) {
+        try {
+            newDeck = game->getRoom()->getServer()->getDatabaseInterface()->getDeckFromDatabase(cmd.deck_id(),
+                                                                                                userInfo->id());
+        } catch (Response::ResponseCode &r) {
+            return r;
+        }
+    } else {
+        newDeck = new DeckList(fileFromStdString(cmd.deck()));
+    }
+
+    if (!newDeck) {
+        return Response::RespInternalError;
+    }
+
+    delete deck;
+    deck = newDeck;
+    sideboardLocked = true;
+
+    Event_PlayerPropertiesChanged event;
+    event.mutable_player_properties()->set_sideboard_locked(true);
+    event.mutable_player_properties()->set_deck_hash(deck->getDeckHash().toStdString());
+    ges.enqueueGameEvent(event, playerId);
+
+    Context_DeckSelect context;
+    context.set_deck_hash(deck->getDeckHash().toStdString());
+    context.set_sideboard_size(deck->getSideboardSize());
+    if (game->getShareDecklistsOnLoad()) {
+        context.set_deck_list(deck->writeToString_Native().toStdString());
+    }
+    ges.setGameEventContext(context);
+
+    auto *re = new Response_DeckDownload;
+    re->set_deck(deck->writeToString_Native().toStdString());
+
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+Response::ResponseCode Server_Player::cmdSetSideboardPlan(const Command_SetSideboardPlan &cmd,
+                                                          ResponseContainer & /*rc*/,
+                                                          GameEventStorage & /*ges*/)
+{
+    if (readyStart) {
+        return Response::RespContextError;
+    }
+    if (!deck) {
+        return Response::RespContextError;
+    }
+    if (sideboardLocked) {
+        return Response::RespContextError;
+    }
+
+    QList<MoveCard_ToZone> sideboardPlan;
+    for (int i = 0; i < cmd.move_list_size(); ++i) {
+        sideboardPlan.append(cmd.move_list(i));
+    }
+    deck->setCurrentSideboardPlan(sideboardPlan);
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode Server_Player::cmdSetSideboardLock(const Command_SetSideboardLock &cmd,
+                                                          ResponseContainer & /*rc*/,
+                                                          GameEventStorage &ges)
+{
+    if (readyStart) {
+        return Response::RespContextError;
+    }
+    if (!deck) {
+        return Response::RespContextError;
+    }
+    if (sideboardLocked == cmd.locked()) {
+        return Response::RespContextError;
+    }
+
+    sideboardLocked = cmd.locked();
+    if (sideboardLocked) {
+        deck->setCurrentSideboardPlan(QList<MoveCard_ToZone>());
+    }
+
+    Event_PlayerPropertiesChanged event;
+    event.mutable_player_properties()->set_sideboard_locked(sideboardLocked);
+    ges.enqueueGameEvent(event, playerId);
+    ges.setGameEventContext(Context_SetSideboardLock());
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode
+Server_Player::cmdConcede(const Command_Concede & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -664,8 +861,51 @@ Server_AbstractPlayer::cmdConcede(const Command_Concede & /*cmd*/, ResponseConta
     setConceded(true);
     game->removeArrowsRelatedToPlayer(ges, this);
     game->unattachCards(ges, this);
-    game->returnCardsFromPlayer(ges, this);
 
+    playerMutex.lock();
+
+    // Return cards to their rightful owners before conceding the game
+    static const QRegularExpression ownerRegex{"Owner: ?([^\n]+)"};
+    for (const auto &card : zones.value("table")->getCards()) {
+        if (card == nullptr) {
+            continue;
+        }
+
+        const auto &regexResult = ownerRegex.match(card->getAnnotation());
+        if (!regexResult.hasMatch()) {
+            continue;
+        }
+
+        CardToMove cardToMove;
+        cardToMove.set_card_id(card->getId());
+
+        for (const auto *player : game->getPlayers()) {
+            if (player == nullptr || player->getUserInfo() == nullptr) {
+                continue;
+            }
+
+            const auto &ownerToReturnTo = regexResult.captured(1);
+            const auto &correctOwner = QString::compare(QString::fromStdString(player->getUserInfo()->name()),
+                                                        ownerToReturnTo, Qt::CaseInsensitive) == 0;
+            if (!correctOwner) {
+                continue;
+            }
+
+            const auto &startZone = zones.value("table");
+            const auto &targetZone = player->getZones().value("table");
+
+            if (startZone == nullptr || targetZone == nullptr) {
+                continue;
+            }
+
+            moveCard(ges, startZone, QList<const CardToMove *>() << &cardToMove, targetZone, 0, 0, false);
+            break;
+        }
+    }
+
+    playerMutex.unlock();
+
+    // All borrowed cards have been returned, can now continue cleanup process
     clearZones();
 
     Event_PlayerPropertiesChanged event;
@@ -681,9 +921,8 @@ Server_AbstractPlayer::cmdConcede(const Command_Concede & /*cmd*/, ResponseConta
     return Response::RespOk;
 }
 
-Response::ResponseCode Server_AbstractPlayer::cmdUnconcede(const Command_Unconcede & /*cmd*/,
-                                                           ResponseContainer & /*rc*/,
-                                                           GameEventStorage &ges)
+Response::ResponseCode
+Server_Player::cmdUnconcede(const Command_Unconcede & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -707,7 +946,7 @@ Response::ResponseCode Server_AbstractPlayer::cmdUnconcede(const Command_Unconce
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdReadyStart(const Command_ReadyStart &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+Server_Player::cmdReadyStart(const Command_ReadyStart &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!deck || game->getGameStarted()) {
         return Response::RespContextError;
@@ -737,7 +976,76 @@ Server_AbstractPlayer::cmdReadyStart(const Command_ReadyStart &cmd, ResponseCont
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdRollDie(const Command_RollDie &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges) const
+Server_Player::cmdShuffle(const Command_Shuffle &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+{
+    if (!game->getGameStarted()) {
+        return Response::RespGameNotStarted;
+    }
+
+    if (conceded) {
+        return Response::RespContextError;
+    }
+
+    if (cmd.has_zone_name() && cmd.zone_name() != "deck") {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    Server_CardZone *zone = zones.value("deck");
+    if (!zone) {
+        return Response::RespNameNotFound;
+    }
+
+    zone->shuffle(cmd.start(), cmd.end());
+
+    Event_Shuffle event;
+    event.set_zone_name(zone->getName().toStdString());
+    event.set_start(cmd.start());
+    event.set_end(cmd.end());
+    ges.enqueueGameEvent(event, playerId);
+    revealTopCardIfNeeded(zone, ges);
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode
+Server_Player::cmdMulligan(const Command_Mulligan &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+{
+    if (!game->getGameStarted()) {
+        return Response::RespGameNotStarted;
+    }
+    if (conceded) {
+        return Response::RespContextError;
+    }
+
+    Server_CardZone *hand = zones.value("hand");
+    Server_CardZone *_deck = zones.value("deck");
+    int number = cmd.number();
+
+    if (!hand->getCards().isEmpty()) {
+        auto cardsToMove = QList<const CardToMove *>();
+        for (auto &card : hand->getCards()) {
+            auto *cardToMove = new CardToMove;
+            cardToMove->set_card_id(card->getId());
+            cardsToMove.append(cardToMove);
+        }
+        moveCard(ges, hand, cardsToMove, _deck, -1, 0, false);
+        qDeleteAll(cardsToMove);
+    }
+
+    _deck->shuffle();
+    ges.enqueueGameEvent(Event_Shuffle(), playerId);
+
+    drawCards(ges, number);
+
+    Context_Mulligan context;
+    context.set_number(static_cast<google::protobuf::uint32>(hand->getCards().size()));
+    ges.setGameEventContext(context);
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode
+Server_Player::cmdRollDie(const Command_RollDie &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges) const
 {
     if (conceded) {
         return Response::RespContextError;
@@ -763,7 +1071,7 @@ Server_AbstractPlayer::cmdRollDie(const Command_RollDie &cmd, ResponseContainer
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdMoveCard(const Command_MoveCard &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+Server_Player::cmdDrawCards(const Command_DrawCards &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -772,7 +1080,44 @@ Server_AbstractPlayer::cmdMoveCard(const Command_MoveCard &cmd, ResponseContaine
         return Response::RespContextError;
     }
 
-    Server_AbstractPlayer *startPlayer = game->getPlayer(cmd.has_start_player_id() ? cmd.start_player_id() : playerId);
+    return drawCards(ges, cmd.number());
+}
+
+Response::ResponseCode
+Server_Player::cmdUndoDraw(const Command_UndoDraw & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges)
+{
+    if (!game->getGameStarted()) {
+        return Response::RespGameNotStarted;
+    }
+    if (conceded) {
+        return Response::RespContextError;
+    }
+
+    if (lastDrawList.isEmpty()) {
+        return Response::RespContextError;
+    }
+
+    Response::ResponseCode retVal;
+    auto *cardToMove = new CardToMove;
+    cardToMove->set_card_id(lastDrawList.takeLast());
+    retVal = moveCard(ges, zones.value("hand"), QList<const CardToMove *>() << cardToMove, zones.value("deck"), 0, 0,
+                      false, true);
+    delete cardToMove;
+
+    return retVal;
+}
+
+Response::ResponseCode
+Server_Player::cmdMoveCard(const Command_MoveCard &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+{
+    if (!game->getGameStarted()) {
+        return Response::RespGameNotStarted;
+    }
+    if (conceded) {
+        return Response::RespContextError;
+    }
+
+    Server_Player *startPlayer = game->getPlayer(cmd.has_start_player_id() ? cmd.start_player_id() : playerId);
     if (!startPlayer) {
         return Response::RespNameNotFound;
     }
@@ -785,7 +1130,7 @@ Server_AbstractPlayer::cmdMoveCard(const Command_MoveCard &cmd, ResponseContaine
         return Response::RespContextError;
     }
 
-    Server_AbstractPlayer *targetPlayer = game->getPlayer(cmd.target_player_id());
+    Server_Player *targetPlayer = game->getPlayer(cmd.target_player_id());
     if (!targetPlayer) {
         return Response::RespNameNotFound;
     }
@@ -807,7 +1152,7 @@ Server_AbstractPlayer::cmdMoveCard(const Command_MoveCard &cmd, ResponseContaine
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdFlipCard(const Command_FlipCard &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+Server_Player::cmdFlipCard(const Command_FlipCard &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -855,7 +1200,7 @@ Server_AbstractPlayer::cmdFlipCard(const Command_FlipCard &cmd, ResponseContaine
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdAttachCard(const Command_AttachCard &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+Server_Player::cmdAttachCard(const Command_AttachCard &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -874,7 +1219,7 @@ Server_AbstractPlayer::cmdAttachCard(const Command_AttachCard &cmd, ResponseCont
         return Response::RespNameNotFound;
     }
 
-    Server_AbstractPlayer *targetPlayer = nullptr;
+    Server_Player *targetPlayer = nullptr;
     Server_CardZone *targetzone = nullptr;
     Server_Card *targetCard = nullptr;
 
@@ -963,7 +1308,7 @@ Server_AbstractPlayer::cmdAttachCard(const Command_AttachCard &cmd, ResponseCont
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer &rc, GameEventStorage &ges)
+Server_Player::cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer &rc, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -1138,11 +1483,11 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo
                         arrowInfo->set_start_player_id(player->getPlayerId());
                         arrowInfo->set_start_zone(startCard->getZone()->getName().toStdString());
                         arrowInfo->set_start_card_id(startCard->getId());
-                        const auto *arrowTargetPlayer = qobject_cast<const Server_AbstractPlayer *>(targetItem);
+                        const Server_Player *arrowTargetPlayer = qobject_cast<const Server_Player *>(targetItem);
                         if (arrowTargetPlayer != nullptr) {
                             arrowInfo->set_target_player_id(arrowTargetPlayer->getPlayerId());
                         } else {
-                            const auto *arrowTargetCard = qobject_cast<const Server_Card *>(targetItem);
+                            const Server_Card *arrowTargetCard = qobject_cast<const Server_Card *>(targetItem);
                             arrowInfo->set_target_player_id(arrowTargetCard->getZone()->getPlayer()->getPlayerId());
                             arrowInfo->set_target_zone(arrowTargetCard->getZone()->getName().toStdString());
                             arrowInfo->set_target_card_id(arrowTargetCard->getId());
@@ -1169,11 +1514,11 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo
  * Creates and sends the events required to properly communicate the given token creation.
  * Primarily written to handle creating face-down tokens.
  */
-void Server_AbstractPlayer::sendCreateTokenEvents(Server_CardZone *zone,
-                                                  Server_Card *card,
-                                                  int xCoord,
-                                                  int yCoord,
-                                                  GameEventStorage &ges)
+void Server_Player::sendCreateTokenEvents(Server_CardZone *zone,
+                                          Server_Card *card,
+                                          int xCoord,
+                                          int yCoord,
+                                          GameEventStorage &ges)
 {
     // Token is not face-down; things are easy
     if (!card->getFaceDown()) {
@@ -1198,7 +1543,7 @@ void Server_AbstractPlayer::sendCreateTokenEvents(Server_CardZone *zone,
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdCreateArrow(const Command_CreateArrow &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+Server_Player::cmdCreateArrow(const Command_CreateArrow &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -1207,8 +1552,8 @@ Server_AbstractPlayer::cmdCreateArrow(const Command_CreateArrow &cmd, ResponseCo
         return Response::RespContextError;
     }
 
-    Server_AbstractPlayer *startPlayer = game->getPlayer(cmd.start_player_id());
-    Server_AbstractPlayer *targetPlayer = game->getPlayer(cmd.target_player_id());
+    Server_Player *startPlayer = game->getPlayer(cmd.start_player_id());
+    Server_Player *targetPlayer = game->getPlayer(cmd.target_player_id());
     if (!startPlayer || !targetPlayer) {
         return Response::RespNameNotFound;
     }
@@ -1253,9 +1598,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(newArrowId(), startCard, targetItem, cmd.arrow_color(), currentPhase, deletionPhase);
+    auto arrow = new Server_Arrow(newArrowId(), startCard, targetItem, cmd.arrow_color());
     addArrow(arrow);
 
     Event_CreateArrow event;
@@ -1276,7 +1619,7 @@ Server_AbstractPlayer::cmdCreateArrow(const Command_CreateArrow &cmd, ResponseCo
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdDeleteArrow(const Command_DeleteArrow &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+Server_Player::cmdDeleteArrow(const Command_DeleteArrow &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -1297,7 +1640,7 @@ Server_AbstractPlayer::cmdDeleteArrow(const Command_DeleteArrow &cmd, ResponseCo
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdSetCardAttr(const Command_SetCardAttr &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+Server_Player::cmdSetCardAttr(const Command_SetCardAttr &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -1310,9 +1653,8 @@ Server_AbstractPlayer::cmdSetCardAttr(const Command_SetCardAttr &cmd, ResponseCo
                              nameFromStdString(cmd.attr_value()));
 }
 
-Response::ResponseCode Server_AbstractPlayer::cmdSetCardCounter(const Command_SetCardCounter &cmd,
-                                                                ResponseContainer & /*rc*/,
-                                                                GameEventStorage &ges)
+Response::ResponseCode
+Server_Player::cmdSetCardCounter(const Command_SetCardCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -1343,9 +1685,8 @@ Response::ResponseCode Server_AbstractPlayer::cmdSetCardCounter(const Command_Se
     return Response::RespOk;
 }
 
-Response::ResponseCode Server_AbstractPlayer::cmdIncCardCounter(const Command_IncCardCounter &cmd,
-                                                                ResponseContainer & /*rc*/,
-                                                                GameEventStorage &ges)
+Response::ResponseCode
+Server_Player::cmdIncCardCounter(const Command_IncCardCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -1381,13 +1722,151 @@ Response::ResponseCode Server_AbstractPlayer::cmdIncCardCounter(const Command_In
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdDumpZone(const Command_DumpZone &cmd, ResponseContainer &rc, GameEventStorage &ges)
+Server_Player::cmdIncCounter(const Command_IncCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+{
+    if (!game->getGameStarted()) {
+        return Response::RespGameNotStarted;
+    }
+    if (conceded) {
+        return Response::RespContextError;
+    }
+
+    Server_Counter *c = counters.value(cmd.counter_id(), 0);
+    if (!c) {
+        return Response::RespNameNotFound;
+    }
+
+    c->setCount(c->getCount() + cmd.delta());
+
+    Event_SetCounter event;
+    event.set_counter_id(c->getId());
+    event.set_value(c->getCount());
+    ges.enqueueGameEvent(event, playerId);
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode
+Server_Player::cmdCreateCounter(const Command_CreateCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+{
+    if (!game->getGameStarted()) {
+        return Response::RespGameNotStarted;
+    }
+    if (conceded) {
+        return Response::RespContextError;
+    }
+
+    auto *c = new Server_Counter(newCounterId(), nameFromStdString(cmd.counter_name()), cmd.counter_color(),
+                                 cmd.radius(), cmd.value());
+    addCounter(c);
+
+    Event_CreateCounter event;
+    ServerInfo_Counter *counterInfo = event.mutable_counter_info();
+    counterInfo->set_id(c->getId());
+    counterInfo->set_name(c->getName().toStdString());
+    counterInfo->mutable_counter_color()->CopyFrom(cmd.counter_color());
+    counterInfo->set_radius(c->getRadius());
+    counterInfo->set_count(c->getCount());
+    ges.enqueueGameEvent(event, playerId);
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode
+Server_Player::cmdSetCounter(const Command_SetCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+{
+    if (!game->getGameStarted()) {
+        return Response::RespGameNotStarted;
+    }
+    if (conceded) {
+        return Response::RespContextError;
+    }
+
+    Server_Counter *c = counters.value(cmd.counter_id(), 0);
+    if (!c) {
+        return Response::RespNameNotFound;
+    }
+
+    c->setCount(cmd.value());
+
+    Event_SetCounter event;
+    event.set_counter_id(c->getId());
+    event.set_value(c->getCount());
+    ges.enqueueGameEvent(event, playerId);
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode
+Server_Player::cmdDelCounter(const Command_DelCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+{
+    if (!game->getGameStarted()) {
+        return Response::RespGameNotStarted;
+    }
+    if (conceded) {
+        return Response::RespContextError;
+    }
+
+    Server_Counter *counter = counters.value(cmd.counter_id(), 0);
+    if (!counter) {
+        return Response::RespNameNotFound;
+    }
+    counters.remove(cmd.counter_id());
+    delete counter;
+
+    Event_DelCounter event;
+    event.set_counter_id(cmd.counter_id());
+    ges.enqueueGameEvent(event, playerId);
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode
+Server_Player::cmdNextTurn(const Command_NextTurn & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage & /*ges*/)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
     }
 
-    Server_AbstractPlayer *otherPlayer = game->getPlayer(cmd.player_id());
+    if (conceded && !judge) {
+        return Response::RespContextError;
+    }
+
+    game->nextTurn();
+    return Response::RespOk;
+}
+
+Response::ResponseCode Server_Player::cmdSetActivePhase(const Command_SetActivePhase &cmd,
+                                                        ResponseContainer & /*rc*/,
+                                                        GameEventStorage & /*ges*/)
+{
+    if (!game->getGameStarted()) {
+        return Response::RespGameNotStarted;
+    }
+
+    if (!judge) {
+        if (conceded) {
+            return Response::RespContextError;
+        }
+
+        if (game->getActivePlayer() != playerId) {
+            return Response::RespContextError;
+        }
+    }
+
+    game->setActivePhase(cmd.phase());
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode
+Server_Player::cmdDumpZone(const Command_DumpZone &cmd, ResponseContainer &rc, GameEventStorage &ges)
+{
+    if (!game->getGameStarted()) {
+        return Response::RespGameNotStarted;
+    }
+
+    Server_Player *otherPlayer = game->getPlayer(cmd.player_id());
     if (!otherPlayer) {
         return Response::RespNameNotFound;
     }
@@ -1461,7 +1940,7 @@ Server_AbstractPlayer::cmdDumpZone(const Command_DumpZone &cmd, ResponseContaine
 }
 
 Response::ResponseCode
-Server_AbstractPlayer::cmdRevealCards(const Command_RevealCards &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
+Server_Player::cmdRevealCards(const Command_RevealCards &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
     if (!game->getGameStarted()) {
         return Response::RespGameNotStarted;
@@ -1471,7 +1950,7 @@ Server_AbstractPlayer::cmdRevealCards(const Command_RevealCards &cmd, ResponseCo
     }
 
     if (cmd.has_player_id()) {
-        Server_AbstractPlayer *otherPlayer = game->getPlayer(cmd.player_id());
+        Server_Player *otherPlayer = game->getPlayer(cmd.player_id());
         if (!otherPlayer)
             return Response::RespNameNotFound;
     }
@@ -1562,7 +2041,7 @@ Server_AbstractPlayer::cmdRevealCards(const Command_RevealCards &cmd, ResponseCo
             zone->addWritePermission(cmd.player_id());
         }
 
-        if (isJudge()) {
+        if (getJudge()) {
             ges.setOverwriteOwnership(true);
         }
 
@@ -1582,9 +2061,9 @@ Server_AbstractPlayer::cmdRevealCards(const Command_RevealCards &cmd, ResponseCo
     return Response::RespOk;
 }
 
-Response::ResponseCode Server_AbstractPlayer::cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
-                                                                      ResponseContainer & /* rc */,
-                                                                      GameEventStorage &ges)
+Response::ResponseCode Server_Player::cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
+                                                              ResponseContainer & /* rc */,
+                                                              GameEventStorage &ges)
 {
     Server_CardZone *zone = zones.value(nameFromStdString(cmd.zone_name()));
     if (!zone) {
@@ -1617,13 +2096,24 @@ Response::ResponseCode Server_AbstractPlayer::cmdChangeZoneProperties(const Comm
         event.set_always_look_at_top_card(cmd.always_look_at_top_card());
     }
     ges.enqueueGameEvent(event, playerId);
+    revealTopCardIfNeeded(zone, ges);
     return Response::RespOk;
 }
 
-void Server_AbstractPlayer::getInfo(ServerInfo_Player *info,
-                                    Server_AbstractParticipant *recipient,
-                                    bool omniscient,
-                                    bool withUserInfo)
+Response::ResponseCode
+Server_Player::cmdReverseTurn(const Command_ReverseTurn &cmd, ResponseContainer &rc, GameEventStorage &ges)
+{
+
+    if (!judge && conceded) {
+        return Response::RespContextError;
+    }
+    return Server_AbstractParticipant::cmdReverseTurn(cmd, rc, ges);
+}
+
+void Server_Player::getInfo(ServerInfo_Player *info,
+                            Server_AbstractParticipant *recipient,
+                            bool omniscient,
+                            bool withUserInfo)
 {
     getProperties(*info->mutable_properties(), withUserInfo);
     if (recipient == this) {
@@ -1636,12 +2126,16 @@ void Server_AbstractPlayer::getInfo(ServerInfo_Player *info,
         arrow->getInfo(info->add_arrow_list());
     }
 
+    for (Server_Counter *counter : counters) {
+        counter->getInfo(info->add_counter_list());
+    }
+
     for (Server_CardZone *zone : zones) {
         zone->getInfo(info->add_zone_list(), recipient, omniscient);
     }
 }
 
-void Server_AbstractPlayer::getPlayerProperties(ServerInfo_PlayerProperties &result)
+void Server_Player::getPlayerProperties(ServerInfo_PlayerProperties &result)
 {
     result.set_conceded(conceded);
     result.set_sideboard_locked(sideboardLocked);
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h b/common/server/game/server_player.h
similarity index 54%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
rename to common/server/game/server_player.h
index 9d9809298..fc3e69ee8 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
+++ b/common/server/game/server_player.h
@@ -1,47 +1,45 @@
-#ifndef ABSTRACT_PLAYER_H
-#define ABSTRACT_PLAYER_H
+#ifndef PLAYER_H
+#define PLAYER_H
 
-#include "../serverinfo_user_container.h"
+#include "../../serverinfo_user_container.h"
 #include "server_abstract_participant.h"
 
+#include <QList>
 #include <QMap>
 #include <QString>
 
-class CardToMove;
 class DeckList;
-class Server_Arrow;
-class Server_Card;
 class Server_CardZone;
 class Server_Counter;
-struct MoveCardStruct;
+class Server_Arrow;
+class Server_Card;
+class CardToMove;
 
-class Server_AbstractPlayer : public Server_AbstractParticipant
+class Server_Player : public Server_AbstractParticipant
 {
     Q_OBJECT
 private:
     class MoveCardCompareFunctor;
+    DeckList *deck;
+    QMap<QString, Server_CardZone *> zones;
+    QMap<int, Server_Counter *> counters;
     QMap<int, Server_Arrow *> arrows;
-
+    QList<int> lastDrawList;
+    int nextCardId;
+    bool readyStart;
+    bool conceded;
+    bool sideboardLocked;
+    void revealTopCardIfNeeded(Server_CardZone *zone, GameEventStorage &ges);
     void sendCreateTokenEvents(Server_CardZone *zone, Server_Card *card, int xCoord, int yCoord, GameEventStorage &ges);
     void getPlayerProperties(ServerInfo_PlayerProperties &result) override;
 
-protected:
-    bool conceded;
-    DeckList *deck;
-    bool sideboardLocked;
-    QMap<QString, Server_CardZone *> zones;
-    bool readyStart;
-    int nextCardId;
-
-    void revealTopCardIfNeeded(Server_CardZone *zone, GameEventStorage &ges);
-
 public:
-    Server_AbstractPlayer(Server_Game *_game,
-                          int _playerId,
-                          const ServerInfo_User &_userInfo,
-                          bool _judge,
-                          Server_AbstractUserInterface *_handler);
-    ~Server_AbstractPlayer() override;
+    Server_Player(Server_Game *_game,
+                  int _playerId,
+                  const ServerInfo_User &_userInfo,
+                  bool _judge,
+                  Server_AbstractUserInterface *_handler);
+    ~Server_Player() override;
     void prepareDestroy() override;
     const DeckList *getDeckList() const
     {
@@ -68,22 +66,29 @@ public:
     {
         return zones;
     }
+    const QMap<int, Server_Counter *> &getCounters() const
+    {
+        return counters;
+    }
     const QMap<int, Server_Arrow *> &getArrows() const
     {
         return arrows;
     }
 
     int newCardId();
+    int newCounterId() const;
     int newArrowId() const;
 
     void addZone(Server_CardZone *zone);
     void addArrow(Server_Arrow *arrow);
     void updateArrowId(int id);
     bool deleteArrow(int arrowId);
+    void addCounter(Server_Counter *counter);
 
-    virtual void setupZones();
-    virtual void clearZones();
+    void clearZones();
+    void setupZones();
 
+    Response::ResponseCode drawCards(GameEventStorage &ges, int number);
     Response::ResponseCode moveCard(GameEventStorage &ges,
                                     Server_CardZone *startzone,
                                     const QList<const CardToMove *> &_cards,
@@ -93,25 +98,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,
-                                  Server_CardZone *targetzone,
-                                  bool undoingDraw);
-
     void unattachCard(GameEventStorage &ges, Server_Card *card);
     Response::ResponseCode setCardAttrHelper(GameEventStorage &ges,
                                              int targetPlayerId,
@@ -121,44 +107,72 @@ public:
                                              const QString &attrValue,
                                              Server_Card *unzonedCard = nullptr);
 
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdConcede(const Command_Concede &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdUnconcede(const Command_Unconcede &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdReadyStart(const Command_ReadyStart &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
+    cmdDeckSelect(const Command_DeckSelect &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdSetSideboardPlan(const Command_SetSideboardPlan &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdSetSideboardLock(const Command_SetSideboardLock &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdShuffle(const Command_Shuffle &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdMulligan(const Command_Mulligan &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
     cmdRollDie(const Command_RollDie &cmd, ResponseContainer &rc, GameEventStorage &ges) const override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
+    cmdDrawCards(const Command_DrawCards &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdUndoDraw(const Command_UndoDraw &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
     cmdMoveCard(const Command_MoveCard &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdFlipCard(const Command_FlipCard &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdAttachCard(const Command_AttachCard &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdCreateArrow(const Command_CreateArrow &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdDeleteArrow(const Command_DeleteArrow &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdSetCardAttr(const Command_SetCardAttr &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdSetCardCounter(const Command_SetCardCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdIncCardCounter(const Command_IncCardCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
+    cmdIncCounter(const Command_IncCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdCreateCounter(const Command_CreateCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdSetCounter(const Command_SetCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdDelCounter(const Command_DelCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdNextTurn(const Command_NextTurn &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdSetActivePhase(const Command_SetActivePhase &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
+    Response::ResponseCode
     cmdDumpZone(const Command_DumpZone &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode
+    Response::ResponseCode
     cmdRevealCards(const Command_RevealCards &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    virtual Response::ResponseCode cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
-                                                           ResponseContainer &rc,
-                                                           GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdReverseTurn(const Command_ReverseTurn & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges) override;
+    Response::ResponseCode cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
+                                                   ResponseContainer &rc,
+                                                   GameEventStorage &ges) override;
 
-    virtual void getInfo(ServerInfo_Player *info,
-                         Server_AbstractParticipant *playerWhosAsking,
-                         bool omniscient,
-                         bool withUserInfo) override;
+    void getInfo(ServerInfo_Player *info,
+                 Server_AbstractParticipant *playerWhosAsking,
+                 bool omniscient,
+                 bool withUserInfo) override;
 };
 
 #endif
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp b/common/server/game/server_spectator.cpp
similarity index 100%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
rename to common/server/game/server_spectator.cpp
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h b/common/server/game/server_spectator.h
similarity index 100%
rename from libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
rename to common/server/game/server_spectator.h
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp b/common/server/server.cpp
similarity index 98%
rename from libcockatrice_network/libcockatrice/network/server/remote/server.cpp
rename to common/server/server.cpp
index a5a74c54c..a80c9ee8f 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
+++ b/common/server/server.cpp
@@ -19,8 +19,16 @@
  ***************************************************************************/
 #include "server.h"
 
+#include "../debug_pb_message.h"
+#include "../featureset.h"
 #include "game/server_game.h"
 #include "game/server_player.h"
+#include "pb/event_connection_closed.pb.h"
+#include "pb/event_list_rooms.pb.h"
+#include "pb/event_user_joined.pb.h"
+#include "pb/event_user_left.pb.h"
+#include "pb/isl_message.pb.h"
+#include "pb/session_event.pb.h"
 #include "server_database_interface.h"
 #include "server_protocolhandler.h"
 #include "server_remoteuserinterface.h"
@@ -29,13 +37,6 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QThread>
-#include <libcockatrice/protocol/debug_pb_message.h>
-#include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
-#include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
-#include <libcockatrice/protocol/pb/event_user_joined.pb.h>
-#include <libcockatrice/protocol/pb/event_user_left.pb.h>
-#include <libcockatrice/protocol/pb/isl_message.pb.h>
-#include <libcockatrice/protocol/pb/session_event.pb.h>
 
 Server::Server(QObject *parent) : QObject(parent), nextLocalGameId(0), tcpUserCount(0), webSocketUserCount(0)
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.h b/common/server/server.h
similarity index 97%
rename from libcockatrice_network/libcockatrice/network/server/remote/server.h
rename to common/server/server.h
index ab57fac4e..293aeb5b2 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.h
+++ b/common/server/server.h
@@ -1,15 +1,19 @@
 #ifndef SERVER_H
 #define SERVER_H
 
+#include "pb/commands.pb.h"
+#include "pb/serverinfo_ban.pb.h"
+#include "pb/serverinfo_chat_message.pb.h"
+#include "pb/serverinfo_user.pb.h"
+#include "pb/serverinfo_warning.pb.h"
 #include "server_player_reference.h"
 
+#include <QMap>
 #include <QMultiMap>
 #include <QMutex>
 #include <QObject>
 #include <QReadWriteLock>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_ban.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <QStringList>
 
 class Server_DatabaseInterface;
 class Server_Game;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp b/common/server/server_abstractuserinterface.cpp
similarity index 96%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
rename to common/server/server_abstractuserinterface.cpp
index f9b61ab48..5016a8867 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
+++ b/common/server/server_abstractuserinterface.cpp
@@ -2,6 +2,8 @@
 
 #include "game/server_game.h"
 #include "game/server_player.h"
+#include "pb/event_game_joined.pb.h"
+#include "pb/event_game_state_changed.pb.h"
 #include "server.h"
 #include "server_player_reference.h"
 #include "server_response_containers.h"
@@ -9,8 +11,8 @@
 
 #include <QDebug>
 #include <QList>
+#include <QPair>
 #include <google/protobuf/descriptor.h>
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 
 void Server_AbstractUserInterface::sendProtocolItemByType(ServerMessage::MessageType type,
                                                           const ::google::protobuf::Message &item)
@@ -33,7 +35,7 @@ void Server_AbstractUserInterface::sendProtocolItemByType(ServerMessage::Message
 
 SessionEvent *Server_AbstractUserInterface::prepareSessionEvent(const ::google::protobuf::Message &sessionEvent)
 {
-    auto *event = new SessionEvent;
+    SessionEvent *event = new SessionEvent;
     event->GetReflection()
         ->MutableMessage(event, sessionEvent.GetDescriptor()->FindExtensionByName("ext"))
         ->CopyFrom(sessionEvent);
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h b/common/server/server_abstractuserinterface.h
similarity index 92%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
rename to common/server/server_abstractuserinterface.h
index b11260003..c65d8a5c4 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
+++ b/common/server/server_abstractuserinterface.h
@@ -1,12 +1,13 @@
 #ifndef SERVER_ABSTRACTUSERINTERFACE
 #define SERVER_ABSTRACTUSERINTERFACE
 
-#include "serverinfo_user_container.h"
+#include "../serverinfo_user_container.h"
+#include "pb/response.pb.h"
+#include "pb/server_message.pb.h"
 
 #include <QMap>
 #include <QMutex>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/server_message.pb.h>
+#include <QPair>
 
 class SessionEvent;
 class GameEventContainer;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.cpp b/common/server/server_database_interface.cpp
similarity index 100%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.cpp
rename to common/server/server_database_interface.cpp
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h b/common/server/server_database_interface.h
similarity index 98%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
rename to common/server/server_database_interface.h
index b43dbde42..fdbded4ba 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
+++ b/common/server/server_database_interface.h
@@ -83,7 +83,7 @@ public:
     virtual bool usernameIsValid(const QString & /*userName */, QString & /* error */)
     {
         return true;
-    }
+    };
 public slots:
     virtual void endSession(qint64 /* sessionId */)
     {
@@ -146,24 +146,22 @@ public:
                             const QString & /* logMessage */,
                             LogMessage_TargetType /* targetType */,
                             const int /* targetId */,
-                            const QString & /* targetName */)
-    {
-    }
+                            const QString & /* targetName */){};
     virtual bool checkUserIsBanned(Server_ProtocolHandler * /* session */,
                                    QString & /* banReason */,
                                    int & /* banSecondsRemaining */)
     {
         return false;
-    }
+    };
     virtual int checkNumberOfUserAccounts(const QString & /* email */)
     {
         return 0;
-    }
+    };
     virtual bool
     changeUserPassword(const QString & /* user */, const QString & /* password */, bool /* passwordNeedsHash */)
     {
         return false;
-    }
+    };
     virtual bool changeUserPassword(const QString & /* user */,
                                     const QString & /* oldPassword */,
                                     bool /* oldPasswordNeedsHash */,
@@ -171,7 +169,7 @@ public:
                                     bool /* newPasswordNeedsHash */)
     {
         return false;
-    }
+    };
 };
 
 #endif
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h b/common/server/server_player_reference.h
similarity index 100%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h
rename to common/server/server_player_reference.h
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp b/common/server/server_protocolhandler.cpp
similarity index 94%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
rename to common/server/server_protocolhandler.cpp
index bfd8d113c..c06ee7624 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
+++ b/common/server/server_protocolhandler.cpp
@@ -1,7 +1,25 @@
 #include "server_protocolhandler.h"
 
+#include "../debug_pb_message.h"
+#include "../featureset.h"
+#include "../get_pb_extension.h"
+#include "../trice_limits.h"
 #include "game/server_game.h"
 #include "game/server_player.h"
+#include "pb/commands.pb.h"
+#include "pb/event_game_joined.pb.h"
+#include "pb/event_list_rooms.pb.h"
+#include "pb/event_notify_user.pb.h"
+#include "pb/event_room_say.pb.h"
+#include "pb/event_server_message.pb.h"
+#include "pb/event_user_message.pb.h"
+#include "pb/response.pb.h"
+#include "pb/response_get_games_of_user.pb.h"
+#include "pb/response_get_user_info.pb.h"
+#include "pb/response_join_room.pb.h"
+#include "pb/response_list_users.pb.h"
+#include "pb/response_login.pb.h"
+#include "pb/serverinfo_user.pb.h"
 #include "server_database_interface.h"
 #include "server_room.h"
 
@@ -9,24 +27,6 @@
 #include <QDebug>
 #include <QtMath>
 #include <google/protobuf/descriptor.h>
-#include <libcockatrice/protocol/debug_pb_message.h>
-#include <libcockatrice/protocol/featureset.h>
-#include <libcockatrice/protocol/get_pb_extension.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
-#include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
-#include <libcockatrice/protocol/pb/event_notify_user.pb.h>
-#include <libcockatrice/protocol/pb/event_room_say.pb.h>
-#include <libcockatrice/protocol/pb/event_server_message.pb.h>
-#include <libcockatrice/protocol/pb/event_user_message.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
-#include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
-#include <libcockatrice/protocol/pb/response_join_room.pb.h>
-#include <libcockatrice/protocol/pb/response_list_users.pb.h>
-#include <libcockatrice/protocol/pb/response_login.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/utility/trice_limits.h>
 
 Server_ProtocolHandler::Server_ProtocolHandler(Server *_server,
                                                Server_DatabaseInterface *_databaseInterface,
@@ -473,7 +473,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
 
     if (!missingClientFeatures.isEmpty()) {
         if (features.isRequiredFeaturesMissing(missingClientFeatures, server->getServerRequiredFeatureList())) {
-            auto *re = new Response_Login;
+            Response_Login *re = new Response_Login;
             re->set_denied_reason_str("Client upgrade required");
             QMap<QString, bool>::iterator i;
             for (i = missingClientFeatures.begin(); i != missingClientFeatures.end(); ++i) {
@@ -491,7 +491,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
                                                  clientId, clientVersion, connectionType);
     switch (res) {
         case UserIsBanned: {
-            auto *re = new Response_Login;
+            Response_Login *re = new Response_Login;
             re->set_denied_reason_str(reasonStr.toStdString());
             if (banSecondsLeft != 0)
                 re->set_denied_end_time(QDateTime::currentDateTime().addSecs(banSecondsLeft).toSecsSinceEpoch());
@@ -503,7 +503,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
         case WouldOverwriteOldSession:
             return Response::RespWouldOverwriteOldSession;
         case UsernameInvalid: {
-            auto *re = new Response_Login;
+            Response_Login *re = new Response_Login;
             re->set_denied_reason_str(reasonStr.toStdString());
             rc.setResponseExtension(re);
             return Response::RespUsernameInvalid;
@@ -534,7 +534,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
     event.set_message(server->getLoginMessage().toStdString());
     rc.enqueuePostResponseItem(ServerMessage::SESSION_EVENT, prepareSessionEvent(event));
 
-    auto *re = new Response_Login;
+    Response_Login *re = new Response_Login;
     re->mutable_user_info()->CopyFrom(copyUserInfo(true));
 
     if (authState == PasswordRight) {
@@ -616,7 +616,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdGetGamesOfUser(const Command_G
     // We don't need to check whether the user is logged in; persistent games should also work.
     // The client needs to deal with an empty result list.
 
-    auto *re = new Response_GetGamesOfUser;
+    Response_GetGamesOfUser *re = new Response_GetGamesOfUser;
     server->roomsLock.lockForRead();
     QMapIterator<int, Server_Room *> roomIterator(server->getRooms());
     while (roomIterator.hasNext()) {
@@ -640,7 +640,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdGetUserInfo(const Command_GetU
         return Response::RespLoginNeeded;
 
     QString userName = nameFromStdString(cmd.user_name());
-    auto *re = new Response_GetUserInfo;
+    Response_GetUserInfo *re = new Response_GetUserInfo;
     if (userName.isEmpty())
         re->mutable_user_info()->CopyFrom(*userInfo);
     else {
@@ -713,7 +713,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdJoinRoom(const Command_JoinRoo
     joinMessageEvent.set_message_type(Event_RoomSay::Welcome);
     rc.enqueuePostResponseItem(ServerMessage::ROOM_EVENT, room->prepareRoomEvent(joinMessageEvent));
 
-    auto *re = new Response_JoinRoom;
+    Response_JoinRoom *re = new Response_JoinRoom;
     room->getInfo(*re->mutable_room_info(), true);
 
     rc.setResponseExtension(re);
@@ -725,7 +725,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdListUsers(const Command_ListUs
     if (authState == NotLoggedIn)
         return Response::RespLoginNeeded;
 
-    auto *re = new Response_ListUsers;
+    Response_ListUsers *re = new Response_ListUsers;
     server->clientsLock.lockForRead();
     QMapIterator<QString, Server_ProtocolHandler *> userIterator = server->getUsers();
     while (userIterator.hasNext())
@@ -838,10 +838,10 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room
 
     // When server doesn't permit registered users to exist, do not honor only-reg setting
     bool onlyRegisteredUsers = cmd.only_registered() && (server->permitUnregisteredUsers());
-    auto *game = new Server_Game(copyUserInfo(false), gameId, description, QString::fromStdString(cmd.password()),
-                                 cmd.max_players(), gameTypes, cmd.only_buddies(), onlyRegisteredUsers,
-                                 cmd.spectators_allowed(), cmd.spectators_need_password(), cmd.spectators_can_talk(),
-                                 cmd.spectators_see_everything(), startingLifeTotal, shareDecklistsOnLoad, room);
+    Server_Game *game = new Server_Game(
+        copyUserInfo(false), gameId, description, QString::fromStdString(cmd.password()), cmd.max_players(), gameTypes,
+        cmd.only_buddies(), onlyRegisteredUsers, cmd.spectators_allowed(), cmd.spectators_need_password(),
+        cmd.spectators_can_talk(), cmd.spectators_see_everything(), startingLifeTotal, shareDecklistsOnLoad, room);
 
     game->addPlayer(this, rc, asSpectator, asJudge, false);
     room->addGame(game);
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h b/common/server/server_protocolhandler.h
similarity index 97%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
rename to common/server/server_protocolhandler.h
index 0d05b91c8..b80e08c7e 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
+++ b/common/server/server_protocolhandler.h
@@ -1,12 +1,13 @@
 #ifndef SERVER_PROTOCOLHANDLER_H
 #define SERVER_PROTOCOLHANDLER_H
 
+#include "pb/response.pb.h"
+#include "pb/server_message.pb.h"
 #include "server.h"
 #include "server_abstractuserinterface.h"
 
 #include <QObject>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/server_message.pb.h>
+#include <QPair>
 
 class Features;
 class Server_DatabaseInterface;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.cpp b/common/server/server_remoteuserinterface.cpp
similarity index 92%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.cpp
rename to common/server/server_remoteuserinterface.cpp
index 54af5a265..ec9b5d88a 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.cpp
+++ b/common/server/server_remoteuserinterface.cpp
@@ -1,9 +1,8 @@
 #include "server_remoteuserinterface.h"
 
+#include "pb/serverinfo_user.pb.h"
 #include "server.h"
 
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-
 void Server_RemoteUserInterface::sendProtocolItem(const Response &item)
 {
     server->sendIsl_Response(item, userInfo->server_id(), userInfo->session_id());
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h b/common/server/server_remoteuserinterface.h
similarity index 100%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
rename to common/server/server_remoteuserinterface.h
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp b/common/server/server_response_containers.cpp
similarity index 100%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
rename to common/server/server_response_containers.cpp
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h b/common/server/server_response_containers.h
similarity index 79%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
rename to common/server/server_response_containers.h
index 118b32d38..31e00c54e 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
+++ b/common/server/server_response_containers.h
@@ -1,9 +1,10 @@
 #ifndef SERVER_RESPONSE_CONTAINERS_H
 #define SERVER_RESPONSE_CONTAINERS_H
 
+#include "pb/server_message.pb.h"
+
 #include <QList>
 #include <QPair>
-#include <libcockatrice/protocol/pb/server_message.pb.h>
 
 namespace google
 {
@@ -31,11 +32,11 @@ public:
     GameEventStorageItem(const ::google::protobuf::Message &_event, int _playerId, EventRecipients _recipients);
     ~GameEventStorageItem();
 
-    [[nodiscard]] const GameEvent &getGameEvent() const
+    const GameEvent &getGameEvent() const
     {
         return *event;
     }
-    [[nodiscard]] EventRecipients getRecipients() const
+    EventRecipients getRecipients() const
     {
         return recipients;
     }
@@ -56,15 +57,15 @@ public:
     ~GameEventStorage();
 
     void setGameEventContext(const ::google::protobuf::Message &_gameEventContext);
-    [[nodiscard]] ::google::protobuf::Message *getGameEventContext() const
+    ::google::protobuf::Message *getGameEventContext() const
     {
         return gameEventContext;
     }
-    [[nodiscard]] const QList<GameEventStorageItem *> &getGameEventList() const
+    const QList<GameEventStorageItem *> &getGameEventList() const
     {
         return gameEventList;
     }
-    [[nodiscard]] int getPrivatePlayerId() const
+    int getPrivatePlayerId() const
     {
         return privatePlayerId;
     }
@@ -96,7 +97,7 @@ public:
     ResponseContainer(int _cmdId);
     ~ResponseContainer();
 
-    [[nodiscard]] int getCmdId() const
+    int getCmdId() const
     {
         return cmdId;
     }
@@ -104,7 +105,7 @@ public:
     {
         responseExtension = _responseExtension;
     }
-    [[nodiscard]] ::google::protobuf::Message *getResponseExtension() const
+    ::google::protobuf::Message *getResponseExtension() const
     {
         return responseExtension;
     }
@@ -116,13 +117,11 @@ public:
     {
         postResponseQueue.append(qMakePair(type, item));
     }
-    [[nodiscard]] const QList<QPair<ServerMessage::MessageType, ::google::protobuf::Message *>> &
-    getPreResponseQueue() const
+    const QList<QPair<ServerMessage::MessageType, ::google::protobuf::Message *>> &getPreResponseQueue() const
     {
         return preResponseQueue;
     }
-    [[nodiscard]] const QList<QPair<ServerMessage::MessageType, ::google::protobuf::Message *>> &
-    getPostResponseQueue() const
+    const QList<QPair<ServerMessage::MessageType, ::google::protobuf::Message *>> &getPostResponseQueue() const
     {
         return postResponseQueue;
     }
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp b/common/server/server_room.cpp
similarity index 95%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
rename to common/server/server_room.cpp
index bfa8912b1..badb37642 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
+++ b/common/server/server_room.cpp
@@ -1,21 +1,21 @@
 #include "server_room.h"
 
+#include "../trice_limits.h"
 #include "game/server_game.h"
+#include "pb/commands.pb.h"
+#include "pb/event_join_room.pb.h"
+#include "pb/event_leave_room.pb.h"
+#include "pb/event_list_games.pb.h"
+#include "pb/event_remove_messages.pb.h"
+#include "pb/event_room_say.pb.h"
+#include "pb/room_commands.pb.h"
+#include "pb/serverinfo_chat_message.pb.h"
+#include "pb/serverinfo_room.pb.h"
 #include "server_protocolhandler.h"
 
 #include <QDateTime>
 #include <QDebug>
 #include <google/protobuf/descriptor.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/event_join_room.pb.h>
-#include <libcockatrice/protocol/pb/event_leave_room.pb.h>
-#include <libcockatrice/protocol/pb/event_list_games.pb.h>
-#include <libcockatrice/protocol/pb/event_remove_messages.pb.h>
-#include <libcockatrice/protocol/pb/event_room_say.pb.h>
-#include <libcockatrice/protocol/pb/room_commands.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
-#include <libcockatrice/utility/trice_limits.h>
 
 Server_Room::Server_Room(int _id,
                          int _chatHistorySize,
@@ -128,7 +128,7 @@ Server_Room::getInfo(ServerInfo_Room &result, bool complete, bool showGameTypes,
 
 RoomEvent *Server_Room::prepareRoomEvent(const ::google::protobuf::Message &roomEvent)
 {
-    auto *event = new RoomEvent;
+    RoomEvent *event = new RoomEvent;
     event->set_room_id(id);
     event->GetReflection()
         ->MutableMessage(event, roomEvent.GetDescriptor()->FindExtensionByName("ext"))
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_room.h b/common/server/server_room.h
similarity index 96%
rename from libcockatrice_network/libcockatrice/network/server/remote/server_room.h
rename to common/server/server_room.h
index 3d9988f20..7e256dc15 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.h
+++ b/common/server/server_room.h
@@ -1,14 +1,16 @@
 #ifndef SERVER_ROOM_H
 #define SERVER_ROOM_H
 
-#include "serverinfo_user_container.h"
+#include "../serverinfo_user_container.h"
+#include "pb/response.pb.h"
+#include "pb/serverinfo_chat_message.pb.h"
 
+#include <QList>
 #include <QMap>
 #include <QMutex>
 #include <QObject>
 #include <QReadWriteLock>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
+#include <QStringList>
 
 class Server_DatabaseInterface;
 class Server_ProtocolHandler;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp b/common/serverinfo_user_container.cpp
similarity index 96%
rename from libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp
rename to common/serverinfo_user_container.cpp
index 77ff38906..597ebd01a 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp
+++ b/common/serverinfo_user_container.cpp
@@ -1,6 +1,6 @@
 #include "serverinfo_user_container.h"
 
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include "pb/serverinfo_user.pb.h"
 
 ServerInfo_User_Container::ServerInfo_User_Container(ServerInfo_User *_userInfo) : userInfo(_userInfo)
 {
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.h b/common/serverinfo_user_container.h
similarity index 81%
rename from libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.h
rename to common/serverinfo_user_container.h
index a959f4535..4a29bce2d 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.h
+++ b/common/serverinfo_user_container.h
@@ -14,15 +14,14 @@ public:
     ServerInfo_User_Container(const ServerInfo_User_Container &other);
     ServerInfo_User_Container &operator=(const ServerInfo_User_Container &other) = default;
     virtual ~ServerInfo_User_Container();
-    [[nodiscard]] ServerInfo_User *getUserInfo() const
+    ServerInfo_User *getUserInfo() const
     {
         return userInfo;
     }
     void setUserInfo(const ServerInfo_User &_userInfo);
     ServerInfo_User &
     copyUserInfo(ServerInfo_User &result, bool complete, bool internalInfo = false, bool sessionInfo = false) const;
-    [[nodiscard]] ServerInfo_User
-    copyUserInfo(bool complete, bool internalInfo = false, bool sessionInfo = false) const;
+    ServerInfo_User copyUserInfo(bool complete, bool internalInfo = false, bool sessionInfo = false) const;
 };
 
 #endif
diff --git a/libcockatrice_rng/libcockatrice/rng/sfmt/LICENSE.txt b/common/sfmt/LICENSE.txt
similarity index 100%
rename from libcockatrice_rng/libcockatrice/rng/sfmt/LICENSE.txt
rename to common/sfmt/LICENSE.txt
diff --git a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-common.h b/common/sfmt/SFMT-common.h
similarity index 100%
rename from libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-common.h
rename to common/sfmt/SFMT-common.h
diff --git a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params.h b/common/sfmt/SFMT-params.h
similarity index 100%
rename from libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params.h
rename to common/sfmt/SFMT-params.h
diff --git a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params19937.h b/common/sfmt/SFMT-params19937.h
similarity index 100%
rename from libcockatrice_rng/libcockatrice/rng/sfmt/SFMT-params19937.h
rename to common/sfmt/SFMT-params19937.h
diff --git a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c b/common/sfmt/SFMT.c
similarity index 100%
rename from libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c
rename to common/sfmt/SFMT.c
diff --git a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h b/common/sfmt/SFMT.h
similarity index 100%
rename from libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h
rename to common/sfmt/SFMT.h
diff --git a/libcockatrice_utility/libcockatrice/utility/trice_limits.h b/common/trice_limits.h
similarity index 100%
rename from libcockatrice_utility/libcockatrice/utility/trice_limits.h
rename to common/trice_limits.h
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/user_level.h b/common/user_level.h
similarity index 85%
rename from libcockatrice_network/libcockatrice/network/server/remote/user_level.h
rename to common/user_level.h
index 9b7a0ca88..5d720c0aa 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/user_level.h
+++ b/common/user_level.h
@@ -6,8 +6,9 @@
 // https://github.com/protocolbuffers/protobuf/issues/119
 #undef TYPE_BOOL
 #endif
+#include "pb/serverinfo_user.pb.h"
+
 #include <QFlags>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 Q_DECLARE_FLAGS(UserLevelFlags, ServerInfo_User::UserLevelFlag)
 Q_DECLARE_OPERATORS_FOR_FLAGS(UserLevelFlags)
diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt
new file mode 100644
index 000000000..bc03a5ad3
--- /dev/null
+++ b/dbconverter/CMakeLists.txt
@@ -0,0 +1,139 @@
+# CMakeLists for dbconverter directory
+
+project(Dbconverter VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+
+set(dbconverter_SOURCES
+    src/main.cpp
+    src/mocks.cpp
+    ../cockatrice/src/card/card_info.cpp
+    ../cockatrice/src/card/exact_card.cpp
+    ../cockatrice/src/database/card_database.cpp
+    ../cockatrice/src/database/card_database_loader.cpp
+    ../cockatrice/src/database/card_database_querier.cpp
+    ../cockatrice/src/database/parser/card_database_parser.cpp
+    ../cockatrice/src/database/parser/cockatrice_xml_3.cpp
+    ../cockatrice/src/database/parser/cockatrice_xml_4.cpp
+    ../cockatrice/src/settings/settings_manager.cpp
+    ${VERSION_STRING_CPP}
+)
+
+set(QT_DONT_USE_QTGUI TRUE)
+
+if(Qt6_FOUND)
+  qt6_wrap_cpp(
+    dbconverter_SOURCES ../cockatrice/src/settings/cache_settings.h ../cockatrice/src/settings/card_database_settings.h
+  )
+elseif(Qt5_FOUND)
+  qt5_wrap_cpp(
+    dbconverter_SOURCES ../cockatrice/src/settings/cache_settings.h ../cockatrice/src/settings/card_database_settings.h
+  )
+endif()
+
+# Include directories
+include_directories(../common) # Required due to card_ref.h
+
+# Build servatrice binary and link it
+add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_MOC_SRCS} ${dbconverter_SOURCES})
+
+target_link_libraries(dbconverter ${DB_CONVERTER_QT_MODULES})
+
+# install rules
+if(UNIX)
+  if(APPLE)
+    set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}")
+    set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.cockatrice.${PROJECT_NAME}")
+    set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME}-${PROJECT_VERSION}")
+    set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME})
+    set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION})
+    set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION})
+
+    install(TARGETS dbconverter BUNDLE DESTINATION ./)
+  else()
+    # Assume linux
+    install(TARGETS dbconverter RUNTIME DESTINATION bin/)
+  endif()
+elseif(WIN32)
+  install(TARGETS dbconverter RUNTIME DESTINATION ./)
+endif()
+
+if(APPLE)
+  # these needs to be relative to CMAKE_INSTALL_PREFIX
+  set(plugin_dest_dir dbconverter.app/Contents/Plugins)
+  set(qtconf_dest_dir dbconverter.app/Contents/Resources)
+
+  # Qt plugins: platforms
+  install(
+    DIRECTORY "${QT_PLUGINS_DIR}/"
+    DESTINATION ${plugin_dest_dir}
+    COMPONENT Runtime
+    FILES_MATCHING
+    PATTERN "*.dSYM" EXCLUDE
+    PATTERN "*_debug.dylib" EXCLUDE
+    PATTERN "platforms/*.dylib"
+  )
+
+  install(
+    CODE "
+        file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
+Plugins = Plugins
+Translations = Resources/translations\")
+    "
+    COMPONENT Runtime
+  )
+
+  install(
+    CODE "
+        file(GLOB_RECURSE QTPLUGINS
+        \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\")
+    set(BU_CHMOD_BUNDLE_ITEMS ON)
+    include(BundleUtilities)
+    fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\")
+    "
+    COMPONENT Runtime
+  )
+endif()
+
+if(WIN32)
+  # these needs to be relative to CMAKE_INSTALL_PREFIX
+  set(plugin_dest_dir Plugins)
+  set(qtconf_dest_dir .)
+
+  install(
+    DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
+    DESTINATION ./
+    FILES_MATCHING
+    PATTERN "*.dll"
+  )
+
+  # Qt plugins: platforms
+  install(
+    DIRECTORY "${QT_PLUGINS_DIR}/"
+    DESTINATION ${plugin_dest_dir}
+    COMPONENT Runtime
+    FILES_MATCHING
+    PATTERN "platforms/qdirect2d.dll"
+    PATTERN "platforms/qminimal.dll"
+    PATTERN "platforms/qoffscreen.dll"
+    PATTERN "platforms/qwindows.dll"
+  )
+
+  install(
+    CODE "
+        file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
+Plugins = Plugins
+Translations = Resources/translations\")
+    "
+    COMPONENT Runtime
+  )
+
+  install(
+    CODE "
+        file(GLOB_RECURSE QTPLUGINS
+        \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\")
+    set(BU_CHMOD_BUNDLE_ITEMS ON)
+    include(BundleUtilities)
+    fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
+    "
+    COMPONENT Runtime
+  )
+endif()
diff --git a/dbconverter/src/main.cpp b/dbconverter/src/main.cpp
new file mode 100644
index 000000000..f64392fa8
--- /dev/null
+++ b/dbconverter/src/main.cpp
@@ -0,0 +1,67 @@
+/***************************************************************************
+ *   Copyright (C) 2019 by Fabio Bas   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "main.h"
+
+#include "mocks.h"
+#include "version_string.h"
+
+#include <QCommandLineParser>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFileInfo>
+#include <QtGlobal>
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+    app.setOrganizationName("Cockatrice");
+    app.setApplicationName("Dbconverter");
+    app.setApplicationVersion(VERSION_STRING);
+
+    QCommandLineParser parser;
+    parser.addPositionalArgument("olddb", "Read existing card database from <file>");
+    parser.addPositionalArgument("newdb", "Write new card database to <file>");
+    parser.addHelpOption();
+    parser.addVersionOption();
+    parser.process(app);
+
+    QString oldDbPath;
+    QString newDbPath;
+    QStringList args = parser.positionalArguments();
+    if (args.count() == 2) {
+        oldDbPath = QFileInfo(args.at(0)).absoluteFilePath();
+        newDbPath = QFileInfo(args.at(1)).absoluteFilePath();
+    } else {
+        qCritical() << "Usage: dbconverter <olddb> <newdb>";
+        parser.showHelp(1);
+        exit(0);
+    }
+
+    settingsCache = new SettingsCache;
+    CardDatabaseConverter *db = new CardDatabaseConverter;
+
+    qInfo() << "---------------------------------------------";
+    qInfo() << "Loading cards from" << oldDbPath;
+    db->loadCardDatabase(oldDbPath);
+    qInfo() << "---------------------------------------------";
+    qInfo() << "Saving cards to" << newDbPath;
+    db->saveCardDatabase(newDbPath);
+    qInfo() << "---------------------------------------------";
+}
diff --git a/dbconverter/src/main.h b/dbconverter/src/main.h
new file mode 100644
index 000000000..ccde6b20e
--- /dev/null
+++ b/dbconverter/src/main.h
@@ -0,0 +1,22 @@
+#ifndef MAIN_H
+#define MAIN_H
+
+#include "../../cockatrice/src/database/card_database.h"
+#include "../../cockatrice/src/database/parser/cockatrice_xml_4.h"
+
+class CardDatabaseConverter : public CardDatabase
+{
+public:
+    LoadStatus loadCardDatabase(const QString &path)
+    {
+        return loader->loadCardDatabase(path);
+    }
+
+    bool saveCardDatabase(const QString &fileName)
+    {
+        CockatriceXml4Parser parser;
+        return parser.saveToFile(sets, cards, fileName);
+    }
+};
+
+#endif
diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp
new file mode 100644
index 000000000..213b42f02
--- /dev/null
+++ b/dbconverter/src/mocks.cpp
@@ -0,0 +1,460 @@
+
+#include "mocks.h"
+
+CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent)
+    : SettingsManager(settingPath + "cardDatabase.ini", parent)
+{
+}
+void CardDatabaseSettings::setSortKey(QString /* shortName */, unsigned int /* sortKey */)
+{
+}
+void CardDatabaseSettings::setEnabled(QString /* shortName */, bool /* enabled */)
+{
+}
+void CardDatabaseSettings::setIsKnown(QString /* shortName */, bool /* isknown */)
+{
+}
+unsigned int CardDatabaseSettings::getSortKey(QString /* shortName */)
+{
+    return 0;
+};
+bool CardDatabaseSettings::isEnabled(QString /* shortName */)
+{
+    return true;
+};
+bool CardDatabaseSettings::isKnown(QString /* shortName */)
+{
+    return true;
+};
+
+QString SettingsCache::getDataPath()
+{
+    return "";
+}
+QString SettingsCache::getSettingsPath()
+{
+    return "";
+}
+void SettingsCache::translateLegacySettings()
+{
+}
+QString SettingsCache::getSafeConfigPath(QString /* configEntry */, QString defaultPath) const
+{
+    return defaultPath;
+}
+QString SettingsCache::getSafeConfigFilePath(QString /* configEntry */, QString defaultPath) const
+{
+    return defaultPath;
+}
+SettingsCache::SettingsCache()
+    : settings{new QSettings("global.ini", QSettings::IniFormat, this)}, shortcutsSettings{nullptr},
+      cardDatabaseSettings{new CardDatabaseSettings("", this)}, serversSettings{nullptr}, messageSettings{nullptr},
+      gameFiltersSettings{nullptr}, layoutsSettings{nullptr}, downloadSettings{nullptr}
+{
+}
+void SettingsCache::setUseTearOffMenus(bool /* _useTearOffMenus */)
+{
+}
+void SettingsCache::setCardViewInitialRowsMax(int /* _cardViewInitialRowsMax */)
+{
+}
+void SettingsCache::setCardViewExpandedRowsMax(int /* value */)
+{
+}
+void SettingsCache::setCloseEmptyCardView(const QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setFocusCardViewSearchBar(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setKnownMissingFeatures(const QString & /* _knownMissingFeatures */)
+{
+}
+void SettingsCache::setCardInfoViewMode(const int /* _viewMode */)
+{
+}
+void SettingsCache::setHighlightWords(const QString & /* _highlightWords */)
+{
+}
+void SettingsCache::setMasterVolume(int /* _masterVolume */)
+{
+}
+void SettingsCache::setLeftJustified(const QT_STATE_CHANGED_T /* _leftJustified */)
+{
+}
+void SettingsCache::setCardScaling(const QT_STATE_CHANGED_T /* _scaleCards */)
+{
+}
+void SettingsCache::setStackCardOverlapPercent(const int /* _verticalCardOverlapPercent */)
+{
+}
+void SettingsCache::setShowMessagePopups(const QT_STATE_CHANGED_T /* _showMessagePopups */)
+{
+}
+void SettingsCache::setShowMentionPopups(const QT_STATE_CHANGED_T /* _showMentionPopus */)
+{
+}
+void SettingsCache::setRoomHistory(const QT_STATE_CHANGED_T /* _roomHistory */)
+{
+}
+void SettingsCache::setLang(const QString & /* _lang */)
+{
+}
+void SettingsCache::setShowTipsOnStartup(bool /* _showTipsOnStartup */)
+{
+}
+void SettingsCache::setSeenTips(const QList<int> & /* _seenTips */)
+{
+}
+void SettingsCache::setDeckPath(const QString & /* _deckPath */)
+{
+}
+void SettingsCache::setFiltersPath(const QString & /*_filtersPath */)
+{
+}
+void SettingsCache::setReplaysPath(const QString & /* _replaysPath */)
+{
+}
+void SettingsCache::setThemesPath(const QString & /* _themesPath */)
+{
+}
+void SettingsCache::setPicsPath(const QString & /* _picsPath */)
+{
+}
+void SettingsCache::setCardDatabasePath(const QString & /* _cardDatabasePath */)
+{
+}
+void SettingsCache::setCustomCardDatabasePath(const QString & /* _customCardDatabasePath */)
+{
+}
+void SettingsCache::setSpoilerDatabasePath(const QString & /* _spoilerDatabasePath */)
+{
+}
+void SettingsCache::setTokenDatabasePath(const QString & /* _tokenDatabasePath */)
+{
+}
+void SettingsCache::setThemeName(const QString & /* _themeName */)
+{
+}
+void SettingsCache::setHomeTabBackgroundSource(const QString & /* _backgroundSource */)
+{
+}
+void SettingsCache::setHomeTabBackgroundShuffleFrequency(int /* frequency */)
+{
+}
+void SettingsCache::setTabVisualDeckStorageOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabServerOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabAccountOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabDeckStorageOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabReplaysOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabAdminOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabLogOpen(bool /*value*/)
+{
+}
+void SettingsCache::setPicDownload(QT_STATE_CHANGED_T /* _picDownload */)
+{
+}
+void SettingsCache::setShowStatusBar(bool /* value */)
+{
+}
+void SettingsCache::setNotificationsEnabled(QT_STATE_CHANGED_T /* _notificationsEnabled */)
+{
+}
+void SettingsCache::setSpectatorNotificationsEnabled(QT_STATE_CHANGED_T /* _spectatorNotificationsEnabled */)
+{
+}
+void SettingsCache::setBuddyConnectNotificationsEnabled(QT_STATE_CHANGED_T /* _buddyConnectNotificationsEnabled */)
+{
+}
+void SettingsCache::setDoubleClickToPlay(QT_STATE_CHANGED_T /* _doubleClickToPlay */)
+{
+}
+void SettingsCache::setClickPlaysAllSelected(QT_STATE_CHANGED_T /* _clickPlaysAllSelected */)
+{
+}
+void SettingsCache::setPlayToStack(QT_STATE_CHANGED_T /* _playToStack */)
+{
+}
+void SettingsCache::setStartingHandSize(int /* _startingHandSize */)
+{
+}
+void SettingsCache::setAnnotateTokens(QT_STATE_CHANGED_T /* _annotateTokens */)
+{
+}
+void SettingsCache::setTabGameSplitterSizes(const QByteArray & /* _tabGameSplitterSizes */)
+{
+}
+void SettingsCache::setShowShortcuts(QT_STATE_CHANGED_T /* _showShortcuts */)
+{
+}
+void SettingsCache::setDisplayCardNames(QT_STATE_CHANGED_T /* _displayCardNames */)
+{
+}
+void SettingsCache::setOverrideAllCardArtWithPersonalPreference(QT_STATE_CHANGED_T /* _displayCardNames */)
+{
+}
+void SettingsCache::setBumpSetsWithCardsInDeckToTop(QT_STATE_CHANGED_T /* _bumpSetsWithCardsInDeckToTop */)
+{
+}
+void SettingsCache::setPrintingSelectorSortOrder(int /* _printingSelectorSortOrder */)
+{
+}
+void SettingsCache::setPrintingSelectorCardSize(int /* _printingSelectorCardSize */)
+{
+}
+void SettingsCache::setIncludeRebalancedCards(bool /* _includeRebalancedCards */)
+{
+}
+void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T /* _navigationButtonsVisible */)
+{
+}
+void SettingsCache::setDeckEditorBannerCardComboBoxVisible(
+    QT_STATE_CHANGED_T /* _deckEditorBannerCardComboBoxVisible */)
+{
+}
+void SettingsCache::setDeckEditorTagsWidgetVisible(QT_STATE_CHANGED_T /* _deckEditorTagsWidgetVisible */)
+{
+}
+void SettingsCache::setVisualDeckStorageSortingOrder(int /* _visualDeckStorageSortingOrder */)
+{
+}
+void SettingsCache::setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T /* _showTags */)
+{
+}
+void SettingsCache::setVisualDeckStorageDefaultTagsList(QStringList /* _defaultTagsList */)
+{
+}
+void SettingsCache::setVisualDeckStorageSearchFolderNames(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setVisualDeckStorageShowBannerCardComboBox(QT_STATE_CHANGED_T /* _showBannerCardComboBox */)
+{
+}
+void SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T /* _showTags */)
+{
+}
+void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */)
+{
+}
+void SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities(
+    QT_STATE_CHANGED_T /* _visualDeckStorageDrawUnusedColorIdentities */)
+{
+}
+void SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity(
+    int /* _visualDeckStorageUnusedColorIdentitiesOpacity */)
+{
+}
+void SettingsCache::setVisualDeckStorageTooltipType(int /* value */)
+{
+}
+void SettingsCache::setVisualDeckStoragePromptForConversion(bool /* _visualDeckStoragePromptForConversion */)
+{
+}
+void SettingsCache::setVisualDeckStorageAlwaysConvert(bool /* _visualDeckStorageAlwaysConvert */)
+{
+}
+void SettingsCache::setVisualDeckStorageInGame(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setDefaultDeckEditorType(int /* value */)
+{
+}
+void SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T /* _enabled */)
+{
+}
+void SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int /* _amount */)
+{
+}
+void SettingsCache::setVisualDeckEditorSampleHandSize(int /* _amount */)
+{
+}
+void SettingsCache::setHorizontalHand(QT_STATE_CHANGED_T /* _horizontalHand */)
+{
+}
+void SettingsCache::setInvertVerticalCoordinate(QT_STATE_CHANGED_T /* _invertVerticalCoordinate */)
+{
+}
+void SettingsCache::setMinPlayersForMultiColumnLayout(int /* _minPlayersForMultiColumnLayout */)
+{
+}
+void SettingsCache::setTapAnimation(QT_STATE_CHANGED_T /* _tapAnimation */)
+{
+}
+void SettingsCache::setAutoRotateSidewaysLayoutCards(QT_STATE_CHANGED_T /* _autoRotateSidewaysLayoutCards */)
+{
+}
+void SettingsCache::setOpenDeckInNewTab(QT_STATE_CHANGED_T /* _openDeckInNewTab */)
+{
+}
+void SettingsCache::setRewindBufferingMs(int /* _rewindBufferingMs */)
+{
+}
+void SettingsCache::setChatMention(QT_STATE_CHANGED_T /* _chatMention */)
+{
+}
+void SettingsCache::setChatMentionCompleter(const QT_STATE_CHANGED_T /* _enableMentionCompleter */)
+{
+}
+void SettingsCache::setChatMentionForeground(QT_STATE_CHANGED_T /* _chatMentionForeground */)
+{
+}
+void SettingsCache::setChatHighlightForeground(QT_STATE_CHANGED_T /* _chatHighlightForeground */)
+{
+}
+void SettingsCache::setChatMentionColor(const QString & /* _chatMentionColor */)
+{
+}
+void SettingsCache::setChatHighlightColor(const QString & /* _chatHighlightColor */)
+{
+}
+void SettingsCache::setZoneViewGroupByIndex(int /* _zoneViewGroupByIndex */)
+{
+}
+void SettingsCache::setZoneViewSortByIndex(int /* _zoneViewSortByIndex */)
+{
+}
+void SettingsCache::setZoneViewPileView(QT_STATE_CHANGED_T /* _zoneViewPileView */)
+{
+}
+void SettingsCache::setSoundEnabled(QT_STATE_CHANGED_T /* _soundEnabled */)
+{
+}
+void SettingsCache::setSoundThemeName(const QString & /* _soundThemeName */)
+{
+}
+void SettingsCache::setIgnoreUnregisteredUsers(QT_STATE_CHANGED_T /* _ignoreUnregisteredUsers */)
+{
+}
+void SettingsCache::setIgnoreUnregisteredUserMessages(QT_STATE_CHANGED_T /* _ignoreUnregisteredUserMessages */)
+{
+}
+void SettingsCache::setMainWindowGeometry(const QByteArray & /* _mainWindowGeometry */)
+{
+}
+void SettingsCache::setTokenDialogGeometry(const QByteArray & /* _tokenDialogGeometry */)
+{
+}
+void SettingsCache::setSetsDialogGeometry(const QByteArray & /* _setsDialogGeometry */)
+{
+}
+void SettingsCache::setPixmapCacheSize(const int /* _pixmapCacheSize */)
+{
+}
+void SettingsCache::setNetworkCacheSizeInMB(const int /* _networkCacheSize */)
+{
+}
+void SettingsCache::setNetworkRedirectCacheTtl(const int /* _redirectCacheTtl */)
+{
+}
+void SettingsCache::setClientID(const QString & /* _clientID */)
+{
+}
+void SettingsCache::setClientVersion(const QString & /* _clientVersion */)
+{
+}
+QStringList SettingsCache::getCountries() const
+{
+    static QStringList countries = QStringList() << "us";
+    return countries;
+}
+void SettingsCache::setGameDescription(const QString /* _gameDescription */)
+{
+}
+void SettingsCache::setMaxPlayers(const int /* _maxPlayers */)
+{
+}
+void SettingsCache::setGameTypes(const QString /* _gameTypes */)
+{
+}
+void SettingsCache::setOnlyBuddies(const bool /* _onlyBuddies */)
+{
+}
+void SettingsCache::setOnlyRegistered(const bool /* _onlyRegistered */)
+{
+}
+void SettingsCache::setSpectatorsAllowed(const bool /* _spectatorsAllowed */)
+{
+}
+void SettingsCache::setSpectatorsNeedPassword(const bool /* _spectatorsNeedPassword */)
+{
+}
+void SettingsCache::setSpectatorsCanTalk(const bool /* _spectatorsCanTalk */)
+{
+}
+void SettingsCache::setSpectatorsCanSeeEverything(const bool /* _spectatorsCanSeeEverything */)
+{
+}
+void SettingsCache::setCreateGameAsSpectator(const bool /* _createGameAsSpectator */)
+{
+}
+void SettingsCache::setDefaultStartingLifeTotal(const int /* _startingLifeTotal */)
+{
+}
+void SettingsCache::setShareDecklistsOnLoad(const bool /* _shareDecklistsOnLoad */)
+{
+}
+void SettingsCache::setRememberGameSettings(const bool /* _rememberGameSettings */)
+{
+}
+void SettingsCache::setCheckUpdatesOnStartup(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setStartupCardUpdateCheckPromptForUpdate(bool /* value */)
+{
+}
+void SettingsCache::setStartupCardUpdateCheckAlwaysUpdate(bool /* value */)
+{
+}
+void SettingsCache::setCardUpdateCheckInterval(int /* value */)
+{
+}
+void SettingsCache::setLastCardUpdateCheck(QDate /* value */)
+{
+}
+void SettingsCache::setNotifyAboutUpdate(QT_STATE_CHANGED_T /* _notifyaboutupdate */)
+{
+}
+void SettingsCache::setNotifyAboutNewVersion(QT_STATE_CHANGED_T /* _notifyaboutnewversion */)
+{
+}
+void SettingsCache::setDownloadSpoilerStatus(bool /* _spoilerStatus */)
+{
+}
+void SettingsCache::setUpdateReleaseChannelIndex(int /* value */)
+{
+}
+void SettingsCache::setMaxFontSize(int /* _max */)
+{
+}
+void SettingsCache::setRoundCardCorners(bool /* _roundCardCorners */)
+{
+}
+
+void PictureLoader::clearPixmapCache(CardInfoPtr /* card */)
+{
+}
+
+SettingsCache *settingsCache;
+
+SettingsCache &SettingsCache::instance()
+{
+    return *settingsCache;
+}
diff --git a/dbconverter/src/mocks.h b/dbconverter/src/mocks.h
new file mode 100644
index 000000000..18a50155b
--- /dev/null
+++ b/dbconverter/src/mocks.h
@@ -0,0 +1,23 @@
+/*
+ * Beware of this preprocessor hack used to redefine the settingCache class
+ * instead of including it and all of its dependencies.
+ * Always set header guards of mocked objects before including any headers
+ * with mocked objects.
+ */
+
+#include <QObject>
+#include <QString>
+
+#define PICTURELOADER_H
+
+#include "../../cockatrice/src/database/card_database.h"
+#include "../../cockatrice/src/settings/cache_settings.h"
+#include "../../cockatrice/src/utility/macros.h"
+
+extern SettingsCache *settingsCache;
+
+class PictureLoader
+{
+public:
+    static void clearPixmapCache(CardInfoPtr card);
+};
diff --git a/doc/carddatabase_v4/cards.xsd b/doc/carddatabase_v4/cards.xsd
index 92d30b94f..9a879302b 100644
--- a/doc/carddatabase_v4/cards.xsd
+++ b/doc/carddatabase_v4/cards.xsd
@@ -30,7 +30,6 @@
                 <xs:attribute type="xs:string" name="rarity" use="optional" />
                 <xs:attribute type="xs:boolean" name="isOnlineOnly" use="optional" />
                 <xs:attribute type="xs:boolean" name="isRebalanced" use="optional" />
-                <xs:attribute type="xs:string" name="flavorName" use="optional"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
diff --git a/doc/doxygen/DoxygenLayout.xml b/doc/doxygen/DoxygenLayout.xml
deleted file mode 100644
index 551391db3..000000000
--- a/doc/doxygen/DoxygenLayout.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doxygenlayout version="2.0">
-    <!-- Generated by doxygen 1.14.0 -->
-    <!-- Navigation index tabs for HTML output -->
-    <navindex>
-        <tab type="mainpage" visible="yes" title=""/>
-        <tab type="pages" visible="yes" title="" intro=""/>
-        <tab type="topics" visible="yes" title="" intro=""/>
-        <tab type="usergroup" title="Code Reference">
-            <tab type="modules" visible="no" title="" intro="">
-                <tab type="modulelist" visible="yes" title="" intro=""/>
-                <tab type="modulemembers" visible="yes" title="" intro=""/>
-            </tab>
-            <tab type="namespaces" visible="yes" title="">
-                <tab type="namespacelist" visible="yes" title="" intro=""/>
-                <tab type="namespacemembers" visible="yes" title="" intro=""/>
-            </tab>
-            <tab type="concepts" visible="no" title=""/>
-            <tab type="interfaces" visible="no" title="">
-                <tab type="interfacelist" visible="yes" title="" intro=""/>
-                <tab type="interfaceindex" visible="$ALPHABETICAL_INDEX" title=""/>
-                <tab type="interfacehierarchy" visible="yes" title="" intro=""/>
-            </tab>
-            <tab type="classes" visible="yes" title="">
-                <tab type="classlist" visible="yes" title="" intro=""/>
-                <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
-                <tab type="hierarchy" visible="yes" title="" intro=""/>
-                <tab type="classmembers" visible="yes" title="" intro=""/>
-            </tab>
-            <tab type="structs" visible="no" title="">
-                <tab type="structlist" visible="yes" title="" intro=""/>
-                <tab type="structindex" visible="$ALPHABETICAL_INDEX" title=""/>
-            </tab>
-            <tab type="exceptions" visible="no" title="">
-                <tab type="exceptionlist" visible="yes" title="" intro=""/>
-                <tab type="exceptionindex" visible="$ALPHABETICAL_INDEX" title=""/>
-                <tab type="exceptionhierarchy" visible="yes" title="" intro=""/>
-            </tab>
-            <tab type="files" visible="yes" title="">
-                <tab type="filelist" visible="yes" title="" intro=""/>
-                <tab type="globals" visible="yes" title="" intro=""/>
-            </tab>
-            <tab type="examples" visible="no" title="" intro=""/>
-        </tab>
-    </navindex>
-
-    <!-- Layout definition for a class page -->
-    <class>
-        <briefdescription visible="yes"/>
-        <includes visible="$SHOW_HEADERFILE"/>
-        <inheritancegraph visible="yes"/>
-        <collaborationgraph visible="yes"/>
-        <memberdecl>
-            <nestedclasses visible="yes" title=""/>
-            <publictypes visible="yes" title=""/>
-            <services visible="yes" title=""/>
-            <interfaces visible="yes" title=""/>
-            <publicslots visible="yes" title=""/>
-            <signals visible="yes" title=""/>
-            <publicmethods visible="yes" title=""/>
-            <publicstaticmethods visible="yes" title=""/>
-            <publicattributes visible="yes" title=""/>
-            <publicstaticattributes visible="yes" title=""/>
-            <protectedtypes visible="yes" title=""/>
-            <protectedslots visible="yes" title=""/>
-            <protectedmethods visible="yes" title=""/>
-            <protectedstaticmethods visible="yes" title=""/>
-            <protectedattributes visible="yes" title=""/>
-            <protectedstaticattributes visible="yes" title=""/>
-            <packagetypes visible="yes" title=""/>
-            <packagemethods visible="yes" title=""/>
-            <packagestaticmethods visible="yes" title=""/>
-            <packageattributes visible="yes" title=""/>
-            <packagestaticattributes visible="yes" title=""/>
-            <properties visible="yes" title=""/>
-            <events visible="yes" title=""/>
-            <privatetypes visible="yes" title=""/>
-            <privateslots visible="yes" title=""/>
-            <privatemethods visible="yes" title=""/>
-            <privatestaticmethods visible="yes" title=""/>
-            <privateattributes visible="yes" title=""/>
-            <privatestaticattributes visible="yes" title=""/>
-            <friends visible="yes" title=""/>
-            <related visible="yes" title="" subtitle=""/>
-            <membergroups visible="yes"/>
-        </memberdecl>
-        <detaileddescription visible="yes" title=""/>
-        <memberdef>
-            <inlineclasses visible="yes" title=""/>
-            <typedefs visible="yes" title=""/>
-            <enums visible="yes" title=""/>
-            <services visible="yes" title=""/>
-            <interfaces visible="yes" title=""/>
-            <constructors visible="yes" title=""/>
-            <functions visible="yes" title=""/>
-            <related visible="yes" title=""/>
-            <variables visible="yes" title=""/>
-            <properties visible="yes" title=""/>
-            <events visible="yes" title=""/>
-        </memberdef>
-        <allmemberslink visible="yes"/>
-        <usedfiles visible="$SHOW_USED_FILES"/>
-        <authorsection visible="yes"/>
-    </class>
-
-    <!-- Layout definition for a namespace page -->
-    <namespace>
-        <briefdescription visible="yes"/>
-        <memberdecl>
-            <nestednamespaces visible="yes" title=""/>
-            <constantgroups visible="yes" title=""/>
-            <interfaces visible="yes" title=""/>
-            <classes visible="yes" title=""/>
-            <concepts visible="yes" title=""/>
-            <structs visible="yes" title=""/>
-            <exceptions visible="yes" title=""/>
-            <typedefs visible="yes" title=""/>
-            <sequences visible="yes" title=""/>
-            <dictionaries visible="yes" title=""/>
-            <enums visible="yes" title=""/>
-            <functions visible="yes" title=""/>
-            <variables visible="yes" title=""/>
-            <properties visible="yes" title=""/>
-            <membergroups visible="yes"/>
-        </memberdecl>
-        <detaileddescription visible="yes" title=""/>
-        <memberdef>
-            <inlineclasses visible="yes" title=""/>
-            <typedefs visible="yes" title=""/>
-            <sequences visible="yes" title=""/>
-            <dictionaries visible="yes" title=""/>
-            <enums visible="yes" title=""/>
-            <functions visible="yes" title=""/>
-            <variables visible="yes" title=""/>
-            <properties visible="yes" title=""/>
-        </memberdef>
-        <authorsection visible="yes"/>
-    </namespace>
-
-    <!-- Layout definition for a concept page -->
-    <concept>
-        <briefdescription visible="yes"/>
-        <includes visible="$SHOW_HEADERFILE"/>
-        <definition visible="yes" title=""/>
-        <detaileddescription visible="yes" title=""/>
-        <authorsection visible="yes"/>
-    </concept>
-
-    <!-- Layout definition for a file page -->
-    <file>
-        <briefdescription visible="yes"/>
-        <includes visible="$SHOW_INCLUDE_FILES"/>
-        <includegraph visible="yes"/>
-        <includedbygraph visible="yes"/>
-        <sourcelink visible="yes"/>
-        <memberdecl>
-            <interfaces visible="yes" title=""/>
-            <classes visible="yes" title=""/>
-            <structs visible="yes" title=""/>
-            <exceptions visible="yes" title=""/>
-            <namespaces visible="yes" title=""/>
-            <concepts visible="yes" title=""/>
-            <constantgroups visible="yes" title=""/>
-            <defines visible="yes" title=""/>
-            <typedefs visible="yes" title=""/>
-            <sequences visible="yes" title=""/>
-            <dictionaries visible="yes" title=""/>
-            <enums visible="yes" title=""/>
-            <functions visible="yes" title=""/>
-            <variables visible="yes" title=""/>
-            <properties visible="yes" title=""/>
-            <membergroups visible="yes"/>
-        </memberdecl>
-        <detaileddescription visible="yes" title=""/>
-        <memberdef>
-            <inlineclasses visible="yes" title=""/>
-            <defines visible="yes" title=""/>
-            <typedefs visible="yes" title=""/>
-            <sequences visible="yes" title=""/>
-            <dictionaries visible="yes" title=""/>
-            <enums visible="yes" title=""/>
-            <functions visible="yes" title=""/>
-            <variables visible="yes" title=""/>
-            <properties visible="yes" title=""/>
-        </memberdef>
-        <authorsection/>
-    </file>
-
-    <!-- Layout definition for a group page -->
-    <group>
-        <briefdescription visible="yes"/>
-        <groupgraph visible="yes"/>
-        <memberdecl>
-            <nestedgroups visible="yes" title=""/>
-            <modules visible="yes" title=""/>
-            <dirs visible="yes" title=""/>
-            <files visible="yes" title=""/>
-            <namespaces visible="yes" title=""/>
-            <concepts visible="yes" title=""/>
-            <classes visible="yes" title=""/>
-            <defines visible="yes" title=""/>
-            <typedefs visible="yes" title=""/>
-            <sequences visible="yes" title=""/>
-            <dictionaries visible="yes" title=""/>
-            <enums visible="yes" title=""/>
-            <enumvalues visible="yes" title=""/>
-            <functions visible="yes" title=""/>
-            <variables visible="yes" title=""/>
-            <signals visible="yes" title=""/>
-            <publicslots visible="yes" title=""/>
-            <protectedslots visible="yes" title=""/>
-            <privateslots visible="yes" title=""/>
-            <events visible="yes" title=""/>
-            <properties visible="yes" title=""/>
-            <friends visible="yes" title=""/>
-            <membergroups visible="yes"/>
-        </memberdecl>
-        <detaileddescription visible="yes" title=""/>
-        <memberdef>
-            <pagedocs/>
-            <inlineclasses visible="yes" title=""/>
-            <defines visible="yes" title=""/>
-            <typedefs visible="yes" title=""/>
-            <sequences visible="yes" title=""/>
-            <dictionaries visible="yes" title=""/>
-            <enums visible="yes" title=""/>
-            <enumvalues visible="yes" title=""/>
-            <functions visible="yes" title=""/>
-            <variables visible="yes" title=""/>
-            <signals visible="yes" title=""/>
-            <publicslots visible="yes" title=""/>
-            <protectedslots visible="yes" title=""/>
-            <privateslots visible="yes" title=""/>
-            <events visible="yes" title=""/>
-            <properties visible="yes" title=""/>
-            <friends visible="yes" title=""/>
-        </memberdef>
-        <authorsection visible="yes"/>
-    </group>
-
-    <!-- Layout definition for a C++20 module page -->
-    <module>
-        <briefdescription visible="yes"/>
-        <exportedmodules visible="yes"/>
-        <memberdecl>
-            <concepts visible="yes" title=""/>
-            <classes visible="yes" title=""/>
-            <enums visible="yes" title=""/>
-            <typedefs visible="yes" title=""/>
-            <functions visible="yes" title=""/>
-            <variables visible="yes" title=""/>
-            <membergroups visible="yes" title=""/>
-        </memberdecl>
-        <detaileddescription visible="yes" title=""/>
-        <memberdecl>
-            <files visible="yes"/>
-        </memberdecl>
-    </module>
-
-    <!-- Layout definition for a directory page -->
-    <directory>
-        <briefdescription visible="yes"/>
-        <directorygraph visible="yes"/>
-        <memberdecl>
-            <dirs visible="yes"/>
-            <files visible="yes"/>
-        </memberdecl>
-        <detaileddescription visible="yes" title=""/>
-    </directory>
-</doxygenlayout>
diff --git a/doc/doxygen/README.md b/doc/doxygen/README.md
deleted file mode 100644
index 988147159..000000000
--- a/doc/doxygen/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Doxygen Documentation Theme
-
-Required changes to the `Doxyfile` config from the [theme docs](https://jothepro.github.io/doxygen-awesome-css/index.html#autotoc_md16) to make [doxygen-awesome-css](https://github.com/jothepro/doxygen-awesome-css) work:
-```
-HTML_EXTRA_STYLESHEET  = doxygen-awesome.css      # Main CSS file of the theme
-GENERATE_TREEVIEW      = YES                      # Optional, also works without
-HTML_COLORSTYLE        = LIGHT                    # Required with doxygen-awesome-css theme, Auto Dark Mode will still work
-DISABLE_INDEX          = NO                       # YES is bugged in the theme, see jothepro/doxygen-awesome-css/issues/201
-FULL_SIDEBAR           = NO                       # Required for doxygen-awesome-css theme
-```
-
-<br>
-
-Cockatrice dedicated color adjustments are configured in the [cockatrice_docs_style.css](https://github.com/Cockatrice/Cockatrice/blob/master/doc/doxygen/css/cockatrice_docs_style.css) file that uses & overrides the theme definitions.
diff --git a/doc/doxygen/css/cockatrice_docs_style.css b/doc/doxygen/css/cockatrice_docs_style.css
deleted file mode 100644
index e0177bdbb..000000000
--- a/doc/doxygen/css/cockatrice_docs_style.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-
-See "Awesome Doxygen CSS" theme docs:
-https://jothepro.github.io/doxygen-awesome-css/md_docs_2customization.html#autotoc_md36
-
-Adjustments here are based on the css file of the theme and variables defined there.
-
-*/
-
-
-/* Light Mode overrides */
-html {
-    --primary-color: #33a946;
-    --primary-dark-color: #33a946;
-    --primary-light-color: #33a946;
-}
-
-/* Dark Mode overrides */
-@media (prefers-color-scheme: dark) {
-    html:not(.light-mode) {
-        --primary-color: #33a946;
-        --primary-dark-color: #33a946;
-        --primary-light-color: #33a946;
-    }
-}
-
-/* Dark Mode overrides, defined twice to support both the dark-mode without and with doxygen-awesome-darkmode-toggle.js */
-html.dark-mode {
-    color-scheme: dark;
-    --primary-color: #33a946;
-    --primary-dark-color: #33a946;
-    --primary-light-color: #33a946;
-}
diff --git a/doc/doxygen/css/doxygen_style_old.css b/doc/doxygen/css/doxygen_style.css
similarity index 100%
rename from doc/doxygen/css/doxygen_style_old.css
rename to doc/doxygen/css/doxygen_style.css
diff --git a/doc/doxygen/css/hide_nav_sync.css b/doc/doxygen/css/hide_nav_sync.css
deleted file mode 100644
index ad06ce6ed..000000000
--- a/doc/doxygen/css/hide_nav_sync.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* hide navigation sync control and icons */
-#nav-sync,
-#nav-sync * {
-    display: none !important;
-}
-
-div.nav-sync-icon,
-div.nav-sync-icon * {
-    display: none !important;
-}
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md b/doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md
deleted file mode 100644
index 7b4bdafc3..000000000
--- a/doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md
+++ /dev/null
@@ -1,16 +0,0 @@
-@page card_database_schema_and_parsing Card Database Schema and Parsing
-
-# Card Database Schemas
-
-Cockatrice uses `XML files` to store information of available cards to be used in the app (`cards.xml`).  
-The token file follows the schema of the card database (`tokens.xml`), too.
-
-Saved decks (`<deckname>.xml`) use a different schema.
-
-- [XSD Schema for `Card Databases`](https://github.com/Cockatrice/Cockatrice/blob/master/doc/carddatabase_v4/cards.xsd) <kbd>v4</kbd>
-- [XSD Schema for `Decks`](https://github.com/Cockatrice/Cockatrice/blob/master/doc/deck.xsd) <kbd>v1</kbd>
-
-
-# Card Database Parsing
-
-TODO
diff --git a/doc/doxygen/extra-pages/developer_documentation/displaying_cards.md b/doc/doxygen/extra-pages/developer_documentation/displaying_cards.md
deleted file mode 100644
index 6a43097c5..000000000
--- a/doc/doxygen/extra-pages/developer_documentation/displaying_cards.md
+++ /dev/null
@@ -1,83 +0,0 @@
-@page displaying_cards Displaying Cards
-
-Cockatrice offers a number of widgets for displaying cards. To pick the right one for your purpose, it is first
-important
-to determine the context in which you will be displaying the card.
-
-# In-client
-
-In the client (like in your custom widgets), you can use the existing card display widgets.
-
-## Simple Display
-
-The most general purpose of these is @ref CardInfoPictureWidget, which simply displays a picture of a card.
-
-The textual equivalent to this is @ref CardInfoTextWidget, which displays all the properties of a card in text form.
-
-## Detailed Display
-
-The convenience class @ref CardInfoDisplayWidget displays both of these widgets in a tabbed container, which allows
-choosing between either visual, textual, or both representations at the same time. It is the class that is most
-familiar to our users when a single card is highlighted or inspected, since it is used in the deck editor and in-game
-for these purposes.
-
-If you would like the user to be able to inspect a single card in your custom widget, you should
-expose a @ref CardInfoDisplayWidget to them and incorporate it as a dock widget inside your custom widget.
-
-@ref CardInfoDisplayWidget is great for ensuring that the user has all the relevant details of a card available.
-It is crucial anywhere the user might encounter a card for the first time or needs to make an informed decision.
-
-## Visual Display
-
-However, there is a reason why it is possible to have a visual-only representation of the card in the
-@ref CardInfoDisplayWidget.
-
-Cards are, by design, meant to be represented as images and cards which we can reasonably
-expect the user to know (for example, cards contained in a user made deck or explicitly chosen by the user) can be
-represented with just their image as a sort of "visual shorthand".
-
-The simplest way to do this is of course, the above-mentioned @ref CardInfoPictureWidget which simply displays the
-picture without modifications.
-
-However, there exist a couple of other convenience classes which subclass @ref CardInfoPictureWidget to accomplish some
-things which you might find useful as well.
-
-- @ref CardInfoPictureWithTextOverlayWidget displays text overlaid on top of the card picture and scales this text to
-  fit automatically.
-- @ref DeckPreviewCardPictureWidget is a @ref CardInfoPictureWithTextOverlayWidget which also features a
-  raise-on-mouse-enter animation, controlled by the global setting (TODO: specify which).
-- @ref CardInfoPictureArtCropWidget attempts to display an 'art crop' of the card by cropping the upper region of the
-  card and only displaying that.
-
-## Groups of Cards
-
-Sometimes it is useful to display images of cards in groups, for example to represent the deck in the @ref
-VisualDeckEditorWidget or during confirmation in the pre-game lobby.
-
-To this end, Cockatrice offers three convenience classes to display cards for an index in a @ref DeckListModel in a
-group and one to display all cards in a particular zone of a @ref DeckListModel.
-
-The generic way to do this is @ref CardGroupDisplayWidget, which displays cards in @ref QVBoxLayout. This class is very
-generic and it is probably a better choice to either subclass it or use one of the two existing implementations.
-
-@ref FlatCardGroupDisplayWidget displays cards using a horizontal @ref FlowWidget. This means it will fill available
-screen space, left to right with no margins, with card pictures, skipping to a new line if it overflows available screen
-space horizontally.
-
-@ref OverlappedCardGroupDisplayWidget displays cards using an @ref OverlapWidget, which displays widgets on top of each
-other in vertical columns until it exceeds available screen space in which case it will start a new column. The amount
-of overlap as well as the overlap direction is configurable.
-
-@ref DeckCardZoneDisplayWidget can be used to visualize all cards in a zone with either a @ref
-FlatCardGroupDisplayWidget or a @ref OverlappedCardGroupDisplayWidget and headed by a @ref BannerWidget. It also allows
-grouping and sorting.
-
-# In-game
-
-The in-game view is a @ref QGraphicsScene, which means any widget we want to display inside of it should be a @ref
-QGraphicsObject.
-
-- @ref CardItem
-
-
-
diff --git a/doc/doxygen/extra-pages/developer_documentation/index.md b/doc/doxygen/extra-pages/developer_documentation/index.md
deleted file mode 100644
index da2d444d8..000000000
--- a/doc/doxygen/extra-pages/developer_documentation/index.md
+++ /dev/null
@@ -1,11 +0,0 @@
-@page developer_reference Developer Reference
-
-- @subpage logging
-
-- @subpage primer_cards
-
-- @subpage card_database_schema_and_parsing
-- @subpage querying_the_card_database
-
-- @subpage loading_card_pictures
-- @subpage displaying_cards
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md b/doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md
deleted file mode 100644
index b606f9e4b..000000000
--- a/doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md
+++ /dev/null
@@ -1,52 +0,0 @@
-@page loading_card_pictures Loading Card Pictures
-
-Pictures associated with CardInfo%s are retrieved either from on-disk or the network through the CardPictureLoader.
-
-In most cases, you don't need to concern yourself with the internals of CardPictureLoader.
-
-Simply using one of the ways described in @ref displaying_cards is enough to automatically queue a request to the
-CardPictureLoader when the chosen widget is shown, emitting signals to refresh the widget when the request is finished.
-
-# How requests are triggered
-
-CardPictureLoader::getPixmap() is called exactly two times in the code base, in CardInfoPictureWidget::loadPixmap(), the
-base class
-for all widget based card picture display, and AbstractCardItem::paintPicture(), the base class for all QGraphicsItem
-based card picture
-display. See @ref displaying_cards for more information on the difference between these two display methods.
-
-Because both of these calls are made in the paintEvent() methods of their respective classes, this means that requests
-are issued as soon as but not before the widget is shown on screen.
-
-It is also possible to "warm up" the cache by issuing card picture load requests to the CardPictureLoader without using
-a display widget and waiting for it to be shown by calling CardPictureLoader::cacheCardPixmaps() with a list of
-ExactCard%s.
-
-# The QPixmapCache and QNetworkDiskCache
-
-Cockatrice uses the QPixmapCache from the Qt GUI module to store card pictures in-memory and the QNetworkDiskCache from
-the Qt Network module to cache network requests for card pictures on-disk.
-
-What this means is that the CardPictureLoader will first attempt to look up a card in the QPixmapCache according to the
-ExactCard::getPixmapCacheKey() method of an ExactCard object. If it does not find it in the in-memory cache, it will
-issue a load request, which will first look for local images on-disk and then consult the QNetworkDiskCache and if
-found, use the stored binary data from the network cache to populate the in-memory pixmap cache under the card's cache
-key. If it is not found, it will then proceed with issuing a network request.
-
-The size of both of these caches can be configured by the user in the "Card Sources" settings page.
-
-# PixmapCacheKeys and ProviderIDs
-
-TODO
-
-# The Redirect Cache
-
-TODO
-
-# Local Image Loading
-
-TODO
-
-# URL Generation and Resolution
-
-TODO
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/developer_documentation/logging.md b/doc/doxygen/extra-pages/developer_documentation/logging.md
deleted file mode 100644
index 8fd5cb015..000000000
--- a/doc/doxygen/extra-pages/developer_documentation/logging.md
+++ /dev/null
@@ -1,184 +0,0 @@
-@page logging Logging
-
-Cockatrice uses QtLogging from the QtCore module for its logging. See
-the [official documentation](https://doc.qt.io/qt-6/qtlogging.html) for further details.
-
-# Log Message Pattern
-
-Any message logged through the QtLogging system automatically conforms to this message pattern:
-
-Generic:
-
-```
-[<timestamp> <log_level>] [<class:function>] - <message> [<filename>:<line_no>]
-```
-
-Example:
-
-```
-[2025-12-05 14:48:25.908 I] [MainWindow::startupConfigCheck] - Startup: found config with current version [window_main.cpp:951]
-```
-
-For more information, see [Logging Setup](#logging-setup).
-
-# Log Level and Categories
-
-\note The default log level for the application is info.
-
-This means that you should only use qInfo() in production-level code if you are truly sure that this message is
-beneficial to end-users and other developers. As a general rule, if your functionality logs to info more than twice in
-response to a user interaction, you are advised to consider moving some of these logs down to the debug level.
-
-\warning You are strongly advised to avoid the use of the generic logging macros (e.g. qDebug(), qInfo(), qWarn()).
-
-\note You should instead use the corresponding category logging macros (qCDebug(), qCInfo(), qCWarn()) and define
-logging
-categories for your log statements.
-
-Example:
-
-```c++
-in .h
-
-inline Q_LOGGING_CATEGORY(ExampleCategory, "cockatrice_example_category");
-inline Q_LOGGING_CATEGORY(ExampleSubCategory, "cockatrice_example_category.sub_category");
-
-in .cpp
-
-qCInfo(ExampleCategory) << "Info level logs are usually sent through the main category"
-qCDebug(ExampleSubCategory) << "Debug level logs are permitted their own category to allow selective silencing"
-```
-
-For more information on how to enable or disable logging categories,
-see [Logging Configuration](#logging-configuration).
-
-# Logging Configuration
-
-For configuring our logging, we use the qtlogging.ini, located under cockatrice/resources/config/qtlogging.ini, which is
-baked into the application in release version and set as the QT_LOGGING_CONF environment variable in main.cpp.
-
-```c++
-#ifdef Q_OS_APPLE
-    // <build>/cockatrice/cockatrice.app/Contents/MacOS/cockatrice
-    const QByteArray configPath = "../../../qtlogging.ini";
-#elif defined(Q_OS_UNIX)
-    // <build>/cockatrice/cockatrice
-    const QByteArray configPath = "./qtlogging.ini";
-#elif defined(Q_OS_WIN)
-    // <build>/cockatrice/Debug/cockatrice.exe
-    const QByteArray configPath = "../qtlogging.ini";
-#else
-    const QByteArray configPath = "";
-#endif
-
-    if (!qEnvironmentVariableIsSet(("QT_LOGGING_CONF"))) {
-        // Set the QT_LOGGING_CONF environment variable
-        qputenv("QT_LOGGING_CONF", configPath);
-    }
-```
-
-For more information on how to use this file and on how Qt evaluates which logging rules/file to use, please
-see the [official Qt documentation](https://doc.qt.io/qt-6/qloggingcategory.html#configuring-categories).
-
-Some examples:
-
-```
-# Turn off all logging except everything from card_picture_loader and all sub categories
-
-[Rules]
-# The default log level is info
-*.debug = false
-*.info = false
-*.warning = false
-*.critical = false
-*.fatal = false
-
-card_picture_loader.* = true
-```
-
-```
-# Turn off all logging except info level logs from card_picture_loader and all sub categories
-
-[Rules]
-# The default log level is info
-*.debug = false
-*.info = false
-*.warning = false
-*.critical = false
-*.fatal = false
-
-card_picture_loader.*.info = true
-```
-
-```
-[Rules]
-# Turn on debug level logs for card_picture_loader but keep logging for sub categories suppressed
-*.debug = false
-
-card_picture_loader.debug = true
-```
-
-```
-[Rules]
-# Turn on all logs for worker subcategory of card_picture_loader
-*.debug = false
-
-card_picture_loader.worker = true
-```
-
-```
-[Rules]
-# Turn off some noisy and irrelevant startup logging for local development
-*.debug = false
-
-qt_translator = false
-window_main.* = false
-release_channel = false
-spoiler_background_updater = false
-theme_manager = false
-sound_engine = false
-tapped_out_interface = false
-card_database = false
-card_database.loading = false
-card_database.loading.success_or_failure = true
-cockatrice_xml.* = false
-```
-
-# Logging Setup
-
-This is achieved through our logging setup in @ref main.cpp, where we set the message pattern and install a custom
-logger which replaces the full file path at the end with just the file name (Qt shows the full and quite lengthy path by
-default).
-
-```c++
-    qSetMessagePattern(
-        "\033[0m[%{time yyyy-MM-dd h:mm:ss.zzz} "
-        "%{if-debug}\033[36mD%{endif}%{if-info}\033[32mI%{endif}%{if-warning}\033[33mW%{endif}%{if-critical}\033[31mC%{"
-        "endif}%{if-fatal}\033[1;31mF%{endif}\033[0m] [%{function}] - %{message} [%{file}:%{line}]");
-    QApplication app(argc, argv);
-
-    QObject::connect(&app, &QApplication::lastWindowClosed, &app, &QApplication::quit);
-
-    qInstallMessageHandler(CockatriceLogger);
-```
-
-```c++
-static void CockatriceLogger(QtMsgType type, const QMessageLogContext &ctx, const QString &message)
-{
-    QString logMessage = qFormatLogMessage(type, ctx, message);
-
-    // Regular expression to match the full path in the square brackets and extract only the filename and line number
-    QRegularExpression regex(R"(\[(?:.:)?[\/\\].*[\/\\]([^\/\\]+\:\d+)\])");
-    QRegularExpressionMatch match = regex.match(logMessage);
-
-    if (match.hasMatch()) {
-        // Extract the filename and line number (e.g., "main.cpp:211")
-        QString filenameLine = match.captured(1);
-
-        // Replace the full path in square brackets with just the filename and line number
-        logMessage.replace(match.captured(0), QString("[%1]").arg(filenameLine));
-    }
-
-    Logger::getInstance().log(type, ctx, logMessage);
-}
-```
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/developer_documentation/primer_cards.md b/doc/doxygen/extra-pages/developer_documentation/primer_cards.md
deleted file mode 100644
index 8f79adbc9..000000000
--- a/doc/doxygen/extra-pages/developer_documentation/primer_cards.md
+++ /dev/null
@@ -1,71 +0,0 @@
-@page primer_cards A Primer on Cards
-
-# The Cockatrice Card Library
-
-All non-gui code related to cards used by Cockatrice is contained within libcockatrice_card.
-
-# A Basic Card Object: CardInfo
-
-A CardInfo object is the translational unit used by the CardDatabase to represent an on-disk XML entry as an in-memory
-Qt object.
-
-For a complete overview of the fields that define a CardInfo object, see the class documentation and more specifically
-@ref PrivateCardProperties.
-
-These fields correspond to either entries or a combination of entries in the XML card entry to which the
-CardDatabaseParser applies special logic to map, populate or determine their respective values in the CardInfo object.
-
-Any property to which special parsing is not applied is stored in CardInfo::properties and may be retrieved or set with
-CardInfo::getProperty() or CardInfo::setProperty() as well as CardInfo::getProperties() to get a collection of the
-property keys a CardInfo contains.
-
-For more information on how special fields contained within @ref PrivateCardProperties are parsed, see
-CockatriceXml4Parser::loadCardsFromXml().
-
-Apart from access to the basic and extended properties of a card, CardInfo also provides two important mechanisms to us.
-The first is the CardInfo::pixmapUpdated() signal, which allows the CardPictureLoader to signal when it is done
-manipulating (in most cases: loading) the QPixmap of an ExactCard::getPixmapCacheKey(), where the ExactCard::card
-corresponds to this CardInfo object.
-
-Put simply: Whenever the CardPictureLoader loads a new PrintingInfo which is not already in the cache, it emits this
-signal so that any widget using a CardInfo object can update the display of it to possibly use this new QPixmap.
-
-\attention It should be noted that it is not possible to use CardPictureLoader::getPixmap() with anything but an
-ExactCard, which is a CardInfo object associated with a PrintingInfo, i.e. a definitive printing of a specific card
-
-The other signal, CardInfo::cardInfoChanged() conceptually works much the same way, except it is concerned with the
-properties of the CardInfo object.
-
-# Getting specific: PrintingInfo and ExactCard
-
-## Printing Info
-
-A CardInfo object describes the basic properties of a card in much the same way that we say "Two cards with the same
-name are and should be equal if their properties are equal". However, there are certain (mostly visual) properties which
-might differ between printings of a card but still conceptually classify two instances of a card as "the same card".
-The most obvious example to this are cards which fundamentally share all properties except the artwork depicted on the
-card.
-
-We refer to such differences as Printings and track them in the PrintingInfo class. A PrintingInfo is always related to
-the CardSet that introduced the variation. Multiple variations can exist in the same CardSet and the respective
-PrintingInfo::getProperty() can be used to determine the differences, such as the collector numbers on the printings, if
-there are any.
-
-## Exact Card
-
-A CardInfo object is used to hold the functional properties of a card and a PrintingInfo object can be used to hold the
-visual properties of a card. To represent a 'physical' card, as in, a concrete immutable instance of a card, we can use
-ExactCard, which combines a CardInfo and a PrintingInfo object into one class. The class is used as a container around
-CardInfo objects whenever the user (and thus the program) expects to be presented with a defined card printing.
-
-# Using Cards
-
-For more information on the XML database schema which the CardDatabaseParser parses to generate CardInfo objects, see
-@ref card_database_schema_and_parsing.
-
-For more information on querying the CardDatabase for CardInfo objects, see @ref querying_the_card_database.
-
-For more information on displaying CardInfo and ExactCard objects using Qt Widgets, see @ref displaying_cards.
-
-For more information on how card pictures are loaded from disk or the network, see @ref loading_card_pictures as well as
-the CardPictureLoader documentation.
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/developer_documentation/querying_the_card_database.md b/doc/doxygen/extra-pages/developer_documentation/querying_the_card_database.md
deleted file mode 100644
index b2812b0ad..000000000
--- a/doc/doxygen/extra-pages/developer_documentation/querying_the_card_database.md
+++ /dev/null
@@ -1,39 +0,0 @@
-@page querying_the_card_database Querying the Card Database
-
-# The CardDatabaseQuerier Class
-
-The CardDatabaseQuerier is the only class used for querying the database. The CardDatabase is an in-memory map and thus
-provides no structured query language. CardDatabaseQuerier offers methods to retrieve cards by name, by providerID or in
-bulk, as CardSet%s.
-
-## Obtaining a handle to the CardDatabaseQuerier for usage
-
-To obtain the CardDatabaseQuerier related to the global CardDatabase singleton, use CardDatabaseManager::query().
-
-## Querying for known cards
-
-There are, essentially, two ways to ensure card equality, with the second being optional but necessitating the first.
-These two ways are CardInfo name equality and PrintingInfo provider ID equality.
-
-Because of this, most queries require, at the very least, a card name to match against and optionally a providerID to
-narrow the results.
-
-### Generic Card Infos
-
-To check if a card with the exact provided name exists as a CardInfo in the CardDatabase use,
-CardDatabaseQuerier::getCardInfo() or CardDatabaseQuerier::getCardInfos() for multiple cards.
-
-### Guessing Cards
-
-If the exact name might not be present in the CardDatabase, you can use CardDatabaseQuerier::getCardBySimpleName(),
-which automatically simplifies the card name and matches it against simplified card names in the CardDatabase.
-
-Alternatively, you can use CardDatabaseQuerier::lookupCardByName(), which first attempts an exact match search and then
-uses CardDatabaseQuerier::getCardBySimpleName() as a fallback.
-
-### ExactCard%s
-
-To obtain an ExactCard from the CardDatabaseQuerier, you must use a CardRef as a parameter to
-CardDatabaseQuerier::getCard(), CardDatabaseQuerier::getCards(), or CardDatabaseQuerier::guessCard().
-
-CardRef is a simple struct consisting of a card name and a card provider ID as QString%s.
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/index.md b/doc/doxygen/extra-pages/index.md
deleted file mode 100644
index b3363d3f4..000000000
--- a/doc/doxygen/extra-pages/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-@mainpage Documentation
-
-Welcome to the Cockatrice code documentation.
-
-- @subpage user_reference
-- @subpage developer_reference
-
-Please also check the <a href="https://cockatrice.github.io/" target="_blank" rel="noopener noreferrer">Cockatrice Webpage</a> or our <a href="https://github.com/Cockatrice/Cockatrice" target="_blank" rel="noopener noreferrer">Code Repository</a> for general information.
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/creating_decks.md b/doc/doxygen/extra-pages/user_documentation/deck_management/creating_decks.md
deleted file mode 100644
index 153320c3d..000000000
--- a/doc/doxygen/extra-pages/user_documentation/deck_management/creating_decks.md
+++ /dev/null
@@ -1,15 +0,0 @@
-@page creating_decks Creating Decks
-
-Creating a new deck is done using either the \ref editing_decks_classic or \ref editing_decks_visual.
-
-They can be accessed either by clicking the "Create Deck" button in the TabHome screen, which will open the default deck
-editor configured in the "User Interface" -> "Deck editor/storage settings" -> "Default deck editor type" setting, or
-by selecting "Deck Editor" or "Visual Deck Editor" under the "Tabs" application menu located at the top.
-
-# Further References
-
-- See @ref editing_decks for information on how to modify the attributes and contents of a deck in the Deck Editor
-widgets.
-- See @ref exporting_decks for information on how to store and persist your deck either in-client or to external
-services.
-- See @ref importing_decks for information on how to import existing decks either in-client or from external services
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks.md b/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks.md
deleted file mode 100644
index 37b613461..000000000
--- a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks.md
+++ /dev/null
@@ -1,6 +0,0 @@
-@page editing_decks Editing Decks
-
- - @subpage editing_decks_classic
- - @subpage editing_decks_visual
-
- - @subpage editing_decks_printings
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_classic.md b/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_classic.md
deleted file mode 100644
index f9f2239bc..000000000
--- a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_classic.md
+++ /dev/null
@@ -1,54 +0,0 @@
-@page editing_decks_classic Classic Deck Editor
-
-\image html classic_deck_editor.png width=900px
-
-# Editing Basic Deck Information
-
-Editing basic deck information is done through the deck dock widget (DeckEditorDeckDockWidget).
-
-\image html deckeditordeckdockwidget.png
-
-This widget allows editing:
-
-- The name
-- The comments
-- The banner card, which is used to represent the deck in the visual deck storage
-- The tags, which are used for filtering in the visual deck storage
-
-# Adding Cards
-
-Adding cards is done using the list of cards in the database presented in the list view on the left.
-
-\image html classic_database_display.png
-
-Cards can be added by either double-clicking an entry, pressing return with an entry selected to add it to the mainboard
-or pressing ctrl/cmd + return to add it to the sideboard.
-
-There are also buttons for these two functions on the right of the search bar above the list view.
-
-\image html classic_database_display_add_buttons.png
-
-# Modifying the Deck List
-
-To modify or remove cards in the deck list, the tree list view in the deck dock widget can be used.
-
-\image html deck_dock_deck_list.png
-
-Just above the list, at the top right, there are four buttons to manipulate the currently selected card(s):
-
-- Increment Card
-- Decrement Card
-- Remove Card
-- Switch Card between Mainboard and Sideboard
-
-\image html deck_dock_deck_list_buttons.png
-
-Additionally, there is a combo box above the list, which may be used to change how cards are grouped in the list
-display. This is only for visual display and does not affect how the list is saved.
-
-\image html deck_dock_deck_list_group_by.png
-
-# Modifying printings
-
-For more information on modifying the printings in a deck see @ref editing_decks_printings
-
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_printings.md b/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_printings.md
deleted file mode 100644
index 737575ae5..000000000
--- a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_printings.md
+++ /dev/null
@@ -1,122 +0,0 @@
-@page editing_decks_printings Printing Selector
-
-\image html printing_selector.png
-
-# Purpose
-
-The PrintingSelector allows editing the PrintingInfo associated with CardInfo%s contained in DeckList%s.
-
-As described in PrintingInfo, a CardInfo can have different variations contained within the same or different CardSet%s.
-
-PrintingSelector allows the user to choose a variation, as well as pinning a variation to be used as the preferred
-printing in all cases where the 'default' or 'most preferred' image should be shown.
-
-# Pre-requisites (User Interface)
-
-To use the printing selector, ensure that you are using the Post-ProviderID change behavior (Checkbox as shown in the
-image).
-
-\image html printing_selector_pre_providerid.png
-
-\attention This is the default behavior, unless you have explicitly changed it, in which case you will have seen a
-warning as follows. Once again, checking this box will *disable* the new behavior and revert you to the legacy system
-without the printing selector.
-
-Disabling the printing selector:
-
-\image html printing_selector_enable.png
-
-Enabling the printing selector:
-
-\image html printing_selector_disable.png
-
-# Pre-requisites (Card Database)
-
-The PrintingSelector requires each underlying CardInfo object to have a <set> entry with a *unique* providerID attribute
-for each variation that should be displayed.
-
-Here is an example, that first defines three sets, and then the 'Ace of Hearts' card with three variations.
-
-```xml
-<set rarity="common" uuid="00000000-0000-0000-0000-000000000033" num="51" muid="AH">PKR</set>
-<set rarity="common" uuid="00000000-0000-0000-0001-000000000033" num="51" muid="AHSTD">STD</set>
-<set rarity="common" uuid="00000000-0000-0000-0002-000000000033" num="51" muid="AHNBR">NBR</set>
-```
-
-```xml
-<?xml version='1.0' encoding='UTF-8'?>
-<cockatrice_carddatabase version="4">
-    <sets>
-        <set>
-            <name>PKR</name>
-            <longname>Cockatrice Poker</longname>
-            <settype>Custom</settype>
-            <releasedate>2025-11-15</releasedate>
-        </set>
-        <set>
-            <name>STD</name>
-            <longname>Standard Poker</longname>
-            <settype>core</settype>
-            <releasedate>2025-11-14</releasedate>
-        </set>
-        <set>
-            <name>NBR</name>
-            <longname>Numbers</longname>
-            <settype>core</settype>
-            <releasedate>2025-11-14</releasedate>
-        </set>
-    </sets>
-    <cards>
-        <card>
-            <name>Ace of Hearts</name>
-            <text>Ace of Hearts</text>
-            <prop>
-                <layout>normal</layout>
-                <side>front</side>
-                <type>Ace</type>
-                <maintype>Ace</maintype>
-                <manacost>14</manacost>
-                <cmc>14</cmc>
-                <colors>H</colors>
-                <coloridentity>H</coloridentity>
-                <format-standard>legal</format-standard>
-            </prop>
-            <reverse-related>Joker</reverse-related>
-            <token>0</token>
-            <tablerow>1</tablerow>
-            <cipt>0</cipt>
-            <upsidedown>0</upsidedown>
-            <set rarity="common" uuid="00000000-0000-0000-0000-000000000033" num="51" muid="AH">PKR</set>
-            <set rarity="common" uuid="00000000-0000-0000-0001-000000000033" num="51" muid="AHSTD">STD</set>
-            <set rarity="common" uuid="00000000-0000-0000-0002-000000000033" num="51" muid="AHNBR">NBR</set>
-        </card>
-    </cards>
-</cockatrice_carddatabase>
-```
-
-# Using the Printing Selector
-
-To use the PrintingSelector, first select a card in the DeckEditorDeckDockWidget:
-
-\image html deck_dock_deck_list.png
-
-You may add a variation to the mainboard by clicking the + and - buttons in the top row. The bottom row will add the
-variation to your sideboard.
-
-\image html printing_selector.png
-
-You can also right-click a variation to pin it, which will move it to the top of the variation list for easy access and
-additionally, use it as the default printing whenever the printing isn't explicitly specified (such as adding a card
-from the database in the deck editor).
-
-Only one printing may be pinned at a time.
-
-Additionally, the PrintingSelector offers a navigation bar at the bottom to navigate through cards in your deck, as well
-as an option to modify the variations of cards in bulk via the 'Bulk Selection' option.
-
-\image html printing_selector_navigation.png
-
-The search bar at the top may be used to filter the displayed variations and the cogwheel may be clicked to open up
-additional settings.
-
-\image html printing_selector_options.png
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_visual.md b/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_visual.md
deleted file mode 100644
index e7d503735..000000000
--- a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_visual.md
+++ /dev/null
@@ -1,93 +0,0 @@
-@page editing_decks_visual Visual Deck Editor
-
-\image html vde_overlap_layout_type_grouped.png width=1200px
-
-# Editing Basic Deck Information
-
-Editing basic deck information is done through the deck dock widget (DeckEditorDeckDockWidget).
-
-\image html deckeditordeckdockwidget.png
-
-This widget allows editing:
-
-- The name
-- The comments
-- The banner card, which is used to represent the deck in the visual deck storage
-- The tags, which are used for filtering in the visual deck storage
-
-# Adding Cards
-
-Adding cards is done by either using the "Quick search and add card" search bar at the top of the "Visual Deck View" tab
-or by clicking on a picture of a card in the "Visual Database Display" tab.
-
-See @ref visual_database_display for more information on how to utilize the visual database display.
-
-# Modifying the Deck List
-
-To modify or remove cards in the deck list, the tree list view in the deck dock widget can be used.
-
-\image html deck_dock_deck_list.png
-
-Just above the list, at the top right, there are four buttons to manipulate the currently selected card(s):
-
-- Increment Card
-- Decrement Card
-- Remove Card
-- Switch Card between Mainboard and Sideboard
-
-\image html deck_dock_deck_list_buttons.png
-
-Additionally, there is a combo box above the list, which may be used to change how cards are grouped in the list
-display. This is only for visual display and does not affect how the list is saved.
-
-\image html deck_dock_deck_list_group_by.png
-
-# Modifying the visual deck layout
-
-The visual deck editor displays cards visually, as opposed to simply in list form in the Deck Dock Widget. Each entry in
-the deck list is represented by a picture. These entries are grouped together under their respective sub-groups.
-Sub-groups may be collapsed (i.e. the pictures contained within them are hidden) by clicking on the name of the group in
-the banner.
-
-Cards may be displayed in a "Flat" layout, which displays each picture next to each other and ensures full
-visibility for each card.
-
-\image html vde_flat_layout_type_grouped.png width=1200px
-
-or in an "Overlap" layout, which overlaps cards on top of each other (leaving the top 20% of
-the card uncovered so names remain readable) and arranges them in stacks to save space and allow for an easy overview.
-
-\image html vde_overlap_layout_type_grouped.png width=1200px
-
-Additionally, it is possible to change how the cards in the deck list are grouped by selecting a different grouping
-method from the combo box, either in the top left of the "Visual Deck View" tab or above the list view in the deck dock
-widget.
-
-Example - Cards grouped by suit/color:
-
-\image html vde_flat_layout_color_grouped.png width=1200px
-
-Furthermore, it is possible to change how the cards are sorted within the sub-group. This is done by clicking on the
-button with the cogwheel icon next to the combo box that adjusts grouping in the top left of the "Visual Deck View" tab.
-This presents a list of available sort criteria, which may be rearranged to change their priorities.
-
-# Modifying printings
-
-For more information on modifying the printings in a deck see @ref editing_decks_printings
-
-# Deck Analytics
-
-The visual deck editor offers a "Deck Analytics" tab, which displays information about:
-
-- The mana curve
-- The mana devotion
-- The mana base
-
-\image html vde_deck_analytics.png width=1200px
-
-# Sample Hand
-
-The visual deck editor offers a "Sample Hand" tab, which allows simulating drawing a configurable amount of cards from
-the deck, which reduces the need to launch a single player game for testing purposes.
-
-\image html vde_sample_hand.png width=1200px
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/exporting_decks.md b/doc/doxygen/extra-pages/user_documentation/deck_management/exporting_decks.md
deleted file mode 100644
index 607ba3360..000000000
--- a/doc/doxygen/extra-pages/user_documentation/deck_management/exporting_decks.md
+++ /dev/null
@@ -1,151 +0,0 @@
-@page exporting_decks Exporting Decks
-
-# Where to export?
-
-There are two screens in the client which can be used to import decks, depending on the context.
-
-- The deck editor tab
-- The deck storage tab (not to be confused with the visual deck storage tab)
-
-# The Deck Editor Tab
-
-The deck editor tabs (Classic and Visual) offer three ways of export a deck:
-
-- To a file on your local storage
-- To your clipboard
-- To an online service
-
-## Local File Storage
-
-To save a deck to a file on your local storage, select the "Save Deck" action in the "Deck Editor" or "Visual Deck
-Editor" menu in the application menu bar at the top of the screen. Alternatively, you can use the shortcut Ctrl/Cmd + S
-to access this action.
-
-Selecting this action will open a file picker dialog provided by your operating system. Simply enter a file name and
-select a format (.cod is recommended) and confirm.
-
-Just below the "Save Deck" action described above is the "Save Deck as..." option, which allows saving an existing file
-under a different filename, which is useful for saving a different version or copy of a deck.
-
-## From Clipboard
-
-To save a deck to your clipboard, select the "Save deck to clipboard..." action in the "Deck Editor" or "Visual Deck
-Editor" menu in the application menu bar at the top of the screen. Alternatively, you can use the shortcut Ctrl/Cmd +
-Shift + C or Ctrl/Cmd + Shift + R to access this action.
-
-Selecting this action will save the currently open deck list to your clipboard.
-
-Saving the decklist without annotations will export the decklist, with each card being described in the following format
-
-```
-CARD_AMOUNT CARD_NAME (SET_SHORT_NAME) CARD_COLLECTOR_NUMBER
-```
-
-There is also the (no set info) option, which will simply export each card as
-
-```
-CARD_AMOUNT CARD_NAME
-```
-
-Mainboard and sideboard are delimited by a newline like so:
-
-```
-1 MainboardCard
-1 OtherMainboardCard
-
-1 SideboardCard
-```
-
-Saving the decklist as annotated will insert comments (marked with // in front of them).
-It will first insert the name and any comments associated with the deck before separating each deck section into its own
-newline delimited and annotated group.
-
-Example: TODO: Adjust this to be non mtg based.
-
-```
-// Full Deck
-
-// An example comment.
-
-// 63 Maindeck
-// 4 Ace
-1 Ace of Clubs (PKR) 49
-1 Ace of Diamonds (PKR) 50
-1 Ace of Hearts (PKR) 51
-1 Ace of Spades (PKR) 52
-
-// 13 Face
-1 Jack of Clubs (PKR) 53
-1 Jack of Diamonds (PKR) 54
-1 Jack of Hearts (PKR) 55
-1 Jack of Spades (PKR) 56
-1 King of Clubs (PKR) 57
-1 King of Diamonds (PKR) 58
-1 King of Spades (PKR) 60
-1 Queen of Clubs (PKR) 61
-1 Queen of Diamonds (PKR) 62
-1 Queen of Hearts (PKR) 63
-1 Queen of Spades (PKR) 64
-2 King of Hearts (PKR) 59
-
-// 44 Number
-1 0 of Clubs (PKR) 1
-1 0 of Diamonds (PKR) 2
-1 0 of Hearts (PKR) 3
-1 1 of Clubs (PKR) 11
-1 1 of Diamonds (PKR) 12
-1 1 of Hearts (PKR) 13
-1 1 of Spades (PKR) 14
-1 10 of Clubs (PKR) 5
-1 10 of Diamonds (PKR) 6
-1 10 of Hearts (PKR) 7
-1 2 of Clubs (PKR) 17
-1 2 of Diamonds (PKR) 18
-1 2 of Hearts (PKR) 19
-1 2 of Spades (PKR) 20
-1 3 of Clubs (PKR) 21
-1 3 of Diamonds (PKR) 22
-1 3 of Hearts (PKR) 23
-1 3 of Spades (PKR) 24
-1 4 of Clubs (PKR) 25
-1 4 of Diamonds (PKR) 26
-1 4 of Hearts (PKR) 27
-1 4 of Spades (PKR) 28
-1 5 of Clubs (PKR) 29
-1 5 of Diamonds (PKR) 30
-1 5 of Hearts (PKR) 31
-1 5 of Spades (PKR) 32
-1 6 of Clubs (PKR) 33
-1 6 of Diamonds (PKR) 34
-1 6 of Hearts (PKR) 35
-1 6 of Spades (PKR) 36
-1 7 of Clubs (PKR) 37
-1 7 of Diamonds (PKR) 38
-1 7 of Hearts (PKR) 39
-1 7 of Spades (PKR) 40
-1 8 of Clubs (PKR) 41
-1 8 of Diamonds (PKR) 42
-1 8 of Hearts (PKR) 43
-1 8 of Spades (PKR) 44
-1 9 of Clubs (PKR) 45
-1 9 of Diamonds (PKR) 46
-1 9 of Hearts (PKR) 47
-1 9 of Spades (PKR) 48
-1 10 of Spades (PKR) 8
-1 0 of Spades (PKR) 4
-
-
-// 2 Joker
-1 1 Joker (PKR) 10
-1 2 Joker (PKR) 16
-```
-
-## From an online service
-
-To export a deck to an online service, select the "Send deck to online service..." action in the "Deck Editor" or "
-Visual Deck Editor" menu in the application menu bar at the top of the screen.
-
-Selecting this action will open your browser with the selected service open and the deck list information from the
-client supplied to it.
-
-Currently supported services are DeckList and TappedOut.
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/importing_decks.md b/doc/doxygen/extra-pages/user_documentation/deck_management/importing_decks.md
deleted file mode 100644
index e9626d57f..000000000
--- a/doc/doxygen/extra-pages/user_documentation/deck_management/importing_decks.md
+++ /dev/null
@@ -1,62 +0,0 @@
-@page importing_decks Importing Decks
-
-# Where to import?
-
-There are three screens in the client which can be used to import decks, depending on the context.
-
-- The deck editor tab
-- The pre-game lobby tab
-- The deck storage tab (not to be confused with the visual deck storage tab)
-
-# The Deck Editor Tab
-
-The deck editor tabs (Classic and Visual) offer three ways of importing a deck:
-
-- From a file on your local storage
-- From your clipboard
-- From an online service
-
-## Local File Storage
-
-To load a deck from a file on your local storage, select the "Load Deck" action in the "Deck Editor" or "Visual Deck
-Editor" menu in the application menu bar at the top of the screen. Alternatively, you can use the shortcut Ctrl/Cmd + O
-to access this action.
-
-Selecting this action will open a file picker dialog provided by your operating system. Simply select a supported file
-here and it will be loaded.
-
-Just below the "Load Deck" action described above is the "Load recent deck" option, which keeps a record of the last 10
-loaded decks for quick access.
-
-## From Clipboard
-
-To load a deck from your clipboard, select the "Load deck from clipboard..." action in the "Deck Editor" or "Visual Deck
-Editor" menu in the application menu bar at the top of the screen. Alternatively, you can use the shortcut Ctrl/Cmd +
-Shift + V to access this action.
-
-Selecting this action will open a new text editor dialog with the contents of your clipboard pasted inside it.
-
-The import dialog expects each line to be a card with the following format:
-
-TODO
-
-Each card should be on a separate line and there should be no empty lines between cards. The first empty line between
-two blocks of cards will be considered as the divider between mainboard and sideboard.
-
-Selecting "Parse Set Name and Number (if available)" will automatically parse these options and attempt to resolve them
-to valid provider IDs found in the card database. If this option is unselected, Cockatrice will import all cards as
-versions without provider IDs, which means they will display to everyone according to their own user defined set
-preferences, rather than being the same defined printing for everyone.
-
-## From an online service
-
-To load a deck from an online service, select the "Load deck from online service..." action in the "Deck Editor" or "
-Visual Deck Editor" menu in the application menu bar at the top of the screen.
-
-Selecting this action will open a dialog containing the contents of your clipboard pasted into it. If your clipboard
-currently contains a supported URL, the dialog will accept it and close on its own, otherwise you may adjust the URL and
-confirm.
-
-The action will automatically import the deck from the online service without any other required user action.
-
-Currently supported services are Archidekt, Deckstats, Moxfield, and TappedOut.
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/user_documentation/index.md b/doc/doxygen/extra-pages/user_documentation/index.md
deleted file mode 100644
index d7e9d529d..000000000
--- a/doc/doxygen/extra-pages/user_documentation/index.md
+++ /dev/null
@@ -1,17 +0,0 @@
-@page user_reference User Reference
-
-## Deck Management
-
-- @subpage creating_decks
-- @subpage importing_decks
-- @subpage editing_decks
-- @subpage exporting_decks
-
-## Release Channels
-
-- @subpage beta_release
-
-## Syntax Help
-
-- @subpage search_syntax_help
-- @subpage deck_search_syntax_help
diff --git a/doc/doxygen/extra-pages/user_documentation/settings/beta.md b/doc/doxygen/extra-pages/user_documentation/settings/beta.md
deleted file mode 100644
index 733af79f5..000000000
--- a/doc/doxygen/extra-pages/user_documentation/settings/beta.md
+++ /dev/null
@@ -1,54 +0,0 @@
-@page beta_release Beta Release
-
-The beta version of Cockatrice features all the newest features before they make their way into the latest stable
-release.
-It allows us to test these features ahead of time and you to give feedback on them.
-We release new betas very frequently and usually release a follow-up beta with a fix within a day or two if we break
-anything. In contrast, stable releases are released much less frequently but ensured to be stable.
-
-# What to Expect from the Beta
-
-Using the beta and giving feedback on it helps us improve Cockatrice a lot.
-We do not perform any automatic data collection so your voluntary feedback is the only way for us to get a sense of what
-you enjoy, expect, or would like to change.
-
-We highly appreciate your active participation and feedback.
-
-That being said, some words of warning should be issued:
-
-The beta release may contain unfinished features, bugs, or performance issues.
-It is intended for testing and feedback and may be less stable than the default release.
-
-We recommend using the beta only if you are comfortable encountering issues and helping us improve Cockatrice.
-
-# Switching to the Beta
-
-To switch to the Beta, navigate to your settings, using the Tab "Cockatrice → Settings" or Ctrl + Shift + P (default
-shortcut).
-
-Within the settings, in the first tab 'General', the first section 'Personal Settings' contains the setting 'Release
-Channel'.
-
-\image html release_channel_beta.png
-
-Switch this to 'Beta'.
-
-Afterwards, close your settings, and use the 'Help' tab to search for a client update. You should be prompted to install
-the beta version.
-
-# Switching back to Stable
-
-Follow the same steps as above, but set Release Channel to 'Default'.
-
-# Giving Feedback
-
-If you encounter a bug or unexpected behavior while using the beta, please report it on:
-
-- GitHub: https://github.com/Cockatrice/Cockatrice/issues
-- Discord: https://discord.gg/4hNswvHeFd in #beta-testing
-
-When reporting issues, please include:
-
-- Your operating system
-- The beta version number (found in 'Help → About Cockatrice')
-- Steps to reproduce the problem, if possible
diff --git a/doc/doxygen/groups/doc_groups.dox b/doc/doxygen/groups/doc_groups.dox
deleted file mode 100644
index ec5158c69..000000000
--- a/doc/doxygen/groups/doc_groups.dox
+++ /dev/null
@@ -1,724 +0,0 @@
-/** @file doc_groups.dox
- *  @brief Doxygen group definitions for Cockatrice.
- *
- *  This file defines the documentation groups and hierarchy used
- *  throughout the Cockatrice codebase. Reference these groups with @ingroup.
- */
-
-/* ------------------------------------------------------------------ */
-/* Core                                                               */
-/* ------------------------------------------------------------------ */
-
-/**
- * @defgroup Core Core
- * @brief Core utilities, shared types, and infrastructure.
- *
- * Provides the foundational building blocks used throughout Cockatrice.
- * This includes logging facilities, settings management, serialization helpers,
- * common enumerations, and general-purpose utility classes and functions.
- */
-
-/* ------------------------------------------------------------------ */
-/* UI                                                                 */
-/* ------------------------------------------------------------------ */
-
-/**
- * @defgroup UI User Interface
- * @brief Graphical interface components built with Qt.
- *
- * Includes high-level widgets, dialogs, models, and editors that form
- * the interactive frontend of Cockatrice.
- */
-
-/**
- * @defgroup Widgets Widgets
- * @ingroup UI
- * @brief General-purpose Qt widgets.
- *
- * A collection of reusable widgets used throughout the application,
- * such as CardInfoPictureFoilWidget, DeckAnalyticsWidget, and others.
- */
-
-/**
- * @defgroup Dialogs Dialogs
- * @ingroup Widgets
- * @brief Application dialogs.
- *
- * Includes dialogs for card prices, DeckList import/export,
- * settings, and other modal user interactions.
- */
-
-/**
- * @defgroup NetworkDialogs Networking Dialogs
- * @ingroup Dialogs
- * @ingroup NetworkingWidgets
- * @brief Dialogs related to a RemoteClient interacting with a Server.
- */
-
-/**
- * @defgroup ClientUpdateDialogs Client Update Dialogs
- * @ingroup NetworkDialogs
- * @brief Dialogs relating to the client updating.
- */
-
-/**
- * @defgroup CardDatabaseUpdateDialogs Card Database Update Dialogs
- * @ingroup NetworkDialogs
- * @ingroup CardDatabaseWidgets
- * @brief Dialogs relating to the CardDatabase updating.
- */
-
-/**
- * @defgroup ConnectionDialogs Connection Dialogs
- * @ingroup NetworkDialogs
- * @brief Dialogs relating to the RemoteClient%s connection to a Server.
- */
-
-/**
- * @defgroup AccountDialogs Account Dialogs
- * @ingroup NetworkDialogs
- * @brief Dialogs relating to account information on a Server.
- */
-
-/**
- * @defgroup RoomDialogs
- * @ingroup NetworkDialogs
- * @brief Dialogs relating to a RemoteClient interacting with a Room on a Server.
- */
-
-/**
- * @defgroup ServerLogDialogs Server Log Dialogs
- * @ingroup NetworkDialogs
- * @brief Dialogs relating to a RemoteClient interacting a Server%'s logs.
- */
-
-/**
- * @defgroup Tabs Tabs
- * @ingroup Widgets
- * @brief Tabbed UI components.
- *
- * Provides tab-based interfaces for organizing and navigating
- * between multiple views in the application.
- */
-
-/**
- * @defgroup DeckEditorTabs Deck Editor Tabs
- * @ingroup Tabs
- * @ingroup DeckEditors
- * @brief Tabs for the DeckList Editors
- */
-
-/**
- * @defgroup NetworkingTabs Networking Tabs
- * @ingroup Tabs
- * @ingroup NetworkingWidgets
- * @brief Tabs related to a RemoteClient interacting with a Server.
- */
-
-/**
- * @defgroup ServerTabs Server Tabs
- * @ingroup NetworkingTabs
- * @brief Tabs related to a Server.
- */
-
-/**
- * @defgroup AccountTabs Account Tabs
- * @ingroup NetworkingTabs
- * @brief Tabs related to user account information.
- */
-
-/**
- * @defgroup RoomTabs Room Tabs
- * @ingroup NetworkingTabs
- * @ingroup RoomWidgets
- * @brief Tabs related to a Room on a Server.
- */
-
-/**
- * @defgroup MessagingTabs Message Tabs
- * @ingroup NetworkingTabs
- * @brief Tabs related to users sending messages to each other.
- */
-
-/**
- * @defgroup PictureLoader Card Picture Loader
- * @ingroup UI
- * @ingroup Cards
- * @brief The PictureLoader for CardInfoPictureWidget%s and CardItem%s
- */
-
-/* ------------------------------------------------------------------ */
-/* Cards                                                              */
-/* ------------------------------------------------------------------ */
-
-/**
- * @defgroup Cards Cards
- * @brief Representation of individual cards and their state.
- *
- * Defines CardInfo and related objects which hold attributes, metadata, and runtime state within
- * both the CardDatabase and the Game engine.
- */
-
-/**
- * @defgroup CardSets Card Sets
- * @ingroup Cards
- * @brief CardSet%s.
- */
-
-/**
- * @defgroup CardPrintings Card Printings
- * @ingroup Cards
- * @brief Information about specific printings of CardInfo%s via PrintingInfo and ExactCard.
- */
-
-/**
- * @defgroup CardWidgets Card Widgets
- * @ingroup Widgets
- * @ingroup Cards
- * @brief Widgets for CardInfo display and interaction.
- *
- * Provides UI components that render individual CardInfo%s, handle
- * interactions, and display card details within the application.
- */
-
-/**
- * @defgroup CardExtraInfoWidgets Card Extra Info Widgets
- * @ingroup CardWidgets
- * @brief Widgets for displaying additional information about CardInfo%s.
- *
- * Displays additional data associated with CardInfo%s or data in a different form.
- */
-
-/**
- * @defgroup CardDatabase Card Database
- * @ingroup Cards
- * @brief Core CardDatabase and loaders.
- *
- * Provides the underlying data models for cards, including loading,
- * parsing, and managing the complete CardDatabase used in the application.
- */
-
-/**
- * @defgroup CardDatabaseModels Models
- * @ingroup CardDatabase
- * @brief Qt models for CardDatabase access.
- *
- * Supplies Qt model abstractions for presenting CardInfo data in views,
- * supporting filtering, sorting, and data binding to widgets.
- */
-
-/**
- * @defgroup CardDatabaseModelFilters Filters
- * @ingroup CardDatabaseModels
- * @brief Filters for CardDatabase models.
- *
- * Provides reusable filtering components for Qt models, enabling
- * refined queries and customized CardDatabase views.
- */
-
-/**
- * @defgroup CardDatabaseParsers Parsers
- * @ingroup CardDatabase
- * @brief Parsers for CardInfo data.
- *
- * Implements parsers for CardDatabase structures, handling the
- * transformation of raw data into structured objects and models.
- */
-
-/**
- * @defgroup CardDatabaseWidgets Card Database Widgets
- * @ingroup Widgets
- * @ingroup CardDatabase
- * @brief Widgets for browsing and selecting CardInfo%s in the CardDatabase.
- *
- * Provides UI components for interacting with the CardDatabase,
- * including search, filtering, and browsing in tabular or list views.
- */
-
-/**
- * @defgroup VisualCardDatabaseWidgets Visual Card Database Widgets
- * @ingroup CardDatabaseWidgets
- * @brief VisualDatabaseDisplayWidget and related helper classes.
- *
- * Enhances card browsing with graphical interfaces, offering
- * image-based and grid-based views for selecting cards.
- */
-
-/* ------------------------------------------------------------------ */
-/* Decks                                                              */
-/* ------------------------------------------------------------------ */
-
-/**
- * @defgroup Decks Deck Management
- * @brief DeckList handling, persistence, and tooling.
- *
- * Covers the lifecycle of DeckList%s: loading, saving, editing, import/export,
- * and long-term persistence, including both textual and visual editors.
- */
-
-/**
- * @defgroup DeckModels Deck Models
- * @ingroup Decks
- * @brief Qt Models relating to DeckList.
- */
-
-/**
- * @defgroup DeckEditors Deck Editors
- * @ingroup Decks
- * @brief Editors for creating and modifying a DeckList.
- *
- * Provides visual and textual editors for building, modifying,
- * and analyzing DeckList%s. Includes support for card search,
- * sorting, and filtering of DeckList contents.
- */
-
-/**
- * @defgroup DeckEditorWidgets Deck Editor Widgets
- * @ingroup Widgets
- * @ingroup DeckEditors
- * @brief Supporting widgets for DeckList editors.
- *
- * Contains specialized UI components that extend DeckList editors with
- * interactive functionality, data views, and user interaction tools.
- */
-
-/**
- * @defgroup DeckEditorTabs Deck Editor Tabs
- * @ingroup DeckEditorWidgets
- * @brief Tabs which implement AbstractTabDeckEditor to provide DeckList editing functionality.
- */
-
-/**
- * @defgroup DeckEditorAnalyticsWidgets Deck Editor Analytics Widgets
- * @ingroup DeckEditorWidgets
- * @brief Widgets for analyzing a DeckList.
- *
- * Provides visualization and statistical tools for analyzing DeckList%s.
- */
-
-/**
- * @defgroup DeckEditorCardGroupWidgets Card Group Display Widgets
- * @ingroup DeckEditorWidgets
- * @brief Widgets for displaying groups of cards.
- *
- * Provides interactive views that organize and display cards in groups,
- * enabling filtering, sorting, and direct manipulation of DeckList sections.
- */
-
-/**
- * @defgroup PrintingWidgets Printing Widgets
- * @ingroup DeckEditorWidgets
- * @ingroup Widgets
- * @brief Widgets for handling PrintingInfo of cards in a DeckList.
- *
- * Manages the display and editing of card printing information within a DeckList,
- * including editions, variations, and preferences.
- */
-
-/**
- * @defgroup DeckStorage Deck Storage
- * @ingroup Decks
- * @brief Systems for storing a DeckList on a local file system or remote service.
- */
-
-/**
- * @defgroup LocalDeckStorage Local Deck Storage
- * @ingroup DeckStorage
- * @brief Systems for storing a DeckList on a local file system.
- *
- * Handles the persistence of a DeckList, providing file-based storage,
- * metadata tracking, and tagging functionality.
- */
-
-/**
- * @defgroup LocalDeckStorageWidgets Local Deck Storage Widgets
- * @ingroup Widgets
- * @ingroup LocalDeckStorage
- * @brief Widgets for browsing and managing stored DeckList%s.
- *
- * Provides list and tree-based views for exploring stored DeckList%s,
- * including tagging, searching, and preview functionality.
- */
-
- /**
-  * @defgroup LocalDeckStorageDialogs Local Deck Storage Dialogs
-  * @ingroup LocalDeckStorageWidgets
-  * @ingroup ImportExport
-  * @ingroup Lobby
-  * @brief Dialogs related to interacting with DeckList%s on a filesystem or in a remote location.
-  */
-
-/**
- * @defgroup VisualDeckStorageWidgets Visual Deck Storage Widgets
- * @ingroup LocalDeckStorageWidgets
- * @brief Visual widgets for DeckList storage.
- *
- * Offers graphical interfaces for browsing and interacting with a stored
- * DeckList and tags, focusing on a more visual browsing experience.
- */
-
-/**
- * @defgroup VisualDeckPreviewWidgets Visual Deck Preview Widgets
- * @ingroup VisualDeckStorageWidgets
- * @brief Widgets for visually previewing a DeckList.
- *
- * Provides visual previews of a DeckList, allowing users
- * to inspect the DeckList name, color identity, and banner card at a glance.
- */
-
-/**
- * @defgroup RemoteDeckStorage Remote Deck Storage
- * @ingroup DeckStorage
- * @brief Systems for storing a DeckList on a remote service.
- */
-
-/**
- * @defgroup RemoteDeckStorageWidgets Remote Deck Storage Widgets
- * @ingroup Widgets
- * @ingroup RemoteDeckStorage
- * @ingroup ImportExport
- * @ingroup Lobby
- * @brief Widgets related to interacting with DeckList%s on a filesystem or in a remote location.
- */
-
-/**
- * @defgroup RemoteDeckStorageDialogs Remote Deck Storage Dialogs
- * @ingroup RemoteDeckStorageWidgets
- * @brief Dialogs related to interacting with DeckList%s on a filesystem or in a remote location.
- */
-
-/**
- * @defgroup ImportExport Import/Export
- * @ingroup DeckStorage
- * @brief DeckList import, export, and conversion.
- *
- * Supports importing and exporting a DeckList across formats, including
- * text, Cockatrice-native formats, and third-party platforms.
- */
-
-/**
- * @defgroup Parsing Parsing
- * @ingroup DeckStorage
- * @brief DeckList parsing and external API integration.
- *
- * Contains parsers for DeckList URLs and APIs (e.g., TappedOut, Archidekt,
- * Moxfield, Deckstats), allowing seamless import and synchronization.
- */
-
-/* ------------------------------------------------------------------ */
-/* Game                                                               */
-/* ------------------------------------------------------------------ */
-
-/**
- * @defgroup Game Game
- * @brief Core Game framework.
- *
- * Responsible for the main Game loop, GameState management,
- * CardZone handling, and resolution of actions during a Game.
- */
-
-/**
- * @defgroup GameUi User Interface
- * @ingroup Game
- * @brief Graphical components for interaction during a Game.
- *
- * Provides Qt-based widgets, dialogs, and menus used during a Game,
- * supporting both visual presentation and interaction logic.
- */
-
-/**
- * @defgroup GameLobby Lobby
- * @ingroup GameUi
- * @brief User interface for the multiplayer lobby.
- *
- * Contains widgets, dialogs, and models used to interact with the
- * lobby within the Game UI layer.
- */
-
-/**
- * @defgroup GameWidgets Game Widgets
- * @ingroup Widgets
- * @ingroup GameUi
- * @brief Widgets specific to the interface in a Game.
- *
- * Provides reusable visual components that represent elements
- * of the ongoing Game, such as a PlayerGraphicsItem or CardZone views.
- */
-
-/**
- * @defgroup GameDialogs Dialogs
- * @ingroup GameUi
- * @brief Dialogs for Game%s.
- *
- * Modal and non-modal dialogs for Player interaction during a Game,
- * including prompts, confirmations, and detailed views.
- */
-
-/**
- * @defgroup GameMenus Menus
- * @ingroup GameUi
- * @brief Menus for Game%s.
- *
- * Provides menu bars, context menus, and hierarchical options
- * available to the Player during a Game session.
- */
-
-/**
- * @defgroup GameMenusPlayers Player
- * @ingroup GameMenus
- * @brief Menus specific to Player actions.
- *
- * Defines context menus and options relating to Player state and PlayerActions.
- */
-
-/**
- * @defgroup GameMenusZones Zones
- * @ingroup GameMenus
- * @brief Menus for interacting with zones.
- *
- * Provides contextual options for a CardZone such as the hand,
- * library, graveyard, and battlefield.
- */
-
-/**
- * @defgroup GameMenusCards Cards
- * @ingroup GameMenus
- * @brief Menus for CardItem interactions.
- *
- * Defines right-click menus and contextual options available
- * when interacting with an individual CardItem.
- */
-
-/**
- * @defgroup GameGraphics Graphics
- * @ingroup GameUi
- * @brief Visual graphics for Game elements.
- *
- * Provides rendering and layout for core Game objects such as a
- * Player, CardZone, or CardItem in the interface.
- */
-
-/**
- * @defgroup GameGraphicsPlayers Players
- * @ingroup GameGraphics
- * @brief Player-specific graphical elements.
- *
- * Defines visual representations of a Player, their states,
- * and associated on-screen information.
- */
-
-/**
- * @defgroup GameGraphicsZones Zones
- * @ingroup GameGraphics
- * @brief Graphical representations of zones.
- *
- * Provides layout, visuals, and animations for a CardZone like the hand,
- * library, battlefield, and graveyard.
- */
-
-/**
- * @defgroup GameGraphicsCards Cards
- * @ingroup GameGraphics
- * @brief Graphical representation of cards.
- *
- * Manages the visual look and behavior of a CardItem when displayed
- * in the Game interface.
- */
-
-/**
- * @defgroup GameLogic Logic
- * @ingroup Game
- * @brief Game logic and rules framework.
- *
- * Implements resolution of actions and logical
- * state management for an ongoing Game.
- */
-
-/**
- * @defgroup GameLogicPlayers Players
- * @ingroup GameLogic
- * @brief Logic related to Player state.
- *
- * Handles Player attributes, PlayerActions, resources, and their impact
- * on GameState.
- */
-
-/**
- * @defgroup GameLogicZones Zones
- * @ingroup GameLogic
- * @brief Logical handling of CardZones during a Game.
- *
- * Defines the rules and behaviors of zones such as the hand,
- * battlefield, library, and graveyard.
- */
-
-/**
- * @defgroup GameLogicActions Actions
- * @ingroup GameLogic
- * @brief Actions, events, and their resolution.
- *
- * Encapsulates how actions are created, queued, and resolved,
- * including event handling and triggered effects.
- */
-
-
-/* ------------------------------------------------------------------ */
-/* Networking                                                         */
-/* ------------------------------------------------------------------ */
-
-/**
- * @defgroup Network Networking
- * @brief Networking components for client/server communication.
- *
- * Contains all systems related to communication between client and server.
- * This includes lobby and room management, server interaction logic, and
- * message handling infrastructure based on protobuf.
- */
-
-/**
- * @defgroup ApiInterfaces API Interfaces
- * @ingroup Client
- * @ingroup Parsing
- * @ingroup ImportExport
- * @brief Interfaces for interacting with various APIs
- */
-
- /**
-  * @defgroup ApiResponses API Responses
-  * @ingroup ApiInterfaces
-  * @brief Structures representing API responses.
-  *
-  * Encapsulates the data models for networking API responses,
-  * providing consistent interfaces for parsing and handling results.
-  */
-
-/**
- * @defgroup ApiResponseDisplayWidgets API Response Display Widgets
- * @ingroup Widgets
- * @ingroup ApiResponses
- * @brief Widgets for displaying API responses.
- *
- * Provides user interface components that render and present API response
- * data to the user in a structured and interactive way.
- */
-
-/**
- * @defgroup Messages Protocol Messages
- * @ingroup Network
- * @brief Protocol message definitions and handlers.
- *
- * Contains the generated protobuf messages and supporting code used
- * to encode, decode, and process communication between client and server.
- */
-
-/**
- * @defgroup Client Client
- * @ingroup Network
- * @brief The Cockatrice client application.
- *
- * Handles all client-side communication with the server.
- */
-
-/**
- * @defgroup NetworkingWidgets Networking Widgets
- * @ingroup Widgets
- * @ingroup Client
- * @brief Widgets related to a RemoteClient interacting with a Server.
- */
-
-/**
- * @defgroup ClientUpdates Client Updates
- * @ingroup Client
- * @brief Client updates.
- */
-
-/**
- * @defgroup Server Server
- * @ingroup Network
- * @brief The Cockatrice server application.
- *
- * Provides the authoritative game backend, handling authentication,
- * lobbies, game rooms, and relaying state between connected clients.
- */
-
-/**
- * @defgroup RoomWidgets Room Widgets
- * @ingroup Widgets
- * @ingroup Client
- * @brief Server room management.
- *
- * Manages creation and interaction of Game lobbies and room state synchronization with the server.
- */
-
-/* ------------------------------------------------------------------ */
-/* Replay                                                             */
-/* ------------------------------------------------------------------ */
-
-/**
- * @defgroup Replay Replays
- * @brief Replay recording and playback.
- *
- * Provides mechanisms for capturing Game sessions, storing them in
- * replay files, and replaying them for review or analysis.
- */
-
-/* ------------------------------------------------------------------ */
-/* Settings                                                           */
-/* ------------------------------------------------------------------ */
-
-/**
- * @defgroup Settings Settings
- * @brief Application settings and configuration.
- *
- * Centralizes the configuration system, providing persistence and
- * runtime access to user preferences and application options.
- */
-
-/**
- * @defgroup SettingsWidgets Settings Widgets
- * @ingroup Widgets
- * @ingroup Settings
- * @brief TODO: Document this
- */
-
-/**
- * @defgroup CoreSettings Core Settings
- * @ingroup Settings
- * @brief TODO: Document this
- */
-
-/**
- * @defgroup NetworkSettings Network Settings
- * @ingroup Settings
- * @brief TODO: Document this
- */
-
-/**
- * @defgroup GameSettings Game Settings
- * @ingroup Settings
- * @brief TODO: Document this
- */
-
-/**
- * @defgroup CardSettings Card Settings
- * @ingroup Settings
- * @brief TODO: Document this
- */
-
-/**
- * @defgroup DeckSettings Deck Settings
- * @ingroup Settings
- * @brief TODO: Document this
- */
-
-/* ------------------------------------------------------------------ */
-/* Tests                                                              */
-/* ------------------------------------------------------------------ */
-
-/**
- * @defgroup Tests Tests
- * @brief Automated testing framework.
- *
- * Provides unit tests, integration tests, and regression checks
- * to ensure stability and correctness of the Cockatrice codebase.
- */
diff --git a/doc/doxygen/images/classic_database_display.png b/doc/doxygen/images/classic_database_display.png
deleted file mode 100644
index fb762d9a3..000000000
Binary files a/doc/doxygen/images/classic_database_display.png and /dev/null differ
diff --git a/doc/doxygen/images/classic_database_display_add_buttons.png b/doc/doxygen/images/classic_database_display_add_buttons.png
deleted file mode 100644
index b9cb7cd32..000000000
Binary files a/doc/doxygen/images/classic_database_display_add_buttons.png and /dev/null differ
diff --git a/doc/doxygen/images/classic_deck_editor.png b/doc/doxygen/images/classic_deck_editor.png
deleted file mode 100644
index 9371651e9..000000000
Binary files a/doc/doxygen/images/classic_deck_editor.png and /dev/null differ
diff --git a/doc/doxygen/images/deck_dock_deck_list.png b/doc/doxygen/images/deck_dock_deck_list.png
deleted file mode 100644
index bf12d97c2..000000000
Binary files a/doc/doxygen/images/deck_dock_deck_list.png and /dev/null differ
diff --git a/doc/doxygen/images/deck_dock_deck_list_buttons.png b/doc/doxygen/images/deck_dock_deck_list_buttons.png
deleted file mode 100644
index cb66b41da..000000000
Binary files a/doc/doxygen/images/deck_dock_deck_list_buttons.png and /dev/null differ
diff --git a/doc/doxygen/images/deck_dock_deck_list_group_by.png b/doc/doxygen/images/deck_dock_deck_list_group_by.png
deleted file mode 100644
index ba23b1fb5..000000000
Binary files a/doc/doxygen/images/deck_dock_deck_list_group_by.png and /dev/null differ
diff --git a/doc/doxygen/images/deckeditordeckdockwidget.png b/doc/doxygen/images/deckeditordeckdockwidget.png
deleted file mode 100644
index 33b9588d0..000000000
Binary files a/doc/doxygen/images/deckeditordeckdockwidget.png and /dev/null differ
diff --git a/doc/doxygen/images/printing_selector.png b/doc/doxygen/images/printing_selector.png
deleted file mode 100644
index c06ac90bc..000000000
Binary files a/doc/doxygen/images/printing_selector.png and /dev/null differ
diff --git a/doc/doxygen/images/printing_selector_disable.png b/doc/doxygen/images/printing_selector_disable.png
deleted file mode 100644
index 8bdd8f292..000000000
Binary files a/doc/doxygen/images/printing_selector_disable.png and /dev/null differ
diff --git a/doc/doxygen/images/printing_selector_enable.png b/doc/doxygen/images/printing_selector_enable.png
deleted file mode 100644
index 2c7d05afa..000000000
Binary files a/doc/doxygen/images/printing_selector_enable.png and /dev/null differ
diff --git a/doc/doxygen/images/printing_selector_navigation.png b/doc/doxygen/images/printing_selector_navigation.png
deleted file mode 100644
index a91ed4511..000000000
Binary files a/doc/doxygen/images/printing_selector_navigation.png and /dev/null differ
diff --git a/doc/doxygen/images/printing_selector_options.png b/doc/doxygen/images/printing_selector_options.png
deleted file mode 100644
index 2079b70ac..000000000
Binary files a/doc/doxygen/images/printing_selector_options.png and /dev/null differ
diff --git a/doc/doxygen/images/printing_selector_pre_providerid.png b/doc/doxygen/images/printing_selector_pre_providerid.png
deleted file mode 100644
index a1be993ee..000000000
Binary files a/doc/doxygen/images/printing_selector_pre_providerid.png and /dev/null differ
diff --git a/doc/doxygen/images/release_channel_beta.png b/doc/doxygen/images/release_channel_beta.png
deleted file mode 100644
index 00869a9cf..000000000
Binary files a/doc/doxygen/images/release_channel_beta.png and /dev/null differ
diff --git a/doc/doxygen/images/vde_deck_analytics.png b/doc/doxygen/images/vde_deck_analytics.png
deleted file mode 100644
index 0b4b11e19..000000000
Binary files a/doc/doxygen/images/vde_deck_analytics.png and /dev/null differ
diff --git a/doc/doxygen/images/vde_flat_layout_color_grouped.png b/doc/doxygen/images/vde_flat_layout_color_grouped.png
deleted file mode 100644
index 51f176668..000000000
Binary files a/doc/doxygen/images/vde_flat_layout_color_grouped.png and /dev/null differ
diff --git a/doc/doxygen/images/vde_flat_layout_type_grouped.png b/doc/doxygen/images/vde_flat_layout_type_grouped.png
deleted file mode 100644
index 4a33e0017..000000000
Binary files a/doc/doxygen/images/vde_flat_layout_type_grouped.png and /dev/null differ
diff --git a/doc/doxygen/images/vde_overlap_layout_type_grouped.png b/doc/doxygen/images/vde_overlap_layout_type_grouped.png
deleted file mode 100644
index 606144586..000000000
Binary files a/doc/doxygen/images/vde_overlap_layout_type_grouped.png and /dev/null differ
diff --git a/doc/doxygen/images/vde_sample_hand.png b/doc/doxygen/images/vde_sample_hand.png
deleted file mode 100644
index 95924a5d4..000000000
Binary files a/doc/doxygen/images/vde_sample_hand.png and /dev/null differ
diff --git a/doc/doxygen/theme b/doc/doxygen/theme
deleted file mode 160000
index d52eafe3e..000000000
--- a/doc/doxygen/theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d52eafe3e9303399fda15661f3d7bb8fe3d7eabc
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 f8c183dfc..8c60f3f8a 100755
--- a/format.sh
+++ b/format.sh
@@ -2,8 +2,7 @@
 
 # This script will run clang-format on all modified, non-3rd-party C++/Header files.
 # Optionally runs cmake-format on all modified cmake files.
-# Optionally runs shellcheck on all modified shell files.
-# Uses clang-format cmake-format git diff find shellcheck
+# Uses clang-format cmake-format git diff find
 # Never, ever, should this receive a path with a newline in it. Don't bother proofing it for that.
 
 set -o pipefail
@@ -13,33 +12,25 @@ olddir="$PWD"
 cd "${BASH_SOURCE%/*}/" || exit 2 # could not find path, this could happen with special links etc.
 
 # defaults
-include=("cockatrice/src" \
-"libcockatrice_card" \
-"libcockatrice_deck_list" \
-"libcockatrice_network" \
-"libcockatrice_protocol" \
-"libcockatrice_rng" \
-"libcockatrice_settings" \
-"libcockatrice_utility" \
+include=("common" \
+"cockatrice/src" \
+"dbconverter/src" \
 "oracle/src" \
 "servatrice/src" \
 "tests")
-exclude=("libcockatrice_rng/libcockatrice/rng/sfmt/" \
-"libcockatrice_utility/libcockatrice/utility/peglib.h" \
-"oracle/src/lzma/" \
-"oracle/src/qt-json/" \
-"oracle/src/zip/" \
-"servatrice/src/smtp/")
+exclude=("servatrice/src/smtp" \
+"common/sfmt" \
+"common/lib" \
+"oracle/src/zip" \
+"oracle/src/lzma" \
+"oracle/src/qt-json")
 exts=("cpp" "h" "proto")
 cf_cmd="clang-format"
 branch="origin/master"
 cmakefile="CMakeLists.txt"
 cmakedir="cmake/.*\\.cmake"
 cmakeinclude=("cmake/gtest-CMakeLists.txt.in")
-scripts="*.sh"
 color="--"
-verbosity=0
-sep="----------"
 
 # parse options
 while [[ $* ]]; do
@@ -105,21 +96,11 @@ OPTIONS:
     -n, --names
         Display a list of filenames that require formatting. Implies --test.
 
-    --no-clang-format
-        Do not check any source files for clang-format.
-
-    --print-version
-        Print the version of clang-format being used before continuing.
-
-    --shell
-        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.
 
-    -v, --verbose
-        Display output on successes.
+    --cf-version
+        Print the version of clang-format being used before continuing.
 
 EXIT CODES:
     0 on a successful format or if no files require formatting.
@@ -136,7 +117,7 @@ EXAMPLES:
         Tests if the source files in the current directory are correctly
         formatted and prints an error message if formatting is required.
 
-    $0 --cmake --branch "" --no-clang-format
+    $0 --cmake --branch "" ""
         Unconditionally format all cmake files and no source files.
 EOM
       exit 0
@@ -145,24 +126,12 @@ EOM
       mode="name"
       shift
       ;;
-    '--no-clang-format')
-      include=() # do not check any dirs
-      shift
-      ;;
-    '--print-version')
-      print_version=1
-      shift
-      ;;
-    '--shell')
-      do_shell=1
-      shift
-      ;;
     '-t'|'--test')
       mode="code"
       shift
       ;;
-    '-v'|'--verbose')
-      verbosity=1
+    '--cf-version')
+      print_version=1
       shift
       ;;
     '--')
@@ -216,12 +185,6 @@ if [[ $do_cmake ]] && ! hash cmake-format 2>/dev/null; then
   exit 3
 fi
 
-# check availability of shellcheck
-if [[ $do_shell ]] && ! hash shellcheck 2>/dev/null; then
-  echo "could not find shellcheck" >&2
-  exit 3
-fi
-
 if [[ $branch ]]; then
   # get all dirty files through git
   if ! base=$(git merge-base "$branch" HEAD); then
@@ -255,15 +218,6 @@ if [[ $branch ]]; then
       done
     done
   fi
-  if [[ $do_shell ]]; then
-    shell_names=()
-    for name in "${basenames[@]}"; do
-      filerx="(^|/)$scripts$"
-      if [[ $name =~ $filerx ]]; then
-        shell_names+=("$name")
-      fi
-    done
-  fi
 else
   exts_o=()
   for ext in "${exts[@]}"; do
@@ -275,15 +229,12 @@ else
     mapfile -t cmake_names < <(find . -maxdepth 2 -type f -name "$cmakefile" -o -path "./${cmakedir/.}")
     cmake_names+=("${cmakeinclude[@]}")
   fi
-  if [[ $do_shell ]]; then
-    mapfile -t shell_names < <(find . -maxdepth 5 -type f -name "$scripts")
-  fi
 fi
 
 # filter excludes
 for path in "${exclude[@]}"; do
   for i in "${!names[@]}"; do
-    rx="^$path"
+    rx="^$path/"
     if [[ ${names[$i]} =~ $rx ]]; then
       unset "names[$i]"
     fi
@@ -293,18 +244,14 @@ done
 # optionally print version
 if [[ $print_version ]]; then
   $cf_cmd -version
-  [[ $do_cmake ]] && echo "cmake-format version $(cmake-format --version)"
-  [[ $do_shell ]] && echo "shellcheck $(shellcheck --version | grep "version:")"
-  echo "$sep"
+  [[ $do_cmake ]] && echo "cmake-format $(cmake-format --version)"
+  echo "----------"
 fi
 
 if [[ ! ${cmake_names[*]} ]]; then
   unset do_cmake
 fi
-if [[ ! ${shell_names[*]} ]]; then
-  unset do_shell
-fi
-if [[ ! ( ${names[*]} || $do_cmake || $do_shell ) ]]; then
+if [[ ! ( ${names[*]} || $do_cmake ) ]]; then
   exit 0 # nothing to format means format is successful!
 fi
 
@@ -312,31 +259,16 @@ fi
 case $mode in
   diff)
     declare -i code=0
-    files_to_format=()
     for name in "${names[@]}"; do
       if ! $cf_cmd "$name" | diff "$name" - -p "$color"; then
         code=1
-        files_to_format+=("$name")
       fi
     done
     for name in "${cmake_names[@]}"; do
       if ! cmake-format "$name" | diff "$name" - -p "$color"; then
         code=1
-        files_to_format+=("$name")
       fi
     done
-    for name in "${shell_names[@]}"; do
-      if ! shellcheck "$name"; then
-        code=1
-        files_to_format+=("$name")
-      fi
-    done
-    if (( code>0 )); then
-      echo "$sep"
-      for name in "${files_to_format[@]}"; do
-        echo "$name"
-      done
-    fi
     exit $code
     ;;
   name)
@@ -353,12 +285,6 @@ case $mode in
         code=1
       fi
     done
-    for name in "${shell_names[@]}"; do
-      if ! shellcheck "$name" >/dev/null; then
-        echo "$name"
-        code=1
-      fi
-    done
     exit $code
     ;;
   code)
@@ -368,9 +294,6 @@ case $mode in
     for name in "${cmake_names[@]}"; do
       cmake-format "$name" --check || exit 1
     done
-    for name in "${shell_names[@]}"; do
-      shellcheck "$name" >/dev/null || exit 1
-    done
     ;;
   *)
     if [[ "${names[*]}" ]]; then
@@ -379,16 +302,5 @@ case $mode in
     if [[ $do_cmake ]]; then
       cmake-format -i "${cmake_names[@]}"
     fi
-    if [[ $do_shell ]]; then
-      echo "warning: --shell is not compatible with the current mode but shell files were modified!" >&2
-      echo "recommendation: try $0 --diff --shell" >&2
-    fi
-    if (( verbosity>0 )); then
-      count="${#names[*]}"
-      if [[ $do_cmake ]]; then
-        (( count+=${#cmake_names[*]} ))
-      fi
-      echo "parsed $count files that differ from base $branch"
-    fi
     ;;
 esac
diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt
deleted file mode 100644
index dd3799e33..000000000
--- a/libcockatrice_card/CMakeLists.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS
-    libcockatrice/card/card_info.h
-    libcockatrice/card/card_info_comparator.h
-    libcockatrice/card/database/card_database.h
-    libcockatrice/card/database/card_database_loader.h
-    libcockatrice/card/database/card_database_manager.h
-    libcockatrice/card/database/card_database_querier.h
-    libcockatrice/card/database/parser/card_database_parser.h
-    libcockatrice/card/database/parser/cockatrice_xml_3.h
-    libcockatrice/card/database/parser/cockatrice_xml_4.h
-    libcockatrice/card/import/card_name_normalizer.h
-    libcockatrice/card/printing/exact_card.h
-    libcockatrice/card/printing/printing_info.h
-    libcockatrice/card/set/card_set.h
-    libcockatrice/card/relation/card_relation.h
-)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(
-  libcockatrice_card STATIC
-  ${MOC_SOURCES}
-  libcockatrice/card/card_info.cpp
-  libcockatrice/card/card_info_comparator.cpp
-  libcockatrice/card/database/card_database.cpp
-  libcockatrice/card/database/card_database_loader.cpp
-  libcockatrice/card/database/card_database_manager.cpp
-  libcockatrice/card/database/card_database_querier.cpp
-  libcockatrice/card/database/parser/card_database_parser.cpp
-  libcockatrice/card/database/parser/cockatrice_xml_3.cpp
-  libcockatrice/card/database/parser/cockatrice_xml_4.cpp
-  libcockatrice/card/import/card_name_normalizer.cpp
-  libcockatrice/card/printing/exact_card.cpp
-  libcockatrice/card/printing/printing_info.cpp
-  libcockatrice/card/relation/card_relation.cpp
-  libcockatrice/card/set/card_set.cpp
-  libcockatrice/card/set/card_set_list.cpp
-  libcockatrice/card/format/format_legality_rules.cpp
-  libcockatrice/card/format/format_legality_rules.h
-)
-
-target_include_directories(
-  libcockatrice_card
-  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-  PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters
-)
-
-target_link_libraries(
-  libcockatrice_card
-  PUBLIC libcockatrice_interfaces
-  PUBLIC libcockatrice_utility
-  PUBLIC ${QT_CORE_MODULE}
-)
diff --git a/libcockatrice_card/libcockatrice/card/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp
deleted file mode 100644
index 1aaec85b8..000000000
--- a/libcockatrice_card/libcockatrice/card/card_info.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-#include "card_info.h"
-
-#include "game_specific_terms.h"
-#include "printing/printing_info.h"
-#include "relation/card_relation.h"
-#include "set/card_set.h"
-
-#include <QDir>
-#include <QRegularExpression>
-#include <QSharedPointer>
-#include <QString>
-#include <QVariant>
-#include <algorithm>
-#include <utility>
-
-class CardRelation;
-class CardSet;
-class CardInfo;
-
-using CardInfoPtr = QSharedPointer<CardInfo>;
-
-CardInfo::CardInfo(const QString &_name,
-                   const QString &_text,
-                   bool _isToken,
-                   QVariantHash _properties,
-                   const QList<CardRelation *> &_relatedCards,
-                   const QList<CardRelation *> &_reverseRelatedCards,
-                   SetToPrintingsMap _sets,
-                   const UiAttributes _uiAttributes)
-    : name(_name), text(_text), isToken(_isToken), properties(std::move(_properties)), relatedCards(_relatedCards),
-      reverseRelatedCards(_reverseRelatedCards), setsToPrintings(std::move(_sets)), uiAttributes(_uiAttributes)
-{
-    simpleName = CardInfo::simplifyName(name);
-
-    refreshCachedSets();
-}
-
-CardInfoPtr CardInfo::newInstance(const QString &_name)
-{
-    return newInstance(_name, "", false, {}, {}, {}, {}, {});
-}
-
-CardInfoPtr CardInfo::newInstance(const QString &_name,
-                                  const QString &_text,
-                                  bool _isToken,
-                                  QVariantHash _properties,
-                                  const QList<CardRelation *> &_relatedCards,
-                                  const QList<CardRelation *> &_reverseRelatedCards,
-                                  SetToPrintingsMap _sets,
-                                  const UiAttributes _uiAttributes)
-{
-    CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, std::move(_properties), _relatedCards, _reverseRelatedCards,
-                                 _sets, _uiAttributes));
-    ptr->setSmartPointer(ptr);
-
-    for (const auto &printings : _sets) {
-        for (const PrintingInfo &printing : printings) {
-            printing.getSet()->append(ptr);
-            break;
-        }
-    }
-
-    return ptr;
-}
-
-QString CardInfo::getCorrectedName() const
-{
-    // remove all the characters reserved in windows file paths,
-    // other oses only disallow a subset of these so it covers all
-    static const QRegularExpression rmrx(R"(( // |[*<>:"\\?\x00-\x08\x10-\x1f]))");
-    static const QRegularExpression spacerx(R"([/\x09-\x0f])");
-    static const QString space(' ');
-    QString result = name;
-    // Fire // Ice, Circle of Protection: Red, "Ach! Hans, Run!", Who/What/When/Where/Why, Question Elemental?
-    return result.remove(rmrx).replace(spacerx, space);
-}
-
-QString CardInfo::getLegalityProp(const QString &format) const
-{
-    return getProperty("format-" + format);
-}
-
-bool CardInfo::isLegalInFormat(const QString &format) const
-{
-    if (format.isEmpty()) {
-        return true;
-    }
-
-    QString formatLegality = getLegalityProp(format);
-    return formatLegality == "legal" || formatLegality == "restricted";
-}
-
-void CardInfo::addToSet(const CardSetPtr &_set, const PrintingInfo &_info)
-{
-    if (!_set->contains(smartThis)) {
-        _set->append(smartThis);
-    }
-    if (!setsToPrintings[_set->getShortName()].contains(_info)) {
-        setsToPrintings[_set->getShortName()].append(_info);
-    }
-
-    refreshCachedSets();
-}
-
-void CardInfo::combineLegalities(const QVariantHash &props)
-{
-    QHashIterator<QString, QVariant> it(props);
-    while (it.hasNext()) {
-        it.next();
-        if (it.key().startsWith("format-")) {
-            smartThis->setProperty(it.key(), it.value().toString());
-        }
-    }
-}
-
-void CardInfo::refreshCachedSets()
-{
-    refreshCachedSetNames();
-    refreshCachedAltNames();
-}
-
-void CardInfo::refreshCachedSetNames()
-{
-    QStringList setList;
-    // update the cached list of set names
-    for (const auto &printings : setsToPrintings) {
-        for (const auto &printing : printings) {
-            if (printing.getSet()->getEnabled()) {
-                setList << printing.getSet()->getShortName();
-            }
-            break;
-        }
-    }
-    setsNames = setList.join(", ");
-}
-
-void CardInfo::refreshCachedAltNames()
-{
-    altNames.clear();
-
-    // update the altNames with the flavorNames
-    for (const auto &printings : setsToPrintings) {
-        for (const auto &printing : printings) {
-            QString flavorName = printing.getFlavorName();
-            if (!flavorName.isEmpty()) {
-                altNames.insert(flavorName);
-            }
-        }
-    }
-}
-
-QString CardInfo::simplifyName(const QString &name)
-{
-    static const QRegularExpression spaceOrSplit("(\\s+|\\/\\/.*)");
-    static const QRegularExpression nonAlnum("[^a-z0-9]");
-
-    QString simpleName = name.toLower();
-
-    // remove spaces and right halves of split cards
-    simpleName.remove(spaceOrSplit);
-
-    // So Aetherling would work, but not Ætherling since 'Æ' would get replaced
-    // with nothing.
-    simpleName.replace("æ", "ae");
-
-    // Replace Jötun Grunt with Jotun Grunt.
-    simpleName = simpleName.normalized(QString::NormalizationForm_KD);
-
-    // remove all non alphanumeric characters from the name
-    simpleName.remove(nonAlnum);
-    return simpleName;
-}
-
-QChar CardInfo::getColorChar() const
-{
-    QString colors = getColors();
-    switch (colors.size()) {
-        case 0:
-            return QChar();
-        case 1:
-            return colors.at(0);
-        default:
-            return QChar('m');
-    }
-}
-
-void CardInfo::resetReverseRelatedCards2Me()
-{
-    for (CardRelation *cardRelation : this->getReverseRelatedCards2Me()) {
-        cardRelation->deleteLater();
-    }
-    reverseRelatedCardsToMe = QList<CardRelation *>();
-}
-
-// Back-compatibility methods. Remove ASAP
-QString CardInfo::getCardType() const
-{
-    return getProperty(Mtg::CardType);
-}
-void CardInfo::setCardType(const QString &value)
-{
-    setProperty(Mtg::CardType, value);
-}
-QString CardInfo::getCmc() const
-{
-    return getProperty(Mtg::ConvertedManaCost);
-}
-QString CardInfo::getColors() const
-{
-    return getProperty(Mtg::Colors);
-}
-void CardInfo::setColors(const QString &value)
-{
-    setProperty(Mtg::Colors, value);
-}
-QString CardInfo::getLoyalty() const
-{
-    return getProperty(Mtg::Loyalty);
-}
-QString CardInfo::getMainCardType() const
-{
-    return getProperty(Mtg::MainCardType);
-}
-QString CardInfo::getManaCost() const
-{
-    return getProperty(Mtg::ManaCost);
-}
-QString CardInfo::getPowTough() const
-{
-    return getProperty(Mtg::PowTough);
-}
-void CardInfo::setPowTough(const QString &value)
-{
-    setProperty(Mtg::PowTough, value);
-}
diff --git a/libcockatrice_card/libcockatrice/card/card_info.h b/libcockatrice_card/libcockatrice/card/card_info.h
deleted file mode 100644
index 654ac1f63..000000000
--- a/libcockatrice_card/libcockatrice/card/card_info.h
+++ /dev/null
@@ -1,377 +0,0 @@
-#ifndef CARD_INFO_H
-#define CARD_INFO_H
-
-#include "format/format_legality_rules.h"
-#include "printing/printing_info.h"
-
-#include <QDate>
-#include <QHash>
-#include <QList>
-#include <QLoggingCategory>
-#include <QMap>
-#include <QMetaType>
-#include <QSharedPointer>
-#include <QVariant>
-#include <utility>
-
-inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info");
-
-class CardInfo;
-class CardSet;
-class CardRelation;
-class ICardDatabaseParser;
-
-typedef QSharedPointer<CardInfo> CardInfoPtr;
-typedef QSharedPointer<CardSet> CardSetPtr;
-typedef QSharedPointer<FormatRules> FormatRulesPtr;
-typedef QMap<QString, QList<PrintingInfo>> SetToPrintingsMap;
-
-typedef QHash<QString, CardInfoPtr> CardNameMap;
-typedef QHash<QString, CardSetPtr> SetNameMap;
-typedef QHash<QString, FormatRulesPtr> FormatRulesNameMap;
-
-Q_DECLARE_METATYPE(CardInfoPtr)
-
-/**
- * @class CardInfo
- * @ingroup Cards
- *
- * @brief Represents a card and its associated metadata, properties, and relationships.
- *
- * CardInfo holds both static information (name, text, flags) and dynamic data
- * (properties, set memberships, relationships). It also integrates with
- * signals/slots, allowing observers to react to property or visual updates.
- *
- * Each CardInfo may belong to multiple sets through its printings, and can
- * be related to other cards through defined relationships.
- */
-class CardInfo : public QObject
-{
-    Q_OBJECT
-
-public:
-    /**
-     * @class CardInfo::UiAttributes
-     * @ingroup Cards
-     *
-     * @brief Attributes of the card that affect display and game logic.
-     */
-    struct UiAttributes
-    {
-        bool cipt = false;                 ///< Positioning flag used by UI.
-        bool landscapeOrientation = false; ///< Orientation flag for rendering.
-        int tableRow = 0;                  ///< Row index in a table or visual representation.
-        bool upsideDownArt = false;        ///< Whether artwork is flipped for visual purposes.
-    };
-
-private:
-    /** @name Private Card Properties
-     *  @anchor PrivateCardProperties
-     */
-    ///@{
-    CardInfoPtr smartThis;                         ///< Smart pointer to self for safe cross-references.
-    QString name;                                  ///< Full name of the card.
-    QString simpleName;                            ///< Simplified name for fuzzy matching.
-    QString text;                                  ///< Text description or rules text of the card.
-    bool isToken;                                  ///< Whether this card is a token or not.
-    QVariantHash properties;                       ///< Key-value store of dynamic card properties.
-    QList<CardRelation *> relatedCards;            ///< Forward references to related cards.
-    QList<CardRelation *> reverseRelatedCards;     ///< Cards that refer back to this card.
-    QList<CardRelation *> reverseRelatedCardsToMe; ///< Cards that consider this card as related.
-    SetToPrintingsMap setsToPrintings;             ///< Mapping from set names to printing variations.
-    UiAttributes uiAttributes;                     ///< Attributes that affect display and game logic
-    QString setsNames;                             ///< Cached, human-readable list of set names.
-    QSet<QString> altNames;                        ///< Cached set of alternate names, used when searching
-    ///@}
-
-public:
-    /**
-     * @brief Constructs a CardInfo with full initialization.
-     *
-     * @param _name The name of the card.
-     * @param _text Rules text or description of the card.
-     * @param _isToken Flag indicating whether the card is a token.
-     * @param _properties Arbitrary key-value properties.
-     * @param _relatedCards Forward references to related cards.
-     * @param _reverseRelatedCards Backward references to related cards.
-     * @param _sets Map of set names to printing information.
-     * @param _uiAttributes Attributes that affect display and game logic
-     */
-    explicit CardInfo(const QString &_name,
-                      const QString &_text,
-                      bool _isToken,
-                      QVariantHash _properties,
-                      const QList<CardRelation *> &_relatedCards,
-                      const QList<CardRelation *> &_reverseRelatedCards,
-                      SetToPrintingsMap _sets,
-                      UiAttributes _uiAttributes);
-
-    /**
-     * @brief Copy constructor for CardInfo.
-     *
-     * Performs a deep copy of properties, sets, and related card lists.
-     *
-     * @param other Another CardInfo to copy.
-     */
-    CardInfo(const CardInfo &other)
-        : QObject(other.parent()), name(other.name), simpleName(other.simpleName), text(other.text),
-          isToken(other.isToken), properties(other.properties), relatedCards(other.relatedCards),
-          reverseRelatedCards(other.reverseRelatedCards), reverseRelatedCardsToMe(other.reverseRelatedCardsToMe),
-          setsToPrintings(other.setsToPrintings), uiAttributes(other.uiAttributes), setsNames(other.setsNames),
-          altNames(other.altNames)
-    {
-    }
-
-    /**
-     * @brief Creates a new instance with only the card name.
-     *
-     * All other fields are set to defaults.
-     *
-     * @param _name The card name.
-     * @return Shared pointer to the new CardInfo instance.
-     */
-    static CardInfoPtr newInstance(const QString &_name);
-
-    /**
-     * @brief Creates a new instance with full initialization.
-     *
-     * @param _name Name of the card.
-     * @param _text Rules text or description.
-     * @param _isToken Token flag.
-     * @param _properties Arbitrary properties.
-     * @param _relatedCards Forward relationships.
-     * @param _reverseRelatedCards Reverse relationships.
-     * @param _sets Printing information per set.
-     * @param _uiAttributes Attributes that affect display and game logic
-     * @return Shared pointer to the new CardInfo instance.
-     */
-    static CardInfoPtr newInstance(const QString &_name,
-                                   const QString &_text,
-                                   bool _isToken,
-                                   QVariantHash _properties,
-                                   const QList<CardRelation *> &_relatedCards,
-                                   const QList<CardRelation *> &_reverseRelatedCards,
-                                   SetToPrintingsMap _sets,
-                                   UiAttributes _uiAttributes);
-
-    /**
-     * @brief Clones the current CardInfo instance.
-     *
-     * Uses the copy constructor and ensures the smart pointer is properly set.
-     *
-     * @return Shared pointer to the cloned CardInfo.
-     */
-    [[nodiscard]] CardInfoPtr clone() const
-    {
-        auto newCardInfo = CardInfoPtr(new CardInfo(*this));
-        newCardInfo->setSmartPointer(newCardInfo); // Set the smart pointer for the new instance
-        return newCardInfo;
-    }
-
-    /**
-     * @brief Sets the internal smart pointer to self.
-     *
-     * Used internally to allow safe cross-references among CardInfo and CardSet.
-     *
-     * @param _ptr Shared pointer pointing to this instance.
-     */
-    void setSmartPointer(CardInfoPtr _ptr)
-    {
-        smartThis = std::move(_ptr);
-    }
-
-    /** @name Basic Properties Accessors */ //@{
-    [[nodiscard]] inline const QString &getName() const
-    {
-        return name;
-    }
-    [[nodiscard]] const QString &getSimpleName() const
-    {
-        return simpleName;
-    }
-    const QSet<QString> &getAltNames()
-    {
-        return altNames;
-    }
-    [[nodiscard]] const QString &getText() const
-    {
-        return text;
-    }
-    void setText(const QString &_text)
-    {
-        text = _text;
-        emit cardInfoChanged(smartThis);
-    }
-    [[nodiscard]] bool getIsToken() const
-    {
-        return isToken;
-    }
-    [[nodiscard]] QStringList getProperties() const
-    {
-        return properties.keys();
-    }
-    [[nodiscard]] QString getProperty(const QString &propertyName) const
-    {
-        return properties.value(propertyName).toString();
-    }
-    void setProperty(const QString &_name, const QString &_value)
-    {
-        properties.insert(_name, _value);
-        emit cardInfoChanged(smartThis);
-    }
-    [[nodiscard]] bool hasProperty(const QString &propertyName) const
-    {
-        return properties.contains(propertyName);
-    }
-    [[nodiscard]] const SetToPrintingsMap &getSets() const
-    {
-        return setsToPrintings;
-    }
-    [[nodiscard]] const QString &getSetsNames() const
-    {
-        return setsNames;
-    }
-    //@}
-
-    /** @name Related Cards Accessors */ //@{
-    [[nodiscard]] const QList<CardRelation *> &getRelatedCards() const
-    {
-        return relatedCards;
-    }
-    [[nodiscard]] const QList<CardRelation *> &getReverseRelatedCards() const
-    {
-        return reverseRelatedCards;
-    }
-    [[nodiscard]] const QList<CardRelation *> &getReverseRelatedCards2Me() const
-    {
-        return reverseRelatedCardsToMe;
-    }
-    [[nodiscard]] QList<CardRelation *> getAllRelatedCards() const
-    {
-        QList<CardRelation *> result;
-        result.append(getRelatedCards());
-        result.append(getReverseRelatedCards2Me());
-        return result;
-    }
-    void resetReverseRelatedCards2Me();
-    void addReverseRelatedCards2Me(CardRelation *cardRelation)
-    {
-        reverseRelatedCardsToMe.append(cardRelation);
-    }
-    //@}
-
-    /** @name UI Positioning */ //@{
-    [[nodiscard]] const UiAttributes &getUiAttributes() const
-    {
-        return uiAttributes;
-    }
-    //@}
-
-    [[nodiscard]] QChar getColorChar() const;
-
-    /** @name Legacy/Convenience Property Accessors */ //@{
-    [[nodiscard]] QString getCardType() const;
-    void setCardType(const QString &value);
-    [[nodiscard]] QString getCmc() const;
-    [[nodiscard]] QString getColors() const;
-    void setColors(const QString &value);
-    [[nodiscard]] QString getLoyalty() const;
-    [[nodiscard]] QString getMainCardType() const;
-    [[nodiscard]] QString getManaCost() const;
-    [[nodiscard]] QString getPowTough() const;
-    void setPowTough(const QString &value);
-    //@}
-
-    /**
-     * @brief Returns a version of the card name safe for file storage or fuzzy matching.
-     *
-     * Removes invalid characters, replaces spacing markers, and normalizes diacritics.
-     *
-     * @return Corrected card name as a QString.
-     */
-    [[nodiscard]] QString getCorrectedName() const;
-
-    /**
-     * @brief Gets the card's legality value for the given format.
-     * The legality prop for a format is stored in the property map under the key "format-<name>"
-     * @param format The format's name.
-     * @return The card's legality value for the format. Empty if not found.
-     */
-    [[nodiscard]] QString getLegalityProp(const QString &format) const;
-
-    /**
-     * @brief Checks if the card is legal in the given format.
-     * A card is considered legal in a format if its properties map contains an entry for "format-<name>", with value
-     * "legal" or "restricted".
-     * @param format The format's name. If empty, will always return true.
-     * @return Whether the card is legal in the given format.
-     */
-    [[nodiscard]] bool isLegalInFormat(const QString &format) const;
-
-    /**
-     * @brief Adds a printing to a specific set.
-     *
-     * Updates the mapping and refreshes the cached list of set names.
-     *
-     * @param _set The set to which the card should be added.
-     * @param _info Optional printing information.
-     */
-    void addToSet(const CardSetPtr &_set, const PrintingInfo &_info = PrintingInfo());
-
-    /**
-     * @brief Combines legality properties from a provided map.
-     *
-     * Useful for merging format legality flags from multiple sources.
-     *
-     * @param props Key-value mapping of format legalities.
-     */
-    void combineLegalities(const QVariantHash &props);
-
-    /**
-     * @brief Refreshes all cached fields that are calculated from the contained sets and printings.
-     *
-     * Typically called after adding or modifying set memberships or printings.
-     */
-    void refreshCachedSets();
-
-    /**
-     * @brief Simplifies a name for fuzzy matching.
-     *
-     * Converts to lowercase, removes punctuation/spacing.
-     *
-     * @param name Original name string.
-     * @return Simplified name string.
-     */
-    static QString simplifyName(const QString &name);
-
-private:
-    /**
-     * @brief Refreshes the cached, human-readable list of set names.
-     *
-     * Typically called after adding or modifying set memberships.
-     */
-    void refreshCachedSetNames();
-
-    /**
-     * @brief Refreshes the cached list of alt names for the card.
-     *
-     * Typically called after adding or modifying the contained printings.
-     */
-    void refreshCachedAltNames();
-
-signals:
-    /**
-     * @brief Emitted when a pixmap for this card has been updated or finished loading.
-     *
-     * @param printing Specific printing for which the pixmap has updated.
-     */
-    void pixmapUpdated(const PrintingInfo &printing);
-
-    /**
-     * @brief Emitted when card properties or state have changed.
-     *
-     * @param card Shared pointer to the CardInfo instance that changed.
-     */
-    void cardInfoChanged(CardInfoPtr card);
-};
-#endif
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.h b/libcockatrice_card/libcockatrice/card/database/card_database.h
deleted file mode 100644
index 7f8fc39db..000000000
--- a/libcockatrice_card/libcockatrice/card/database/card_database.h
+++ /dev/null
@@ -1,186 +0,0 @@
-#ifndef CARDDATABASE_H
-#define CARDDATABASE_H
-
-#include "../set/card_set_list.h"
-#include "card_database_loader.h"
-#include "card_database_querier.h"
-
-#include <QBasicMutex>
-#include <QDate>
-#include <QHash>
-#include <QList>
-#include <QLoggingCategory>
-#include <QVector>
-#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
-#include <utility>
-
-inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database");
-
-/**
- * @class CardDatabase
- * @ingroup CardDatabase
- * @brief Core in-memory container for card and set data.
- *
- * Responsible for maintaining CardInfo objects, CardSet objects, and
- * providing access to CardDatabaseQuerier for query operations.
- * Handles addition, removal, and clearing of cards and sets.
- */
-class CardDatabase : public QObject
-{
-    Q_OBJECT
-
-protected:
-    /// Controller to determine set priority when choosing preferred printings.
-    ICardSetPriorityController *setPriorityController;
-
-    /// Cards indexed by exact name
-    CardNameMap cards;
-
-    /// Cards indexed by simplified name (normalized)
-    CardNameMap simpleNameCards;
-
-    /// Sets indexed by short name
-    SetNameMap sets;
-
-    FormatRulesNameMap formats;
-
-    /// Loader responsible for file discovery and parsing
-    CardDatabaseLoader *loader;
-
-    /// Current load status of the database
-    LoadStatus loadStatus;
-
-    /// Querier for higher-level card lookups
-    CardDatabaseQuerier *querier;
-
-private:
-    /**
-     * @brief Check for sets that are unknown and emit signals if needed.
-     */
-    void checkUnknownSets();
-
-    /**
-     * @brief Refreshes the cached reverse-related cards for all cards.
-     */
-    void refreshCachedReverseRelatedCards();
-
-    /// Mutexes for thread safety
-    QBasicMutex *clearDatabaseMutex = new QBasicMutex(), *addCardMutex = new QBasicMutex(),
-                *removeCardMutex = new QBasicMutex();
-
-public:
-    /**
-     * @brief Constructs a new CardDatabase instance.
-     * @param parent QObject parent.
-     * @param prefs Optional card preference provider.
-     * @param pathProvider Optional database path provider.
-     * @param setPriorityController Optional controller for set priority.
-     */
-    explicit CardDatabase(QObject *parent = nullptr,
-                          ICardPreferenceProvider *prefs = nullptr,
-                          ICardDatabasePathProvider *pathProvider = nullptr,
-                          ICardSetPriorityController *setPriorityController = nullptr);
-
-    /** @brief Destructor clears all internal data. */
-    ~CardDatabase() override;
-
-    /**
-     * @brief Removes a card from the database.
-     * @param card Pointer to the card to remove.
-     */
-    void removeCard(CardInfoPtr card);
-
-    /** @brief Clears all cards, sets, and internal state. */
-    void clear();
-
-    /** @brief Returns the map of cards by name. */
-    [[nodiscard]] const CardNameMap &getCardList() const
-    {
-        return cards;
-    }
-
-    /**
-     * @brief Retrieves a set by short name, creating a new one if missing.
-     * @param setName Short name of the set.
-     * @return Pointer to the CardSet.
-     */
-    CardSetPtr getSet(const QString &setName);
-
-    /** @brief Returns a list of all sets in the database. */
-    [[nodiscard]] CardSetList getSetList() const;
-
-    /** @brief Returns the current load status. */
-    [[nodiscard]] LoadStatus getLoadStatus() const
-    {
-        return loadStatus;
-    }
-
-    /** @brief Returns the querier for performing card lookups. */
-    [[nodiscard]] CardDatabaseQuerier *query() const
-    {
-        return querier;
-    }
-
-    /** @brief Enables all unknown sets in the database. */
-    void enableAllUnknownSets();
-
-    /** @brief Marks all sets as known. */
-    void markAllSetsAsKnown();
-
-    /** @brief Notifies listeners that enabled sets changed. */
-    void notifyEnabledSetsChanged();
-
-public slots:
-    /**
-     * @brief Adds a card to the database.
-     * @param card CardInfoPtr to add.
-     */
-    void addCard(CardInfoPtr card);
-
-    /**
-     * @brief Adds a set to the database.
-     * @param set Pointer to CardSet to add.
-     */
-    void addSet(CardSetPtr set);
-
-    void addFormat(FormatRulesPtr format);
-
-    /** @brief Loads card databases from configured paths. */
-    void loadCardDatabases();
-
-    /** @brief Saves custom tokens to file.
-     * @return True if successful.
-     */
-    bool saveCustomTokensToFile();
-
-signals:
-    /** @brief Emitted when the card database has finished loading successfully. */
-    void cardDatabaseLoadingFinished();
-
-    /** @brief Emitted when the card database fails to load. */
-    void cardDatabaseLoadingFailed();
-
-    /**
-     * @brief Emitted when new sets are found.
-     * @param numUnknownSets Number of unknown sets.
-     * @param unknownSetsNames Names of unknown sets.
-     */
-    void cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknownSetsNames);
-
-    /** @brief Emitted when all new sets have been enabled. */
-    void cardDatabaseAllNewSetsEnabled();
-
-    /** @brief Emitted when enabled sets have changed. */
-    void cardDatabaseEnabledSetsChanged();
-
-    /** @brief Emitted when a new card is added. */
-    void cardAdded(CardInfoPtr card);
-
-    /** @brief Emitted when a card is removed. */
-    void cardRemoved(CardInfoPtr card);
-
-    friend class CardDatabaseLoader;
-    friend class CardDatabaseQuerier;
-};
-
-#endif // CARDDATABASE_H
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
deleted file mode 100644
index 861cc95b0..000000000
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#ifndef COCKATRICE_CARD_DATABASE_LOADER_H
-#define COCKATRICE_CARD_DATABASE_LOADER_H
-
-#include <QBasicMutex>
-#include <QList>
-#include <QLoggingCategory>
-#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
-#include <libcockatrice/interfaces/interface_card_preference_provider.h>
-#include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
-
-inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.loading");
-inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.loading.success_or_failure");
-
-class CardDatabase;
-class ICardDatabaseParser;
-
-/**
- * @enum LoadStatus
- * @brief Represents the result of attempting to load a card database.
- */
-enum LoadStatus
-{
-    Ok,            /**< Database loaded successfully. */
-    VersionTooOld, /**< Database version is too old to load. */
-    Invalid,       /**< Database is invalid or unparsable. */
-    NotLoaded,     /**< Database has not been loaded. */
-    FileError,     /**< Error opening or reading the file. */
-    NoCards        /**< Database contains no cards. */
-};
-
-/**
- * @class CardDatabaseLoader
- * @ingroup CardDatabase
- * @brief Handles loading card databases from disk and saving custom tokens.
- *
- * This class is responsible for:
- *  - Discovering configured card database paths.
- *  - Loading main, token, spoiler, and custom databases.
- *  - Populating a CardDatabase instance using connected parsers.
- *  - Emitting signals about loading progress and new sets.
- */
-class CardDatabaseLoader : public QObject
-{
-    Q_OBJECT
-public:
-    /**
-     * @brief Constructs a CardDatabaseLoader.
-     * @param parent QObject parent.
-     * @param db Pointer to the CardDatabase to populate (non-owning).
-     * @param pathProvider Provider for card database file paths.
-     * @param preferenceProvider Optional card preference provider for pinned printings.
-     */
-    explicit CardDatabaseLoader(QObject *parent,
-                                CardDatabase *db,
-                                ICardDatabasePathProvider *pathProvider,
-                                ICardPreferenceProvider *preferenceProvider,
-                                ICardSetPriorityController *_priorityController);
-
-    /** @brief Destructor cleans up allocated parsers. */
-    ~CardDatabaseLoader() override;
-
-public slots:
-    /**
-     * @brief Loads all configured card databases.
-     * @return Status of the main database load.
-     */
-    LoadStatus loadCardDatabases();
-
-    /**
-     * @brief Loads a single card database file.
-     * @param path Path to the database file.
-     * @return LoadStatus indicating success or failure.
-     */
-    LoadStatus loadCardDatabase(const QString &path);
-
-    /**
-     * @brief Saves custom tokens to the user-defined custom database path.
-     * @return True if the save was successful.
-     */
-    bool saveCustomTokensToFile();
-
-signals:
-    /** @brief Emitted when loading starts. */
-    void loadingStarted();
-
-    /** @brief Emitted when loading finishes successfully. */
-    void loadingFinished();
-
-    /** @brief Emitted when loading fails. */
-    void loadingFailed();
-
-    /**
-     * @brief Emitted when new sets are discovered during loading.
-     * @param numSets Number of new sets.
-     * @param setNames Names of the discovered sets.
-     */
-    void newSetsFound(int numSets, const QStringList &setNames);
-
-    /** @brief Emitted when all newly discovered sets have been enabled. */
-    void allNewSetsEnabled();
-
-private:
-    /**
-     * @brief Loads a database from a single file using the available parsers.
-     * @param fileName Path to the database file.
-     * @return LoadStatus indicating success or failure.
-     */
-    LoadStatus loadFromFile(const QString &fileName);
-
-    /**
-     * @brief Collects custom card database paths recursively.
-     * @return Sorted list of file paths to custom databases.
-     */
-    [[nodiscard]] QStringList collectCustomDatabasePaths() const;
-
-private:
-    CardDatabase *database;                        /**< Non-owning pointer to the target CardDatabase. */
-    ICardDatabasePathProvider *pathProvider;       /**< Pointer to the path provider. */
-    QList<ICardDatabaseParser *> availableParsers; /**< List of available parsers for different formats. */
-
-    QBasicMutex *loadFromFileMutex = new QBasicMutex();   /**< Mutex for single-file loading. */
-    QBasicMutex *reloadDatabaseMutex = new QBasicMutex(); /**< Mutex for reloading entire database. */
-};
-
-#endif // COCKATRICE_CARD_DATABASE_LOADER_H
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
deleted file mode 100644
index 614b4a7f8..000000000
--- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "card_database_manager.h"
-
-#include <libcockatrice/interfaces/noop_card_database_path_provider.h>
-#include <libcockatrice/interfaces/noop_card_preference_provider.h>
-#include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
-
-ICardPreferenceProvider *CardDatabaseManager::cardPreferenceProvider = new NoopCardPreferenceProvider();
-ICardDatabasePathProvider *CardDatabaseManager::pathProvider = new NoopCardDatabasePathProvider();
-ICardSetPriorityController *CardDatabaseManager::setPriorityController = new NoopCardSetPriorityController();
-
-void CardDatabaseManager::setCardPreferenceProvider(ICardPreferenceProvider *provider)
-{
-    cardPreferenceProvider = provider;
-}
-
-void CardDatabaseManager::setCardDatabasePathProvider(ICardDatabasePathProvider *provider)
-{
-    pathProvider = provider;
-}
-
-void CardDatabaseManager::setCardSetPriorityController(ICardSetPriorityController *controller)
-{
-    setPriorityController = controller;
-}
-
-CardDatabase *CardDatabaseManager::getInstance()
-{
-    static CardDatabase instance(nullptr, cardPreferenceProvider, pathProvider, setPriorityController);
-    return &instance;
-}
-
-CardDatabaseQuerier *CardDatabaseManager::query()
-{
-    return getInstance()->query();
-}
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
deleted file mode 100644
index 58a744fbb..000000000
--- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef CARD_DATABASE_ACCESSOR_H
-#define CARD_DATABASE_ACCESSOR_H
-
-#pragma once
-#include "card_database.h"
-
-/**
- * @class CardDatabaseManager
- * @ingroup CardDatabase
- * @brief The CardDatabaseManager is responsible for managing the global CardDatabase singleton.
- *
- * This class provides a static interface for accessing the global CardDatabase instance
- * and its CardDatabaseQuerier. It also allows the configuration of optional providers:
- *  - ICardPreferenceProvider
- *  - ICardDatabasePathProvider
- *  - ICardSetPriorityController
- *
- * Only a single instance of CardDatabase exists, enforced via a private constructor and
- * deleted copy/move operations.
- */
-class CardDatabaseManager
-{
-public:
-    /** @brief Deleted copy constructor to enforce singleton. */
-    CardDatabaseManager(const CardDatabaseManager &) = delete;
-
-    /** @brief Deleted assignment operator to enforce singleton. */
-    CardDatabaseManager &operator=(const CardDatabaseManager &) = delete;
-
-    /**
-     * @brief Sets the card preference provider.
-     * @param provider Pointer to an ICardPreferenceProvider.
-     * @note Must be called before the first call to getInstance().
-     */
-    static void setCardPreferenceProvider(ICardPreferenceProvider *provider);
-
-    /**
-     * @brief Sets the card database path provider.
-     * @param provider Pointer to an ICardDatabasePathProvider.
-     * @note Must be called before the first call to getInstance().
-     */
-    static void setCardDatabasePathProvider(ICardDatabasePathProvider *provider);
-
-    /**
-     * @brief Sets the card set priority controller.
-     * @param controller Pointer to an ICardSetPriorityController.
-     * @note Must be called before the first call to getInstance().
-     */
-    static void setCardSetPriorityController(ICardSetPriorityController *controller);
-
-    /**
-     * @brief Returns the singleton CardDatabase instance.
-     * @return Pointer to the global CardDatabase.
-     */
-    static CardDatabase *getInstance();
-
-    /**
-     * @brief Returns the CardDatabaseQuerier of the singleton database.
-     * @return Pointer to CardDatabaseQuerier.
-     */
-    static CardDatabaseQuerier *query();
-
-private:
-    /** @brief Private default constructor to enforce singleton. */
-    CardDatabaseManager() = default;
-
-    /** @brief Private destructor. */
-    ~CardDatabaseManager() = default;
-
-    /// Static card preference provider pointer (default: Noop)
-    static ICardPreferenceProvider *cardPreferenceProvider;
-
-    /// Static path provider pointer (default: Noop)
-    static ICardDatabasePathProvider *pathProvider;
-
-    /// Static set priority controller pointer (default: Noop)
-    static ICardSetPriorityController *setPriorityController;
-};
-
-#endif // CARD_DATABASE_ACCESSOR_H
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
deleted file mode 100644
index ff8d7958b..000000000
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
+++ /dev/null
@@ -1,225 +0,0 @@
-#ifndef COCKATRICE_CARD_DATABASE_QUERIER_H
-#define COCKATRICE_CARD_DATABASE_QUERIER_H
-
-#include "../card_info.h"
-#include "../printing/exact_card.h"
-
-#include <QObject>
-#include <libcockatrice/interfaces/interface_card_preference_provider.h>
-#include <libcockatrice/utility/card_ref.h>
-
-class CardDatabase;
-
-/**
- * @class CardDatabaseQuerier
- * @ingroup CardDatabase
- * @brief Provides lookup and convenience functions for querying cards and their printings.
- *
- * The CardDatabaseQuerier class offers various lookup helpers for retrieving card information
- * (e.g., CardInfoPtr, ExactCard, and PrintingInfo) from a CardDatabase. It also applies user
- * printing preferences via ICardPreferenceProvider when determining preferred printings.
- */
-class CardDatabaseQuerier : public QObject
-{
-    Q_OBJECT
-
-public:
-    /**
-     * @brief Constructs a CardDatabaseQuerier.
-     *
-     * @param parent Parent QObject.
-     * @param db Pointer to the CardDatabase used for lookups.
-     * @param prefs Pointer to card preference provider which supplies user-preference for printings.
-     */
-    explicit CardDatabaseQuerier(QObject *parent, const CardDatabase *db, const ICardPreferenceProvider *prefs);
-
-    /**
-     * @brief Retrieves a card by its exact name.
-     *
-     * @param cardName Exact card name.
-     * @return A CardInfoPtr, or null if no matching card exists.
-     */
-    [[nodiscard]] CardInfoPtr getCardInfo(const QString &cardName) const;
-
-    /**
-     * @brief Retrieves multiple cards by their exact names.
-     *
-     * Failed lookups are skipped and not included in the result.
-     *
-     * @param cardNames List of exact card names.
-     * @return List of CardInfoPtr objects for which a match was found.
-     */
-    [[nodiscard]] QList<CardInfoPtr> getCardInfos(const QStringList &cardNames) const;
-
-    /**
-     * @brief Retrieves a card using simplified name matching.
-     *
-     * The name is automatically normalized, so callers do not need to simplify it.
-     *
-     * @param cardName A (possibly simplified or misspelled) card name.
-     * @return A CardInfoPtr, or null if not found.
-     */
-    [[nodiscard]] CardInfoPtr getCardBySimpleName(const QString &cardName) const;
-
-    /**
-     * @brief Looks up a card using exact name first, then simplified matching as fallback.
-     *
-     * @param name Raw card name input.
-     * @return The best-match CardInfoPtr, or null if no match is found.
-     */
-    [[nodiscard]] CardInfoPtr lookupCardByName(const QString &name) const;
-
-    /**
-     * @brief Converts a CardRef into an ExactCard.
-     *
-     * If the providerId is empty, the preferred printing is used.
-     * If providerId exists but cannot be found, an ExactCard with an empty PrintingInfo is returned.
-     *
-     * @param cardRef Card reference with name and optional providerId.
-     * @return The resolved ExactCard, or empty if no card was found.
-     */
-    [[nodiscard]] ExactCard getCard(const CardRef &cardRef) const;
-
-    /**
-     * @brief Resolves multiple CardRefs into ExactCards.
-     *
-     * Failed entries are not included in the result.
-     *
-     * @param cardRefs List of card references.
-     * @return List of successfully resolved ExactCards.
-     */
-    [[nodiscard]] QList<ExactCard> getCards(const QList<CardRef> &cardRefs) const;
-
-    /**
-     * @brief Attempts a more flexible card lookup using both simple name matching and CardRef rules.
-     *
-     * If providerId is missing, uses preferred printing. If lookup fails, attempts simplified name.
-     *
-     * @param cardRef Card reference to resolve.
-     * @return The best-guess ExactCard, or empty if unresolved.
-     */
-    [[nodiscard]] ExactCard guessCard(const CardRef &cardRef) const;
-
-    /**
-     * @brief Returns a random card from the database using the preferred printing.
-     *
-     * @return A random ExactCard, or empty if the database is empty.
-     */
-    [[nodiscard]] ExactCard getRandomCard() const;
-
-    /**
-     * @brief Returns a printing of a card from the same set as another given printing when possible.
-     *
-     * If no matching printing exists, falls back to a standard lookup.
-     *
-     * @param cardName Card to retrieve.
-     * @param otherPrinting Printing to match the set against.
-     * @return Matching ExactCard if found, otherwise fallback ExactCard.
-     */
-    [[nodiscard]] ExactCard getCardFromSameSet(const QString &cardName, const PrintingInfo &otherPrinting) const;
-
-    /**
-     * @brief Returns the preferred printing of a card based on user preferences and set priority.
-     *
-     * @param cardName Name of the card.
-     * @return The preferred ExactCard.
-     */
-    [[nodiscard]] ExactCard getPreferredCard(const QString &cardName) const;
-
-    /**
-     * @brief Returns the preferred printing of a card based on user preferences and set priority.
-     *
-     * @param cardInfo Card information object.
-     * @return The preferred ExactCard.
-     */
-    [[nodiscard]] ExactCard getPreferredCard(const CardInfoPtr &cardInfo) const;
-
-    /**
-     * @brief Checks whether the CardRef refers to the preferred printing.
-     *
-     * @param cardRef Card reference to test.
-     * @return True if providerId matches the preferred printing.
-     */
-    [[nodiscard]] bool isPreferredPrinting(const CardRef &cardRef) const;
-
-    /**
-     * @brief Returns the preferred printing for the given card name.
-     *
-     * @param cardName Card name.
-     * @return Preferred PrintingInfo, or empty if not found.
-     */
-    [[nodiscard]] PrintingInfo getPreferredPrinting(const QString &cardName) const;
-
-    /**
-     * @brief Returns the preferred printing for the given card.
-     *
-     * @param cardInfo Card information object.
-     * @return Preferred PrintingInfo, or empty if not applicable.
-     */
-    [[nodiscard]] PrintingInfo getPreferredPrinting(const CardInfoPtr &cardInfo) const;
-
-    /**
-     * @brief Returns the providerId of the preferred printing.
-     *
-     * @param cardName Card name.
-     * @return ProviderId string for preferred printing.
-     */
-    [[nodiscard]] QString getPreferredPrintingProviderId(const QString &cardName) const;
-
-    /**
-     * @brief Retrieves a specific printing referenced by CardRef.
-     *
-     * @param cardRef Card reference including providerId.
-     * @return Matching PrintingInfo, or empty if not found.
-     */
-    [[nodiscard]] PrintingInfo getSpecificPrinting(const CardRef &cardRef) const;
-
-    /**
-     * @brief Searches for a specific printing by set code and collector number.
-     *
-     * @param cardName Card name to search.
-     * @param setCode Set (short) code to match.
-     * @param collectorNumber Collector number. If empty, any printing from the set is returned.
-     * @return Matching PrintingInfo, or empty if not found.
-     */
-    [[nodiscard]] PrintingInfo
-    getSpecificPrinting(const QString &cardName, const QString &setCode, const QString &collectorNumber) const;
-
-    /**
-     * @brief Searches for a printing that matches a given providerId.
-     *
-     * @param card Card to search.
-     * @param providerId Provider identifier to match.
-     * @return Matching PrintingInfo, or empty if not found.
-     */
-    [[nodiscard]] PrintingInfo findPrintingWithId(const CardInfoPtr &card, const QString &providerId) const;
-
-    /**
-     * @brief Returns a list of all main card types present in the database.
-     *
-     * @return List of main card type strings.
-     */
-    [[nodiscard]] QStringList getAllMainCardTypes() const;
-
-    /**
-     * @brief Returns a mapping of main card types to their occurrence counts.
-     *
-     * @return Map of main card type to count.
-     */
-    [[nodiscard]] QMap<QString, int> getAllMainCardTypesWithCount() const;
-
-    /**
-     * @brief Returns a mapping of card subtypes to their occurrence counts.
-     *
-     * @return Map of subtype string to count.
-     */
-    [[nodiscard]] QMap<QString, int> getAllSubCardTypesWithCount() const;
-    FormatRulesPtr getFormat(const QString &formatName) const;
-    QMap<QString, int> getAllFormatsWithCount() const;
-
-private:
-    const CardDatabase *db;               //!< Card database used for all lookups.
-    const ICardPreferenceProvider *prefs; //!< Preference provider for preferred printings.
-};
-
-#endif // COCKATRICE_CARD_DATABASE_QUERIER_H
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
deleted file mode 100644
index a8eceab5a..000000000
--- a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef CARDDATABASE_PARSER_H
-#define CARDDATABASE_PARSER_H
-
-#include "../../card_info.h"
-
-#include <QIODevice>
-#include <QString>
-
-#define COCKATRICE_XML_XSI_NAMESPACE "http://www.w3.org/2001/XMLSchema-instance"
-
-/**
- * @class ICardDatabaseParser
- * @ingroup CardDatabase
- * @brief Defines the base parser interface (ICardDatabaseParser) for all card database parsers.
- *
- * Provides methods for checking file compatibility, parsing, and saving card databases.
- * Also provides shared access to the global set list for cross-referencing.
- */
-class ICardDatabaseParser : public QObject
-{
-    Q_OBJECT
-public:
-    ICardDatabaseParser(ICardSetPriorityController *cardSetPriorityController);
-    ~ICardDatabaseParser() override = default;
-
-    /**
-     * @brief Checks whether this parser can parse the given file.
-     * @param name File name (used for extension checks).
-     * @param device QIODevice representing the file content.
-     * @return true if the parser can handle this file.
-     */
-    virtual bool getCanParseFile(const QString &name, QIODevice &device) = 0;
-
-    /**
-     * @brief Parses a database file and emits addCard/addSet signals.
-     * @param device QIODevice representing the file content.
-     */
-    virtual void parseFile(QIODevice &device) = 0;
-
-    /**
-     * @brief Saves card and set data to a file.
-     * @param _formats
-     * @param sets Map of sets to save.
-     * @param cards Map of cards to save.
-     * @param fileName Target file path.
-     * @param sourceUrl Optional source URL of the database.
-     * @param sourceVersion Optional version string of the source.
-     * @return true if save succeeded.
-     */
-    virtual bool saveToFile(FormatRulesNameMap _formats,
-                            SetNameMap sets,
-                            CardNameMap cards,
-                            const QString &fileName,
-                            const QString &sourceUrl = "unknown",
-                            const QString &sourceVersion = "unknown") = 0;
-
-    /** @brief Clears the cached global set list. */
-    static void clearSetlist();
-
-protected:
-    /** @brief Cached global list of sets shared between all parsers. */
-    static SetNameMap sets;
-    ICardSetPriorityController *cardSetPriorityController;
-
-    /**
-     * @brief Internal helper to add a set to the global set cache.
-     * @param setName Short set name.
-     * @param longName Optional full name.
-     * @param setType Optional set type string.
-     * @param releaseDate Optional release date.
-     * @param priority Optional priority (fallback if not specified).
-     * @return Pointer to the added or existing CardSet instance.
-     */
-    CardSetPtr internalAddSet(const QString &setName,
-                              const QString &longName = "",
-                              const QString &setType = "",
-                              const QDate &releaseDate = QDate(),
-                              const CardSet::Priority priority = CardSet::PriorityFallback);
-
-signals:
-    /** Emitted when a card is loaded from the database. */
-    void addCard(CardInfoPtr card);
-
-    /** Emitted when a set is loaded from the database. */
-    void addSet(CardSetPtr set);
-
-    void addFormat(FormatRulesPtr format);
-};
-
-Q_DECLARE_INTERFACE(ICardDatabaseParser, "ICardDatabaseParser")
-
-#endif
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
deleted file mode 100644
index a01b705aa..000000000
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef COCKATRICE_XML3_H
-#define COCKATRICE_XML3_H
-
-#include "card_database_parser.h"
-
-#include <QLoggingCategory>
-#include <QXmlStreamReader>
-
-inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser");
-
-/**
- * @class CockatriceXml3Parser
- * @ingroup CardDatabase
- * @brief Parses version 3 of the Cockatrice XML Schema.
- *
- * This parser reads a Cockatrice XML3 database and emits CardInfoPtr
- * and CardSetPtr objects. All card properties are read individually.
- *
- * @note Differences from v4:
- * - No <prop> block; properties are hardcoded (manacost, cmc, type, pt, loyalty, etc.).
- * - No set priority field.
- * - No support for rebalanced cards or preferences.
- * - Related cards support only attach, exclude, variable, and count attributes.
- */
-class CockatriceXml3Parser : public ICardDatabaseParser
-{
-    Q_OBJECT
-public:
-    CockatriceXml3Parser(ICardSetPriorityController *cardSetPriorityController);
-    ~CockatriceXml3Parser() override = default;
-
-    /**
-     * @brief Determines if the parser can handle this file.
-     * @param name File name.
-     * @param device Open QIODevice containing the XML.
-     * @return True if the file is a Cockatrice XML3 database.
-     */
-    bool getCanParseFile(const QString &name, QIODevice &device) override;
-
-    /**
-     * @brief Parse the XML database.
-     * @param device Open QIODevice positioned at start of file.
-     */
-    void parseFile(QIODevice &device) override;
-
-    /**
-     * @brief Save sets and cards back to an XML3 file.
-     */
-    bool saveToFile(FormatRulesNameMap _formats,
-                    SetNameMap _sets,
-                    CardNameMap cards,
-                    const QString &fileName,
-                    const QString &sourceUrl = "unknown",
-                    const QString &sourceVersion = "unknown") override;
-
-private:
-    /**
-     * @brief Load all <card> elements from the XML stream.
-     * @param xml The open QXmlStreamReader positioned at the <cards> element.
-     * Parses each <card> node and emits addCard signals for each CardInfoPtr created.
-     */
-    void loadCardsFromXml(QXmlStreamReader &xml);
-
-    /**
-     * @brief Load all <set> elements from the XML stream.
-     * @param xml The open QXmlStreamReader positioned at the <sets> element.
-     * Parses each <set> node and adds them to the shared set cache.
-     */
-    void loadSetsFromXml(QXmlStreamReader &xml);
-
-    /**
-     * @brief Extracts the main card type from a full type string.
-     * @param type The full type string (e.g., "Legendary Artifact Creature - Golem")
-     * @return The primary type (e.g., "Creature").
-     */
-    QString getMainCardType(QString &type);
-};
-
-#endif
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
deleted file mode 100644
index 189e79535..000000000
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef COCKATRICE_XML4_H
-#define COCKATRICE_XML4_H
-
-#include "card_database_parser.h"
-
-#include <QLoggingCategory>
-#include <QXmlStreamReader>
-#include <libcockatrice/interfaces/interface_card_preference_provider.h>
-
-inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
-
-/**
- * @class CockatriceXml4Parser
- * @ingroup CardDatabase
- * @brief Parses version 4 of the Cockatrice XML Schema.
- *
- * This parser reads a Cockatrice XML4 database and emits CardInfoPtr
- * and CardSetPtr objects. Card properties are read inside <prop> blocks,
- * making the parser more extensible and schema-compliant.
- *
- * @note Differences from v3:
- * - Card properties are stored in <prop> blocks as a QVariantHash.
- * - Sets can include a <priority> element.
- * - Supports user preferences via ICardPreferenceProvider (e.g., skipping rebalanced cards).
- * - Related cards support persistent relations and multiple attach types (e.g., transform).
- * - More robust serialization; easier to extend schema in the future.
- */
-class CockatriceXml4Parser : public ICardDatabaseParser
-{
-    Q_OBJECT
-public:
-    explicit CockatriceXml4Parser(ICardPreferenceProvider *cardPreferenceProvider,
-                                  ICardSetPriorityController *cardSetPriorityController);
-    ~CockatriceXml4Parser() override = default;
-
-    /**
-     * @brief Determines if the parser can handle this file.
-     * @param name File name.
-     * @param device Open QIODevice containing the XML.
-     * @return True if the file is a Cockatrice XML4 database.
-     */
-    bool getCanParseFile(const QString &name, QIODevice &device) override;
-
-    /**
-     * @brief Parse the XML database.
-     * @param device Open QIODevice positioned at start of file.
-     */
-    void parseFile(QIODevice &device) override;
-
-    /**
-     * @brief Save sets and cards back to an XML4 file.
-     */
-    bool saveToFile(FormatRulesNameMap _formats,
-                    SetNameMap _sets,
-                    CardNameMap cards,
-                    const QString &fileName,
-                    const QString &sourceUrl = "unknown",
-                    const QString &sourceVersion = "unknown") override;
-
-private:
-    ICardPreferenceProvider *cardPreferenceProvider; ///< Interface to handle user preferences
-
-    /**
-     * @brief Loads a generic <prop> block from a <card> element.
-     * @param xml The open QXmlStreamReader positioned at a <prop> element.
-     * @return A QVariantHash mapping property names to values.
-     */
-    QVariantHash loadCardPropertiesFromXml(QXmlStreamReader &xml);
-
-    /**
-     * @brief Load all <card> elements from the XML stream.
-     * @param xml The open QXmlStreamReader positioned at the <cards> element.
-     * Honors the user's preference regarding rebalanced cards.
-     */
-    void loadCardsFromXml(QXmlStreamReader &xml);
-
-    void loadFormats(QXmlStreamReader &xml);
-    /**
-     * @brief Load all <set> elements from the XML stream.
-     * @param xml The open QXmlStreamReader positioned at the <sets> element.
-     * Parses <set> nodes including priority information.
-     */
-    void loadSetsFromXml(QXmlStreamReader &xml);
-};
-
-#endif
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp
deleted file mode 100644
index a6b3bb038..000000000
--- a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "format_legality_rules.h"
-
-#include <libcockatrice/card/card_info.h>
-
-bool cardMatchesCondition(const CardInfo &card, const CardCondition &cond)
-{
-    CardMatchType type = matchTypeFromString(cond.matchType);
-    QString fieldValue;
-    if (cond.field == "name") {
-        fieldValue = card.getName();
-    } else if (cond.field == "text") {
-        fieldValue = card.getText();
-    } else {
-        fieldValue = card.getProperty(cond.field);
-    }
-
-    switch (type) {
-        case CardMatchType::Equals:
-            return fieldValue == cond.value;
-        case CardMatchType::NotEquals:
-            return fieldValue != cond.value;
-        case CardMatchType::Contains:
-            return fieldValue.contains(cond.value, Qt::CaseInsensitive);
-        case CardMatchType::NotContains:
-            return !fieldValue.contains(cond.value, Qt::CaseInsensitive);
-        case CardMatchType::Regex: {
-            QRegularExpression re(cond.value, QRegularExpression::CaseInsensitiveOption);
-            return re.match(fieldValue).hasMatch();
-        }
-        default:
-            return false;
-    }
-}
-
-bool exceptionAppliesToCard(const CardInfo &card, const ExceptionRule &rule)
-{
-    for (const CardCondition &cond : rule.conditions) {
-        if (!cardMatchesCondition(card, cond)) {
-            return false; // all conditions must match
-        }
-    }
-    return true;
-}
-
-bool cardHasAnyException(const CardInfo &card, const FormatRules &format)
-{
-    for (const ExceptionRule &rule : format.exceptions) {
-        if (exceptionAppliesToCard(card, rule)) {
-            return true;
-        }
-    }
-    return false;
-}
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
deleted file mode 100644
index 16f2359ab..000000000
--- a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef COCKATRICE_FORMAT_LEGALITY_RULES_H
-#define COCKATRICE_FORMAT_LEGALITY_RULES_H
-
-#include <QRegularExpression>
-#include <QSharedPointer>
-#include <QString>
-
-class CardInfo;
-using CardInfoPtr = QSharedPointer<CardInfo>;
-
-struct CardCondition
-{
-    QString field;     // e.g. "type", "maintype", "text"
-    QString matchType; // "contains", "equals", "regex", "notContains", etc.
-    QString value;     // e.g. "Basic Land"
-};
-
-struct AllowedCount
-{
-    int max = 0;   // 4, 1, 0, or -1 for unlimited
-    QString label; // "legal", "restricted", "banned"
-};
-
-struct ExceptionRule
-{
-    QList<CardCondition> conditions; // All must match
-    int maxCopies = -1;              // -1 = unlimited
-};
-
-struct FormatRules
-{
-    QString formatName;
-    int minDeckSize = 60;
-    int maxDeckSize = -1; // -1 = unlimited
-    int maxSideboardSize = 15;
-
-    QList<AllowedCount> allowedCounts;
-
-    QList<ExceptionRule> exceptions; // Cards allowed to break maxCopies
-};
-
-enum class CardMatchType
-{
-    Equals,
-    NotEquals,
-    Contains,
-    NotContains,
-    Regex
-};
-
-// convert string to enum
-inline CardMatchType matchTypeFromString(const QString &str)
-{
-    if (str == "equals")
-        return CardMatchType::Equals;
-    if (str == "notEquals")
-        return CardMatchType::NotEquals;
-    if (str == "contains")
-        return CardMatchType::Contains;
-    if (str == "notContains")
-        return CardMatchType::NotContains;
-    if (str == "regex")
-        return CardMatchType::Regex;
-    return CardMatchType::Equals; // fallback default
-}
-
-bool cardMatchesCondition(const CardInfo &card, const CardCondition &cond);
-
-bool exceptionAppliesToCard(const CardInfo &card, const ExceptionRule &rule);
-
-bool cardHasAnyException(const CardInfo &card, const FormatRules &format);
-
-#endif // COCKATRICE_FORMAT_LEGALITY_RULES_H
diff --git a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
deleted file mode 100644
index 91ebd6647..000000000
--- a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "card_name_normalizer.h"
-
-#include "../database/card_database_manager.h"
-#include "../printing/exact_card.h"
-
-#include <QRegularExpression>
-
-/**
- * @brief Resolves the complete display name of a card.
- * @param cardName Base name.
- * @return Full display name, or the cardName unchanged if a display name is not found.
- */
-static QString getCompleteCardName(const QString &cardName)
-{
-    ExactCard temp = CardDatabaseManager::query()->guessCard({cardName});
-    if (temp) {
-        return temp.getName();
-    }
-
-    return cardName;
-}
-
-QString CardNameNormalizer::operator()(const QString &cardNameString) const
-{
-    QString cardName = cardNameString;
-
-    // Regex for advanced card parsing
-    static const QRegularExpression reSplitCard(R"( ?\/\/ ?)");
-    static const QRegularExpression reBrace(R"( ?[\[\{][^\]\}]*[\]\}] ?)"); // not nested
-    static const QRegularExpression reRoundBrace(R"(^\([^\)]*\) ?)");       // () are only matched at start of string
-    static const QRegularExpression reDigitBrace(R"( ?\(\d*\) ?)");         // () are matched if containing digits
-    static const QRegularExpression reBraceDigit(
-        R"( ?\([\dA-Z]+\) *\d+$)"); // () are matched if containing setcode then a number
-    static const QRegularExpression reDoubleFacedMarker(R"( ?\(Transform\) ?)");
-
-    static const QHash<QRegularExpression, QString> differences{{QRegularExpression("’"), "'"},
-                                                                {QRegularExpression("Æ"), "Ae"},
-                                                                {QRegularExpression("æ"), "ae"},
-                                                                {QRegularExpression(" ?[|/]+ ?"), " // "}};
-
-    // Handle advanced card types
-    if (cardName.contains(reSplitCard)) {
-        cardName = cardName.split(reSplitCard).join(" // ");
-    }
-
-    if (cardName.contains(reDoubleFacedMarker)) {
-        QStringList faces = cardName.split(reDoubleFacedMarker);
-        cardName = faces.first().trimmed();
-    }
-
-    // Remove unnecessary characters
-    cardName.remove(reBrace);
-    cardName.remove(reRoundBrace); // I'll be entirely honest here, these are split to accommodate just three cards
-    cardName.remove(reDigitBrace); // from un-sets that have a word in between round braces at the end
-    cardName.remove(reBraceDigit); // very specific format with the set code in () and collectors number after
-
-    // Normalize characters
-    for (auto diff = differences.constBegin(); diff != differences.constEnd(); ++diff) {
-        cardName.replace(diff.key(), diff.value());
-    }
-
-    // Resolve complete card name
-    cardName = getCompleteCardName(cardName);
-
-    return cardName;
-}
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.h b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.h
deleted file mode 100644
index 716e7da80..000000000
--- a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef COCKATRICE_CARD_NAME_NORMALIZER_H
-#define COCKATRICE_CARD_NAME_NORMALIZER_H
-
-#include <QString>
-
-/**
- * Functor that normalizes the raw card name parsed during a plaintext deck import into the card name that Cockatrice
- * uses.
- */
-struct CardNameNormalizer
-{
-    QString operator()(const QString &cardNameString) const;
-};
-
-#endif // COCKATRICE_CARD_NAME_NORMALIZER_H
diff --git a/libcockatrice_card/libcockatrice/card/printing/exact_card.h b/libcockatrice_card/libcockatrice/card/printing/exact_card.h
deleted file mode 100644
index 74fc75da3..000000000
--- a/libcockatrice_card/libcockatrice/card/printing/exact_card.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef EXACT_CARD_H
-#define EXACT_CARD_H
-
-#include "../card_info.h"
-
-/**
- * @class ExactCard
- * @ingroup CardPrintings
- *
- * @brief Represents a specific card instance, defined by its CardInfo
- *        and a particular printing.
- *
- * An ExactCard identifies a card not only by its underlying CardInfoPtr
- * (which may be null), but also by its PrintingInfo, which specifies the
- * exact printing/variant. This allows distinguishing between different
- * printings of the same logical card (e.g., different sets, promos, foils).
- */
-class ExactCard
-{
-    CardInfoPtr card;
-    PrintingInfo printing;
-
-public:
-    /**
-     * @brief Constructs an empty ExactCard.
-     *
-     * The CardInfoPtr will be null, and PrintingInfo will be default-constructed.
-     * An empty ExactCard represents "no card".
-     */
-    ExactCard();
-
-    /**
-     * @brief Constructs an ExactCard from a card and printing.
-     *
-     * @param _card     The card info pointer. May be null.
-     * @param _printing The printing details. Defaults to an empty PrintingInfo.
-     */
-    explicit ExactCard(const CardInfoPtr &_card, const PrintingInfo &_printing = PrintingInfo());
-
-    /**
-     * @brief Returns the underlying CardInfoPtr.
-     *
-     * May be null if the ExactCard is empty.
-     */
-    [[nodiscard]] CardInfoPtr getCardPtr() const
-    {
-        return card;
-    }
-
-    /**
-     * @brief Returns the printing information associated with this card.
-     *
-     * May be empty if no specific printing was assigned.
-     */
-    [[nodiscard]] PrintingInfo getPrinting() const
-    {
-        return printing;
-    }
-
-    /**
-     * @brief Compares both card pointer and printing for equality.
-     *
-     * Two ExactCard objects are equal only if both their CardInfoPtr and
-     * PrintingInfo values are equal.
-     */
-    bool operator==(const ExactCard &other) const;
-
-    /**
-     * @brief Convenience helper to get the card's display name.
-     *
-     * @return The card's name, or an empty string if the CardInfoPtr is null.
-     */
-    [[nodiscard]] QString getName() const;
-
-    /**
-     * @brief Returns a reference to the underlying CardInfo object.
-     *
-     * If the CardInfoPtr is null, returns a reference to a static empty CardInfo
-     * instance instead. This avoids null-dereferencing but means modifications
-     * to the returned object do not affect the ExactCard.
-     *
-     * @return A const reference to the CardInfo object.
-     */
-    [[nodiscard]] const CardInfo &getInfo() const;
-
-    /**
-     * @brief Generates a stable cache key for pixmap caching.
-     *
-     * The key includes the card's name and (if present) the printing UUID,
-     * allowing different printings of the same card to map to different cache entries.
-     */
-    [[nodiscard]] QString getPixmapCacheKey() const;
-
-    /**
-     * @brief Indicates whether this ExactCard represents no valid card.
-     *
-     * An ExactCard is considered empty if the CardInfoPtr is null or the
-     * card's name is empty.
-     */
-    [[nodiscard]] bool isEmpty() const;
-
-    /**
-     * @brief Boolean conversion indicating whether the card is valid (non-empty).
-     *
-     * @return true if not empty, false otherwise.
-     */
-    explicit operator bool() const;
-
-    /**
-     * @brief Emits the pixmapUpdated signal on the underlying CardInfo.
-     *
-     * Assumes CardInfoPtr is non-null. If called on an empty ExactCard,
-     * the behavior is undefined.
-     */
-    void emitPixmapUpdated() const;
-};
-Q_DECLARE_METATYPE(ExactCard)
-
-#endif // EXACT_CARD_H
diff --git a/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp b/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
deleted file mode 100644
index 340998565..000000000
--- a/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "printing_info.h"
-
-#include "../set/card_set.h"
-
-PrintingInfo::PrintingInfo(const CardSetPtr &_set) : set(_set)
-{
-}
-
-/**
- * Gets the uuid property of the printing, or an empty string if the property isn't present
- */
-QString PrintingInfo::getUuid() const
-{
-    return properties.value("uuid").toString();
-}
-
-QString PrintingInfo::getFlavorName() const
-{
-    return properties.value("flavorName").toString();
-}
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/printing/printing_info.h b/libcockatrice_card/libcockatrice/card/printing/printing_info.h
deleted file mode 100644
index ad7b33654..000000000
--- a/libcockatrice_card/libcockatrice/card/printing/printing_info.h
+++ /dev/null
@@ -1,131 +0,0 @@
-#ifndef COCKATRICE_PRINTING_INFO_H
-#define COCKATRICE_PRINTING_INFO_H
-
-#include "../set/card_set.h"
-
-#include <QList>
-#include <QMap>
-#include <QVariant>
-
-class PrintingInfo;
-
-using SetToPrintingsMap = QMap<QString, QList<PrintingInfo>>;
-
-/**
- * @class PrintingInfo
- * @ingroup CardPrintings
- *
- * @brief Represents metadata for a specific variation of a card within a set.
- *
- * A card can have multiple variations across sets. PrintingInfo associates
- * a card with one such variation, and provides per-printing attributes
- * such as identifiers or additional properties.
- *
- * Equality is defined as both the set and the property values being equal.
- */
-class PrintingInfo
-{
-public:
-    /**
-     * @brief Constructs a PrintingInfo associated with a specific set.
-     *
-     * @param _set The set this printing belongs to (defaults to null).
-     */
-    explicit PrintingInfo(const CardSetPtr &_set = nullptr);
-
-    /**
-     * @brief Destroys the PrintingInfo.
-     *
-     * Defaulted since no special cleanup is required.
-     */
-    ~PrintingInfo() = default;
-
-    /**
-     * @brief Equality operator.
-     *
-     * Two PrintingInfo objects are equal if they refer to the same set
-     * and contain the exact same property key/value pairs.
-     *
-     * @param other Another PrintingInfo to compare against.
-     * @return True if both set and properties are equal, otherwise false.
-     */
-    bool operator==(const PrintingInfo &other) const
-    {
-        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.
-
-public:
-    /**
-     * @brief Returns the set this printing belongs to.
-     *
-     * @return Pointer to the associated CardSet.
-     */
-    [[nodiscard]] CardSetPtr getSet() const
-    {
-        return set;
-    }
-
-    /**
-     * @brief Returns the list of property names defined for this printing.
-     *
-     * @return List of keys stored in the properties map.
-     */
-    [[nodiscard]] QStringList getProperties() const
-    {
-        return properties.keys();
-    }
-
-    /**
-     * @brief Retrieves the value of a specific property.
-     *
-     * @param propertyName The key name of the property to query.
-     * @return The property value as a string, or an empty string if not set.
-     */
-    [[nodiscard]] QString getProperty(const QString &propertyName) const
-    {
-        return properties.value(propertyName).toString();
-    }
-
-    /**
-     * @brief Sets or updates the value of a specific property.
-     *
-     * If the property already exists, its value is replaced.
-     *
-     * @param _name The name of the property.
-     * @param _value The string value to assign.
-     */
-    void setProperty(const QString &_name, const QString &_value)
-    {
-        properties.insert(_name, _value);
-    }
-
-    /**
-     * @brief Returns the providerID for this printing.
-     *
-     * @return A string representing the providerID.
-     */
-    [[nodiscard]] QString getUuid() const;
-
-    /**
-     * @brief Returns the flavorName for this printing.
-     *
-     * @return The flavorName, or empty if it isn't present.
-     */
-    [[nodiscard]] QString getFlavorName() const;
-};
-
-#endif // COCKATRICE_PRINTING_INFO_H
diff --git a/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp b/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
deleted file mode 100644
index 90e59e439..000000000
--- a/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "card_relation.h"
-
-#include "card_relation_type.h"
-
-CardRelation::CardRelation(const QString &_name,
-                           CardRelationType _attachType,
-                           bool _isCreateAllExclusion,
-                           bool _isVariableCount,
-                           int _defaultCount,
-                           bool _isPersistent)
-    : name(_name), attachType(_attachType), isCreateAllExclusion(_isCreateAllExclusion),
-      isVariableCount(_isVariableCount), defaultCount(_defaultCount), isPersistent(_isPersistent)
-{
-}
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/relation/card_relation.h b/libcockatrice_card/libcockatrice/card/relation/card_relation.h
deleted file mode 100644
index 9ff704097..000000000
--- a/libcockatrice_card/libcockatrice/card/relation/card_relation.h
+++ /dev/null
@@ -1,156 +0,0 @@
-#ifndef COCKATRICE_CARD_RELATION_H
-#define COCKATRICE_CARD_RELATION_H
-
-#include "card_relation_type.h"
-
-#include <QObject>
-#include <QString>
-
-/**
- * @class CardRelation
- * @ingroup Cards
- *
- * @brief Represents a relationship between two cards.
- *
- * CardRelation objects define directional relationships, such as:
- * - One card attaching to another.
- * - One card transforming into another.
- * - One card creating another instance.
- *
- * Relations may also define metadata such as whether multiple creations
- * are possible, whether the relation is persistent, and default counts.
- */
-class CardRelation : public QObject
-{
-    Q_OBJECT
-
-private:
-    QString name;                ///< Name of the related card.
-    CardRelationType attachType; ///< Type of attachment.
-    bool isCreateAllExclusion; ///< True if this relation should exclude multiple creations in "create all" operations.
-    bool isVariableCount;      ///< True if the number of creations is variable.
-    int defaultCount;          ///< Default number of cards created or involved.
-    bool isPersistent;         ///< True if this relation persists (i.e. is not destroyed) on zone change.
-
-public:
-    /**
-     * @brief Constructs a CardRelation with optional parameters.
-     *
-     * @param _name Name of the related card.
-     * @param _attachType Type of attachment.
-     * @param _isCreateAllExclusion Whether this relation excludes mass creation.
-     * @param _isVariableCount Whether the count is variable.
-     * @param _defaultCount Default number for creations or transformations.
-     * @param _isPersistent Whether the relation persists across zone changes.
-     */
-    explicit CardRelation(const QString &_name = QString(),
-                          CardRelationType _attachType = CardRelationType::DoesNotAttach,
-                          bool _isCreateAllExclusion = false,
-                          bool _isVariableCount = false,
-                          int _defaultCount = 1,
-                          bool _isPersistent = false);
-
-    /**
-     * @brief Returns the name of the related card.
-     *
-     * @return Name as QString reference.
-     */
-    [[nodiscard]] inline const QString &getName() const
-    {
-        return name;
-    }
-
-    /**
-     * @brief Returns the type of attachment.
-     *
-     * @return Enum value representing the attachment type.
-     */
-    [[nodiscard]] CardRelationType getAttachType() const
-    {
-        return attachType;
-    }
-
-    /**
-     * @brief Returns true if the card is attached to another.
-     *
-     * @return True if attached, false otherwise.
-     */
-    [[nodiscard]] bool getDoesAttach() const
-    {
-        return attachType != CardRelationType::DoesNotAttach;
-    }
-
-    /**
-     * @brief Returns true if this card transforms into another card.
-     *
-     * @return True if it transforms, false otherwise.
-     */
-    [[nodiscard]] bool getDoesTransform() const
-    {
-        return attachType == CardRelationType::TransformInto;
-    }
-
-    /**
-     * @brief Returns a string description of the attachment type.
-     *
-     * @return "attach" for AttachTo, "transform" for TransformInto, empty string otherwise.
-     */
-    [[nodiscard]] QString getAttachTypeAsString() const
-    {
-        return cardAttachTypeToString(attachType);
-    }
-
-    /**
-     * @brief Determines whether another instance can be created.
-     *
-     * @return True if creation is allowed, false if constrained by attachment.
-     */
-    [[nodiscard]] bool getCanCreateAnother() const
-    {
-        return !getDoesAttach();
-    }
-
-    /**
-     * @brief Returns whether this relation is excluded from "create all" operations.
-     *
-     * @return True if excluded, false otherwise.
-     */
-    [[nodiscard]] bool getIsCreateAllExclusion() const
-    {
-        return isCreateAllExclusion;
-    }
-
-    /**
-     * @brief Returns whether the relation count is variable.
-     *
-     * @return True if variable, false otherwise.
-     */
-    [[nodiscard]] bool getIsVariable() const
-    {
-        return isVariableCount;
-    }
-
-    /**
-     * @brief Returns the default count of related cards.
-     *
-     * @return Integer representing default number.
-     */
-    [[nodiscard]] int getDefaultCount() const
-    {
-        return defaultCount;
-    }
-
-    /**
-     * @brief Returns whether the relation is persistent.
-     *
-     * Persistent relations are not destroyed on zone changes.
-     *
-     * @return True if persistent, false otherwise.
-     */
-    [[nodiscard]] bool getIsPersistent() const
-    {
-        return isPersistent;
-    }
-};
-
-#endif // COCKATRICE_CARD_RELATION_H
diff --git a/libcockatrice_card/libcockatrice/card/relation/card_relation_type.h b/libcockatrice_card/libcockatrice/card/relation/card_relation_type.h
deleted file mode 100644
index 9bd85f3ac..000000000
--- a/libcockatrice_card/libcockatrice/card/relation/card_relation_type.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef COCKATRICE_CARD_RELATION_TYPE_H
-#define COCKATRICE_CARD_RELATION_TYPE_H
-
-#include <QString>
-
-/**
- * @enum CardRelationType
- * @ingroup Cards
- * @brief Types of attachments between cards.
- *
- * DoesNotAttach: No attachment is present.
- * AttachTo: This card attaches to another card.
- * TransformInto: This card transforms into another card.
- */
-enum class CardRelationType
-{
-    DoesNotAttach = 0,
-    AttachTo = 1,
-    TransformInto = 2,
-};
-
-// Helper function to transform the enum values into human-readable strings
-inline QString cardAttachTypeToString(CardRelationType type)
-{
-    switch (type) {
-        case CardRelationType::AttachTo:
-            return "attach";
-        case CardRelationType::TransformInto:
-            return "transform";
-        default:
-            return "";
-    }
-}
-
-#endif // COCKATRICE_CARD_RELATION_TYPE_H
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.cpp b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
deleted file mode 100644
index 20d0aced8..000000000
--- a/libcockatrice_card/libcockatrice/card/set/card_set.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "card_set.h"
-
-#include <QSet>
-#include <utility>
-
-const char *CardSet::TOKENS_SETNAME = "TK";
-
-CardSet::CardSet(ICardSetPriorityController *_priorityController,
-                 const QString &_shortName,
-                 const QString &_longName,
-                 const QString &_setType,
-                 const QDate &_releaseDate,
-                 const CardSet::Priority _priority)
-    : priorityController(std::move(_priorityController)), shortName(_shortName), longName(_longName),
-      releaseDate(_releaseDate), setType(_setType), priority(_priority)
-{
-    loadSetOptions();
-}
-
-CardSetPtr CardSet::newInstance(ICardSetPriorityController *_priorityController,
-                                const QString &_shortName,
-                                const QString &_longName,
-                                const QString &_setType,
-                                const QDate &_releaseDate,
-                                const Priority _priority)
-{
-    CardSetPtr ptr(new CardSet(_priorityController, _shortName, _longName, _setType, _releaseDate, _priority));
-    // ptr->setSmartPointer(ptr);
-    return ptr;
-}
-
-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";
-
-    return invalidFileNames.contains(shortName) ? shortName + "_" : shortName;
-}
-
-void CardSet::loadSetOptions()
-{
-    sortKey = priorityController->getSortKey(shortName);
-    enabled = priorityController->isEnabled(shortName);
-    isknown = priorityController->isKnown(shortName);
-}
-
-void CardSet::setSortKey(unsigned int _sortKey)
-{
-    sortKey = _sortKey;
-    priorityController->setSortKey(shortName, _sortKey);
-}
-
-void CardSet::setEnabled(bool _enabled)
-{
-    enabled = _enabled;
-    priorityController->setEnabled(shortName, _enabled);
-}
-
-void CardSet::setIsKnown(bool _isknown)
-{
-    isknown = _isknown;
-    priorityController->setIsKnown(shortName, _isknown);
-}
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.h b/libcockatrice_card/libcockatrice/card/set/card_set.h
deleted file mode 100644
index fe4b66522..000000000
--- a/libcockatrice_card/libcockatrice/card/set/card_set.h
+++ /dev/null
@@ -1,231 +0,0 @@
-#ifndef COCKATRICE_CARD_SET_H
-#define COCKATRICE_CARD_SET_H
-
-#include <QDate>
-#include <QList>
-#include <QSharedPointer>
-#include <QString>
-#include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
-
-class CardInfo;
-using CardInfoPtr = QSharedPointer<CardInfo>;
-
-class CardSet;
-using CardSetPtr = QSharedPointer<CardSet>;
-
-/**
- * @class CardSet
- * @ingroup CardSets
- *
- * @brief A collection of cards grouped under a common identifier.
- *
- * A set serves both as metadata (identifier, title, category, release date, and priority)
- * and as a container of all cards that belong to it. Each set can be enabled/disabled
- * and marked as known/unknown depending on context.
- *
- * The class inherits from `QList<CardInfoPtr>`, so it can be iterated over directly
- * to access its contents.
- *
- * Typical usage:
- * - Query metadata such as identifier, category, or release date.
- * - Enable or disable sets according to user preference.
- * - Store and retrieve CardInfo objects associated with the set.
- */
-class CardSet : public QList<CardInfoPtr>
-{
-public:
-    /**
-     * @enum Priority
-     * @brief Defines relative ordering and importance of sets.
-     */
-    enum Priority
-    {
-        PriorityFallback = 0,   ///< Used when no other priority is defined.
-        PriorityPrimary = 10,   ///< Primary, canonical set.
-        PrioritySecondary = 20, ///< Secondary but relevant.
-        PriorityReprint = 30,   ///< Duplicate or reprint category.
-        PriorityOther = 40,     ///< Miscellaneous grouping.
-        PriorityLowest = 100,   ///< Lowest sorting priority.
-    };
-
-    static const char *TOKENS_SETNAME; ///< Reserved identifier for token-like sets.
-
-private:
-    ICardSetPriorityController *priorityController; ///< Interface to the card set priority controller.
-    QString shortName;                              ///< Short identifier for the set.
-    QString longName;                               ///< Full name for the set.
-    unsigned int sortKey;                           ///< Custom numeric sort key.
-    QDate releaseDate;                              ///< Release date, may be empty if unknown.
-    QString setType;                                ///< Type/category label for the set.
-    Priority priority;                              ///< Priority level for sorting and relevance.
-    bool enabled;                                   ///< Whether the set is active/enabled.
-    bool isknown;                                   ///< Whether the set is considered known.
-
-public:
-    /**
-     * @brief Constructs a CardSet.
-     *
-     * @param priorityController Interface to a card set priority controller.
-     * @param _shortName Identifier string.
-     * @param _longName Full descriptive name.
-     * @param _setType Type/category string.
-     * @param _releaseDate Release date (optional).
-     * @param _priority Sorting/priority level.
-     */
-    explicit CardSet(ICardSetPriorityController *priorityController,
-                     const QString &_shortName = QString(),
-                     const QString &_longName = QString(),
-                     const QString &_setType = QString(),
-                     const QDate &_releaseDate = QDate(),
-                     const Priority _priority = PriorityFallback);
-
-    /**
-     * @brief Creates and returns a new shared CardSet instance.
-     *
-     * @param priorityController Interface to a card set priority controller.
-     * @param _shortName Identifier string.
-     * @param _longName Full descriptive name.
-     * @param _setType Type/category string.
-     * @param _releaseDate Release date (optional).
-     * @param _priority Sorting/priority level.
-     * @return A shared pointer to the new CardSet.
-     */
-    static CardSetPtr newInstance(ICardSetPriorityController *priorityController,
-                                  const QString &_shortName = QString(),
-                                  const QString &_longName = QString(),
-                                  const QString &_setType = QString(),
-                                  const QDate &_releaseDate = QDate(),
-                                  const Priority _priority = PriorityFallback);
-
-    /**
-     * @brief Returns a safe, sanitized version of the short name.
-     *
-     * Intended for file paths or identifiers where only certain
-     * characters are allowed.
-     *
-     * @return Sanitized short name.
-     */
-    [[nodiscard]] QString getCorrectedShortName() const;
-
-    /// @return Short identifier of the set.
-    [[nodiscard]] QString getShortName() const
-    {
-        return shortName;
-    }
-
-    /// @return Descriptive name of the set.
-    [[nodiscard]] QString getLongName() const
-    {
-        return longName;
-    }
-
-    /// @return Type/category string of the set.
-    [[nodiscard]] QString getSetType() const
-    {
-        return setType;
-    }
-
-    /// @return Release date of the set.
-    [[nodiscard]] QDate getReleaseDate() const
-    {
-        return releaseDate;
-    }
-
-    /// @return Priority level of the set.
-    [[nodiscard]] Priority getPriority() const
-    {
-        return priority;
-    }
-
-    /**
-     * @brief Sets the full name of the set.
-     * @param _longName New full name.
-     */
-    void setLongName(const QString &_longName)
-    {
-        longName = _longName;
-    }
-
-    /**
-     * @brief Sets the category/type of the set.
-     * @param _setType New category string.
-     */
-    void setSetType(const QString &_setType)
-    {
-        setType = _setType;
-    }
-
-    /**
-     * @brief Sets the release date of the set.
-     * @param _releaseDate New release date.
-     */
-    void setReleaseDate(const QDate &_releaseDate)
-    {
-        releaseDate = _releaseDate;
-    }
-
-    /**
-     * @brief Updates the priority of the set.
-     * @param _priority New priority value.
-     */
-
-    void setPriority(const Priority _priority)
-    {
-        priority = _priority;
-    }
-
-    /**
-     * @brief Loads state values (enabled, known, sort key) from configuration.
-     *
-     * Reads external configuration and applies it to this set.
-     */
-    void loadSetOptions();
-
-    /// @return The sort key assigned to this set.
-    [[nodiscard]] int getSortKey() const
-    {
-        return sortKey;
-    }
-
-    /**
-     * @brief Assigns a new sort key to this set.
-     * @param _sortKey The numeric key to use for sorting.
-     */
-    void setSortKey(unsigned int _sortKey);
-
-    /// @return True if the set is enabled.
-    [[nodiscard]] bool getEnabled() const
-    {
-        return enabled;
-    }
-
-    /**
-     * @brief Enables or disables the set.
-     * @param _enabled True to enable, false to disable.
-     */
-    void setEnabled(bool _enabled);
-
-    /// @return True if the set is considered known.
-    [[nodiscard]] bool getIsKnown() const
-    {
-        return isknown;
-    }
-
-    /**
-     * @brief Marks the set as known or unknown.
-     * @param _isknown True if known, false if unknown.
-     */
-    void setIsKnown(bool _isknown);
-
-    /**
-     * @brief Determines whether the set has incomplete metadata and should be ignored.
-     *
-     * @return True if the long name, type, and release date are all empty.
-     */
-    [[nodiscard]] bool getIsKnownIgnored() const
-    {
-        return longName.length() + setType.length() + releaseDate.toString().length() == 0;
-    }
-};
-
-#endif // COCKATRICE_CARD_SET_H
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
deleted file mode 100644
index 8d6aa7365..000000000
--- a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "card_set_list.h"
-
-class CardSetList::KeyCompareFunctor
-{
-public:
-    inline bool operator()(const CardSetPtr &a, const CardSetPtr &b) const
-    {
-        if (a.isNull() || b.isNull()) {
-            // qCWarning(CardInfoLog) << "SetList::KeyCompareFunctor a or b is null";
-            return false;
-        }
-
-        return a->getSortKey() < b->getSortKey();
-    }
-};
-
-void CardSetList::sortByKey()
-{
-    std::sort(begin(), end(), KeyCompareFunctor());
-}
-
-int CardSetList::getEnabledSetsNum()
-{
-    int num = 0;
-    for (int i = 0; i < size(); ++i) {
-        CardSetPtr set = at(i);
-        if (set && set->getEnabled()) {
-            ++num;
-        }
-    }
-    return num;
-}
-
-int CardSetList::getUnknownSetsNum()
-{
-    int num = 0;
-    for (int i = 0; i < size(); ++i) {
-        CardSetPtr set = at(i);
-        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
-            ++num;
-        }
-    }
-    return num;
-}
-
-QStringList CardSetList::getUnknownSetsNames()
-{
-    QStringList sets = QStringList();
-    for (int i = 0; i < size(); ++i) {
-        CardSetPtr set = at(i);
-        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
-            sets << set->getShortName();
-        }
-    }
-    return sets;
-}
-
-void CardSetList::enableAllUnknown()
-{
-    for (int i = 0; i < size(); ++i) {
-        CardSetPtr set = at(i);
-        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
-            set->setIsKnown(true);
-            set->setEnabled(true);
-        } else if (set && set->getIsKnownIgnored() && !set->getEnabled()) {
-            set->setEnabled(true);
-        }
-    }
-}
-
-void CardSetList::enableAll()
-{
-    for (int i = 0; i < size(); ++i) {
-        CardSetPtr set = at(i);
-
-        if (set == nullptr) {
-            // qCWarning(CardInfoLog) << "enabledAll has null";
-            continue;
-        }
-
-        if (!set->getIsKnownIgnored()) {
-            set->setIsKnown(true);
-        }
-
-        set->setEnabled(true);
-    }
-}
-
-void CardSetList::markAllAsKnown()
-{
-    for (int i = 0; i < size(); ++i) {
-        CardSetPtr set = at(i);
-        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
-            set->setIsKnown(true);
-            set->setEnabled(false);
-        } else if (set && set->getIsKnownIgnored() && !set->getEnabled()) {
-            set->setEnabled(true);
-        }
-    }
-}
-
-void CardSetList::guessSortKeys()
-{
-    defaultSort();
-    for (int i = 0; i < size(); ++i) {
-        CardSetPtr set = at(i);
-        if (set.isNull()) {
-            // qCWarning(CardInfoLog) << "guessSortKeys set is null";
-            continue;
-        }
-        set->setSortKey(i);
-    }
-}
-
-void CardSetList::defaultSort()
-{
-    std::sort(begin(), end(), [](const CardSetPtr &a, const CardSetPtr &b) {
-        // Sort by priority, then by release date, then by short name
-        if (a->getPriority() != b->getPriority()) {
-            return a->getPriority() < b->getPriority(); // lowest first
-        } else if (a->getReleaseDate() != b->getReleaseDate()) {
-            return a->getReleaseDate() > b->getReleaseDate(); // most recent first
-        } else {
-            return a->getShortName() < b->getShortName(); // alphabetically
-        }
-    });
-}
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_list.h b/libcockatrice_card/libcockatrice/card/set/card_set_list.h
deleted file mode 100644
index 81d605374..000000000
--- a/libcockatrice_card/libcockatrice/card/set/card_set_list.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef COCKATRICE_CARD_SET_LIST_H
-#define COCKATRICE_CARD_SET_LIST_H
-
-#include "card_set.h"
-
-#include <QList>
-
-/**
- * @class CardSetList
- * @ingroup CardSets
- *
- * @brief A list-like container for CardSet objects with extended management methods.
- *
- * Extends `QList<CardSetPtr>` by adding convenience operations for sorting,
- * enabling/disabling sets, and tracking known/unknown status. Unlike a plain
- * list, this container provides domain-specific functionality for handling
- * groups of sets in bulk.
- */
-class CardSetList : public QList<CardSetPtr>
-{
-private:
-    /**
-     * @class KeyCompareFunctor
-     * @brief Internal comparison functor for sorting by sort key.
-     *
-     * Used internally by `sortByKey()` to order sets consistently
-     * according to their assigned numeric sort keys.
-     */
-    class KeyCompareFunctor;
-
-public:
-    /**
-     * @brief Sorts the set list by each set’s assigned sort key.
-     *
-     * Uses KeyCompareFunctor internally. If two sets share the
-     * same sort key, their relative order is unspecified.
-     */
-    void sortByKey();
-
-    /**
-     * @brief Reassigns sort keys based on the current order.
-     *
-     * Calls defaultSort() and then assigns sequential sort keys
-     * to all sets according to their resulting positions, replacing
-     * any existing sort keys to ensure consistent ordering.
-     */
-    void guessSortKeys();
-
-    /**
-     * @brief Enables all sets that are unknown or ignored.
-     *
-     * Sets that are not marked as known and not ignored are marked as known
-     * and enabled. Ignored-known sets are also enabled, but remain ignored.
-     */
-    void enableAllUnknown();
-
-    /**
-     * @brief Enables all sets in the list.
-     *
-     * Equivalent to calling `setEnabled(true)` on each entry.
-     */
-    void enableAll();
-
-    /**
-     * @brief Marks all sets as known and adjusts their enabled state.
-     *
-     * Unknown, non-ignored sets become known and disabled.
-     * Ignored-known sets are enabled if they were previously disabled.
-     */
-    void markAllAsKnown();
-
-    /**
-     * @brief Counts the number of sets that are currently enabled.
-     *
-     * @return Integer count of enabled sets.
-     */
-    int getEnabledSetsNum();
-
-    /**
-     * @brief Counts the number of sets that are currently unknown.
-     *
-     * @return Integer count of unknown sets.
-     */
-    int getUnknownSetsNum();
-
-    /**
-     * @brief Collects the short names of all sets marked as unknown.
-     *
-     * @return A list of unknown set names.
-     */
-    QStringList getUnknownSetsNames();
-
-    /**
-     * @brief Sorts the list by default rules.
-     *
-     * Orders sets first by priority (ascending), then by release date
-     * (most recent first), and finally alphabetically by short name.
-     */
-    void defaultSort();
-};
-
-#endif // COCKATRICE_CARD_SET_LIST_H
diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt
deleted file mode 100644
index 5ccdb5f66..000000000
--- a/libcockatrice_deck_list/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS
-    libcockatrice/deck_list/tree/abstract_deck_list_card_node.h
-    libcockatrice/deck_list/tree/abstract_deck_list_node.h
-    libcockatrice/deck_list/tree/deck_list_card_node.h
-    libcockatrice/deck_list/tree/inner_deck_list_node.h
-    libcockatrice/deck_list/deck_list.h
-    libcockatrice/deck_list/deck_list_history_manager.h
-    libcockatrice/deck_list/deck_list_node_tree.h
-    libcockatrice/deck_list/deck_list_memento.h
-    libcockatrice/deck_list/sideboard_plan.h
-)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(
-  libcockatrice_deck_list STATIC
-  ${MOC_SOURCES}
-  libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp
-  libcockatrice/deck_list/tree/abstract_deck_list_node.cpp
-  libcockatrice/deck_list/tree/deck_list_card_node.cpp
-  libcockatrice/deck_list/tree/inner_deck_list_node.cpp
-  libcockatrice/deck_list/deck_list.cpp
-  libcockatrice/deck_list/deck_list_history_manager.cpp
-  libcockatrice/deck_list/deck_list_node_tree.cpp
-  libcockatrice/deck_list/sideboard_plan.cpp
-)
-
-add_dependencies(libcockatrice_deck_list libcockatrice_protocol)
-
-target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_utility ${QT_CORE_MODULE})
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
deleted file mode 100644
index e3e7b41c0..000000000
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-#include "deck_list.h"
-
-#include "deck_list_memento.h"
-#include "tree/abstract_deck_list_node.h"
-#include "tree/deck_list_card_node.h"
-#include "tree/inner_deck_list_node.h"
-
-#include <QCryptographicHash>
-#include <QDebug>
-#include <QFile>
-#include <QRegularExpression>
-#include <QSet>
-#include <QTextStream>
-#include <algorithm>
-
-#if QT_VERSION < 0x050600
-// qHash on QRegularExpression was added in 5.6, FIX IT
-uint qHash(const QRegularExpression &key, uint seed) noexcept
-{
-    return qHash(key.pattern(), seed); // call qHash on pattern QString instead
-}
-#endif
-
-static const QString CURRENT_SIDEBOARD_PLAN_KEY = "";
-
-bool DeckList::Metadata::isEmpty() const
-{
-    return name.isEmpty() && comments.isEmpty() && bannerCard.isEmpty() && tags.isEmpty();
-}
-
-DeckList::DeckList()
-{
-}
-
-DeckList::DeckList(const QString &nativeString)
-{
-    loadFromString_Native(nativeString);
-}
-
-DeckList::DeckList(const Metadata &metadata,
-                   const DecklistNodeTree &tree,
-                   const QMap<QString, SideboardPlan> &sideboardPlans)
-    : metadata(metadata), sideboardPlans(sideboardPlans), tree(tree)
-{
-}
-
-QList<MoveCard_ToZone> DeckList::getCurrentSideboardPlan() const
-{
-    if (!sideboardPlans.contains(CURRENT_SIDEBOARD_PLAN_KEY)) {
-        return {};
-    }
-
-    return sideboardPlans.value(CURRENT_SIDEBOARD_PLAN_KEY).getMoveList();
-}
-
-void DeckList::setCurrentSideboardPlan(const QList<MoveCard_ToZone> &plan)
-{
-    sideboardPlans[CURRENT_SIDEBOARD_PLAN_KEY].setMoveList(plan);
-}
-
-bool DeckList::readElement(QXmlStreamReader *xml)
-{
-    const QString childName = xml->name().toString();
-    if (xml->isStartElement()) {
-        if (childName == "lastLoadedTimestamp") {
-            metadata.lastLoadedTimestamp = xml->readElementText();
-        } else if (childName == "deckname") {
-            metadata.name = xml->readElementText();
-        } else if (childName == "format") {
-            metadata.gameFormat = xml->readElementText();
-        } else if (childName == "comments") {
-            metadata.comments = xml->readElementText();
-        } else if (childName == "bannerCard") {
-            QString providerId = xml->attributes().value("providerId").toString();
-            QString cardName = xml->readElementText();
-            metadata.bannerCard = {cardName, providerId};
-        } else if (childName == "tags") {
-            metadata.tags.clear(); // Clear existing tags
-            while (xml->readNextStartElement()) {
-                if (xml->name().toString() == "tag") {
-                    metadata.tags.append(xml->readElementText());
-                }
-            }
-        } else if (childName == "zone") {
-            tree.readZoneElement(xml);
-        } else if (childName == "sideboard_plan") {
-            SideboardPlan newSideboardPlan;
-            if (newSideboardPlan.readElement(xml)) {
-                sideboardPlans.insert(newSideboardPlan.getName(), newSideboardPlan);
-            }
-        }
-    } else if (xml->isEndElement() && (childName == "cockatrice_deck")) {
-        return false;
-    }
-    return true;
-}
-
-static void writeMetadata(QXmlStreamWriter *xml, const DeckList::Metadata &metadata)
-{
-    xml->writeTextElement("lastLoadedTimestamp", metadata.lastLoadedTimestamp);
-    xml->writeTextElement("deckname", metadata.name);
-    xml->writeTextElement("format", metadata.gameFormat);
-    xml->writeStartElement("bannerCard");
-    xml->writeAttribute("providerId", metadata.bannerCard.providerId);
-    xml->writeCharacters(metadata.bannerCard.name);
-    xml->writeEndElement();
-    xml->writeTextElement("comments", metadata.comments);
-
-    // Write tags
-    xml->writeStartElement("tags");
-    for (const QString &tag : metadata.tags) {
-        xml->writeTextElement("tag", tag);
-    }
-    xml->writeEndElement();
-}
-
-void DeckList::write(QXmlStreamWriter *xml) const
-{
-    xml->writeStartElement("cockatrice_deck");
-    xml->writeAttribute("version", "1");
-
-    writeMetadata(xml, metadata);
-
-    // Write zones
-    tree.write(xml);
-
-    // Write sideboard plans
-    for (auto &sideboardPlan : sideboardPlans.values()) {
-        sideboardPlan.write(xml);
-    }
-
-    xml->writeEndElement(); // Close "cockatrice_deck"
-}
-
-bool DeckList::loadFromXml(QXmlStreamReader *xml)
-{
-    if (xml->error()) {
-        qDebug() << "Error loading deck from xml: " << xml->errorString();
-        return false;
-    }
-
-    cleanList();
-    while (!xml->atEnd()) {
-        xml->readNext();
-        if (xml->isStartElement()) {
-            if (xml->name().toString() != "cockatrice_deck")
-                return false;
-            while (!xml->atEnd()) {
-                xml->readNext();
-                if (!readElement(xml))
-                    break;
-            }
-        }
-    }
-    refreshDeckHash();
-    if (xml->error()) {
-        qDebug() << "Error loading deck from xml: " << xml->errorString();
-        return false;
-    }
-    return true;
-}
-
-bool DeckList::loadFromString_Native(const QString &nativeString)
-{
-    QXmlStreamReader xml(nativeString);
-    return loadFromXml(&xml);
-}
-
-QString DeckList::writeToString_Native() const
-{
-    QString result;
-    QXmlStreamWriter xml(&result);
-    xml.writeStartDocument();
-    write(&xml);
-    xml.writeEndDocument();
-    return result;
-}
-
-bool DeckList::loadFromFile_Native(QIODevice *device)
-{
-    QXmlStreamReader xml(device);
-    return loadFromXml(&xml);
-}
-
-bool DeckList::saveToFile_Native(QIODevice *device) const
-{
-    QXmlStreamWriter xml(device);
-    xml.setAutoFormatting(true);
-    xml.writeStartDocument();
-
-    write(&xml);
-
-    xml.writeEndDocument();
-    return true;
-}
-
-/**
- * Clears the decklist and loads in a new deck from text
- *
- * @param in The text to load
- * @param preserveMetadata If true, don't clear the existing metadata
- * @param cardNameNormalizer Function that takes the parsed card name string in the text and
- * @return False if the input was empty, true otherwise.
- */
-bool DeckList::loadFromStream_Plain(QTextStream &in,
-                                    bool preserveMetadata,
-                                    const std::function<QString(const QString &)> &cardNameNormalizer)
-{
-    const QRegularExpression reCardLine(R"(^\s*[\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption);
-    const QRegularExpression reEmpty("^\\s*$");
-    const QRegularExpression reComment(R"([\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption);
-    const QRegularExpression reSBMark("^\\s*sb:\\s*(.+)", QRegularExpression::CaseInsensitiveOption);
-    const QRegularExpression reSBComment("^sideboard\\b.*$", QRegularExpression::CaseInsensitiveOption);
-    const QRegularExpression reDeckComment("^((main)?deck(list)?|mainboard)\\b",
-                                           QRegularExpression::CaseInsensitiveOption);
-
-    // Regex for advanced card parsing
-    const QRegularExpression reMultiplier(R"(^[xX\(\[]*(\d+)[xX\*\)\]]* ?(.+))");
-
-    // Regex for extracting set code and collector number with attached symbols
-    const QRegularExpression reHyphenFormat(R"(\((\w{3,})\)\s+(\w{3,})-(\d+[^\w\s]*))");
-    const QRegularExpression reRegularFormat(R"(\((\w{3,})\)\s+(\d+[^\w\s]*))");
-
-    cleanList(preserveMetadata);
-
-    auto inputs = in.readAll().trimmed().split('\n');
-    auto max_line = inputs.size();
-
-    // Start at the first empty line before the first card line
-    auto deckStart = inputs.indexOf(reCardLine);
-    if (deckStart == -1) {
-        if (inputs.indexOf(reComment) == -1) {
-            return false; // Input is empty
-        }
-        deckStart = max_line;
-    } else {
-        deckStart = inputs.lastIndexOf(reEmpty, deckStart);
-        if (deckStart == -1) {
-            deckStart = 0;
-        }
-    }
-
-    // find sideboard position, if marks are used this won't be needed
-    int sBStart = -1;
-    if (inputs.indexOf(reSBMark, deckStart) == -1) {
-        sBStart = inputs.indexOf(reSBComment, deckStart);
-        if (sBStart == -1) {
-            sBStart = inputs.indexOf(reEmpty, deckStart + 1);
-            if (sBStart == -1) {
-                sBStart = max_line;
-            }
-            auto nextCard = inputs.indexOf(reCardLine, sBStart + 1);
-            if (inputs.indexOf(reEmpty, nextCard + 1) != -1) {
-                sBStart = max_line;
-            }
-        }
-    }
-
-    int index = 0;
-    QRegularExpressionMatch match;
-
-    // Parse name and comments
-    while (index < deckStart) {
-        const auto &current = inputs.at(index++);
-        if (!current.contains(reEmpty)) {
-            match = reComment.match(current);
-            metadata.name = match.captured();
-            break;
-        }
-    }
-    while (index < deckStart) {
-        const auto &current = inputs.at(index++);
-        if (!current.contains(reEmpty)) {
-            match = reComment.match(current);
-            metadata.comments += match.captured() + '\n';
-        }
-    }
-    metadata.comments.chop(1);
-
-    // Discard empty lines
-    while (index < max_line && inputs.at(index).contains(reEmpty)) {
-        ++index;
-    }
-
-    // Discard line if it starts with deck or mainboard, all cards until the sideboard starts are in the mainboard
-    if (inputs.at(index).contains(reDeckComment)) {
-        ++index;
-    }
-
-    // Parse decklist
-    for (; index < max_line; ++index) {
-        // check if line is a card
-        match = reCardLine.match(inputs.at(index));
-        if (!match.hasMatch())
-            continue;
-
-        QString cardName = match.captured().simplified();
-        bool sideboard = false;
-
-        // Sideboard detection
-        if (sBStart < 0) {
-            match = reSBMark.match(cardName);
-            if (match.hasMatch()) {
-                sideboard = true;
-                cardName = match.captured(1);
-            }
-        } else {
-            if (index == sBStart)
-                continue;
-            sideboard = index > sBStart;
-        }
-
-        // Extract set code, collector number, and foil
-        QString setCode;
-        QString collectorNumber;
-        bool isFoil = false;
-
-        // Check for foil status at the end of the card name
-        if (cardName.endsWith("*F*", Qt::CaseInsensitive)) {
-            isFoil = true;
-            cardName.chop(3); // Remove the "*F*" from the card name
-        }
-        Q_UNUSED(isFoil);
-
-        // Attempt to match the hyphen-separated format (PLST-2094)
-        match = reHyphenFormat.match(cardName);
-        if (match.hasMatch()) {
-            setCode = match.captured(2).toUpper();
-            collectorNumber = match.captured(3);
-            cardName = cardName.left(match.capturedStart()).trimmed();
-        } else {
-            // Attempt to match the regular format (PLST) 2094
-            match = reRegularFormat.match(cardName);
-            if (match.hasMatch()) {
-                setCode = match.captured(1).toUpper();
-                collectorNumber = match.captured(2);
-                cardName = cardName.left(match.capturedStart()).trimmed();
-            }
-        }
-
-        // check if a specific amount is mentioned
-        int amount = 1;
-        match = reMultiplier.match(cardName);
-        if (match.hasMatch()) {
-            amount = match.captured(1).toInt();
-            cardName = match.captured(2);
-        }
-
-        // Normalize the card name
-        cardName = cardNameNormalizer(cardName);
-
-        // Determine the zone (mainboard/sideboard)
-        QString zoneName = sideboard ? DECK_ZONE_SIDE : DECK_ZONE_MAIN;
-
-        // make new entry in decklist
-        tree.addCard(cardName, amount, zoneName, -1, setCode, collectorNumber);
-    }
-
-    refreshDeckHash();
-    return true;
-}
-
-bool DeckList::loadFromFile_Plain(QIODevice *device, const std::function<QString(const QString &)> &cardNameNormalizer)
-{
-    QTextStream in(device);
-    return loadFromStream_Plain(in, false, cardNameNormalizer);
-}
-
-bool DeckList::saveToStream_Plain(QTextStream &stream, bool prefixSideboardCards, bool slashTappedOutSplitCards) const
-{
-    auto writeToStream = [&stream, prefixSideboardCards, slashTappedOutSplitCards](const auto node, const auto card) {
-        if (prefixSideboardCards && node->getName() == DECK_ZONE_SIDE) {
-            stream << "SB: ";
-        }
-        if (!slashTappedOutSplitCards) {
-            stream << QString("%1 %2\n").arg(card->getNumber()).arg(card->getName());
-        } else {
-            stream << QString("%1 %2\n").arg(card->getNumber()).arg(card->getName().replace("//", "/"));
-        }
-    };
-
-    forEachCard(writeToStream);
-    return true;
-}
-
-bool DeckList::saveToFile_Plain(QIODevice *device, bool prefixSideboardCards, bool slashTappedOutSplitCards) const
-{
-    QTextStream out(device);
-    return saveToStream_Plain(out, prefixSideboardCards, slashTappedOutSplitCards);
-}
-
-QString DeckList::writeToString_Plain(bool prefixSideboardCards, bool slashTappedOutSplitCards) const
-{
-    QString result;
-    QTextStream out(&result);
-    saveToStream_Plain(out, prefixSideboardCards, slashTappedOutSplitCards);
-    return result;
-}
-
-/**
- * Clears all cards and other data from the decklist
- *
- * @param preserveMetadata If true, only clear the cards
- */
-void DeckList::cleanList(bool preserveMetadata)
-{
-    tree.clear();
-    if (!preserveMetadata) {
-        metadata = {};
-    }
-    refreshDeckHash();
-}
-
-QStringList DeckList::getCardList(const QSet<QString> &restrictToZones) const
-{
-    auto nodes = tree.getCardNodes(restrictToZones);
-
-    QStringList result;
-    std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(result), [](auto node) { return node->getName(); });
-
-    return result;
-}
-
-QList<CardRef> DeckList::getCardRefList(const QSet<QString> &restrictToZones) const
-{
-    auto nodes = tree.getCardNodes(restrictToZones);
-
-    QList<CardRef> result;
-    std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(result),
-                   [](auto node) { return node->toCardRef(); });
-
-    return result;
-}
-
-QList<const DecklistCardNode *> DeckList::getCardNodes(const QSet<QString> &restrictToZones) const
-{
-    return tree.getCardNodes(restrictToZones);
-}
-
-QList<const InnerDecklistNode *> DeckList::getZoneNodes(const QSet<QString> &restrictToZones) const
-{
-    return tree.getZoneNodes(restrictToZones);
-}
-
-int DeckList::getSideboardSize() const
-{
-    auto cards = tree.getCardNodes({DECK_ZONE_SIDE});
-
-    int size = 0;
-    for (auto card : cards) {
-        size += card->getNumber();
-    }
-
-    return size;
-}
-
-DecklistCardNode *DeckList::addCard(const QString &cardName,
-                                    const QString &zoneName,
-                                    int position,
-                                    const QString &cardSetName,
-                                    const QString &cardSetCollectorNumber,
-                                    const QString &cardProviderId,
-                                    bool formatLegal)
-{
-    auto node =
-        tree.addCard(cardName, 1, zoneName, position, cardSetName, cardSetCollectorNumber, cardProviderId, formatLegal);
-    refreshDeckHash();
-    return node;
-}
-
-/**
- * Gets the deck hash.
- * The hash is computed on the first call to this method, and is cached until the decklist is modified.
- *
- * @return The deck hash
- */
-QString DeckList::getDeckHash() const
-{
-    if (!cachedDeckHash.isEmpty()) {
-        return cachedDeckHash;
-    }
-
-    cachedDeckHash = tree.computeDeckHash();
-    return cachedDeckHash;
-}
-
-/**
- * Invalidates the cached deckHash.
- */
-void DeckList::refreshDeckHash()
-{
-    cachedDeckHash = QString();
-}
-
-/**
- * Calls a given function on each card in the deck.
- */
-void DeckList::forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func) const
-{
-    tree.forEachCard(func);
-}
-
-DeckListMemento DeckList::createMemento(const QString &reason) const
-{
-    return DeckListMemento(writeToString_Native(), reason);
-}
-
-void DeckList::restoreMemento(const DeckListMemento &m)
-{
-    cleanList();
-    loadFromString_Native(m.getMemento());
-}
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
deleted file mode 100644
index a96adeb38..000000000
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * @file deck_list.h
- * @brief Defines the DeckList class, which manages a full
- *        deck structure including cards, zones, sideboard plans, and
- *        serialization to/from multiple formats. This is a logic class which
- *        does not care about Qt or user facing views.
- *        See @c DeckListModel for the actual Qt Model to be used for views
- */
-
-#ifndef DECKLIST_H
-#define DECKLIST_H
-
-#include "deck_list_memento.h"
-#include "deck_list_node_tree.h"
-#include "sideboard_plan.h"
-#include "tree/inner_deck_list_node.h"
-
-#include <QMap>
-#include <QVector>
-#include <QtCore/QXmlStreamReader>
-#include <libcockatrice/utility/card_ref.h>
-
-class AbstractDecklistNode;
-class DecklistCardNode;
-class CardDatabase;
-class QIODevice;
-class QTextStream;
-class InnerDecklistNode;
-
-/**
- * @class DeckList
- * @ingroup Decks
- * @brief Represents a complete deck, including metadata, zones, cards,
- *        and sideboard plans.
- *
- * A DeckList is a wrapper around an `InnerDecklistNode` tree,
- * enriched with metadata like deck name, comments, tags, banner card,
- * and multiple sideboard plans.
- *
- * ### Core responsibilities:
- * - Store and manage the root node tree (zones → groups → cards).
- * - Provide deck-level metadata (name, comments, tags, banner).
- * - Support multiple sideboard plans (meta-game strategies).
- * - Provide import/export in multiple formats:
- *   - Cockatrice native XML format.
- *   - Plain-text list format.
- * - Provide hashing for deck identity (deck hash).
- *
- * ### Ownership:
- * - Owns the `DecklistNodeTree`.
- * - Owns `SideboardPlan` instances stored in `sideboardPlans`.
- *
- * ### Example workflow:
- * ```
- * DeckList deck;
- * deck.setName("Mono Red Aggro");
- * deck.addCard("Lightning Bolt", "main");
- * deck.addTag("Aggro");
- * deck.saveToFile_Native(device);
- * ```
- */
-class DeckList
-{
-public:
-    struct Metadata
-    {
-        QString name;                ///< User-defined deck name.
-        QString comments;            ///< Free-form comments or notes.
-        QString gameFormat;          ///< The name of the game format this deck contains legal cards for
-        CardRef bannerCard;          ///< Optional representative card for the deck.
-        QStringList tags;            ///< User-defined tags for deck classification.
-        QString lastLoadedTimestamp; ///< Timestamp string of last load.
-
-        /**
-         * @brief Checks if all values (except for lastLoadedTimestamp) in the metadata is empty.
-         */
-        bool isEmpty() const;
-    };
-
-private:
-    Metadata metadata;                           ///< Deck metadata that is stored in the deck file
-    QMap<QString, SideboardPlan> sideboardPlans; ///< Named sideboard plans.
-    DecklistNodeTree tree;                       ///< The deck tree (zones + cards).
-
-    /**
-     * @brief Cached deck hash, recalculated lazily.
-     * An empty string indicates the cache is invalid.
-     */
-    mutable QString cachedDeckHash;
-
-public:
-    /// @name Metadata setters
-    ///@{
-    void setName(const QString &_name = QString())
-    {
-        metadata.name = _name;
-    }
-    void setComments(const QString &_comments = QString())
-    {
-        metadata.comments = _comments;
-    }
-    void setTags(const QStringList &_tags = QStringList())
-    {
-        metadata.tags = _tags;
-    }
-    void addTag(const QString &_tag)
-    {
-        metadata.tags.append(_tag);
-    }
-    void clearTags()
-    {
-        metadata.tags.clear();
-    }
-    void setBannerCard(const CardRef &_bannerCard = {})
-    {
-        metadata.bannerCard = _bannerCard;
-    }
-    void setLastLoadedTimestamp(const QString &_lastLoadedTimestamp = QString())
-    {
-        metadata.lastLoadedTimestamp = _lastLoadedTimestamp;
-    }
-    void setGameFormat(const QString &_gameFormat = QString())
-    {
-        metadata.gameFormat = _gameFormat;
-    }
-    ///@}
-
-    /// @brief Construct an empty deck.
-    explicit DeckList();
-    /// @brief Construct from a serialized native-format string.
-    explicit DeckList(const QString &nativeString);
-    /// @brief Construct from components
-    DeckList(const Metadata &metadata,
-             const DecklistNodeTree &tree,
-             const QMap<QString, SideboardPlan> &sideboardPlans = {});
-
-    /**
-     * @brief Gets a pointer to the underlying node tree.
-     * Note: DO NOT call this method unless the object needs to have access to the underlying model.
-     * For now, only the DeckListModel should be calling this.
-     */
-    DecklistNodeTree *getTree()
-    {
-        return &tree;
-    }
-
-    /// @name Metadata getters
-    /// The individual metadata getters still exist for backwards compatibility.
-    ///@{
-    //! \todo Figure out when we can remove them.
-    const Metadata &getMetadata() const
-    {
-        return metadata;
-    }
-    QString getName() const
-    {
-        return metadata.name;
-    }
-    QString getComments() const
-    {
-        return metadata.comments;
-    }
-    QStringList getTags() const
-    {
-        return metadata.tags;
-    }
-    CardRef getBannerCard() const
-    {
-        return metadata.bannerCard;
-    }
-    QString getLastLoadedTimestamp() const
-    {
-        return metadata.lastLoadedTimestamp;
-    }
-    QString getGameFormat() const
-    {
-        return metadata.gameFormat;
-    }
-    ///@}
-
-    bool isBlankDeck() const
-    {
-        return metadata.isEmpty() && getCardList().isEmpty();
-    }
-
-    /// @name Sideboard plans
-    ///@{
-    QList<MoveCard_ToZone> getCurrentSideboardPlan() const;
-    void setCurrentSideboardPlan(const QList<MoveCard_ToZone> &plan);
-    const QMap<QString, SideboardPlan> &getSideboardPlans() const
-    {
-        return sideboardPlans;
-    }
-    ///@}
-
-    /// @name Serialization (XML)
-    ///@{
-    bool readElement(QXmlStreamReader *xml);
-    void write(QXmlStreamWriter *xml) const;
-    bool loadFromXml(QXmlStreamReader *xml);
-    bool loadFromString_Native(const QString &nativeString);
-    QString writeToString_Native() const;
-    bool loadFromFile_Native(QIODevice *device);
-    bool saveToFile_Native(QIODevice *device) const;
-    ///@}
-
-    /// @name Serialization (Plain text)
-    ///@{
-    bool loadFromStream_Plain(QTextStream &stream,
-                              bool preserveMetadata,
-                              const std::function<QString(const QString &)> &cardNameNormalizer);
-    bool loadFromFile_Plain(QIODevice *device, const std::function<QString(const QString &)> &cardNameNormalizer);
-    bool saveToStream_Plain(QTextStream &stream, bool prefixSideboardCards, bool slashTappedOutSplitCards) const;
-    bool
-    saveToFile_Plain(QIODevice *device, bool prefixSideboardCards = true, bool slashTappedOutSplitCards = false) const;
-    QString writeToString_Plain(bool prefixSideboardCards = true, bool slashTappedOutSplitCards = false) const;
-    ///@}
-
-    /// @name Deck manipulation
-    ///@{
-    void cleanList(bool preserveMetadata = false);
-    bool isEmpty() const
-    {
-        return tree.isEmpty() && metadata.isEmpty() && sideboardPlans.isEmpty();
-    }
-    QStringList getCardList(const QSet<QString> &restrictToZones = {}) const;
-    QList<CardRef> getCardRefList(const QSet<QString> &restrictToZones = {}) const;
-    QList<const DecklistCardNode *> getCardNodes(const QSet<QString> &restrictToZones = {}) const;
-    QList<const InnerDecklistNode *> getZoneNodes(const QSet<QString> &restrictToZones = {}) const;
-    int getSideboardSize() const;
-
-    DecklistCardNode *addCard(const QString &cardName,
-                              const QString &zoneName,
-                              int position = -1,
-                              const QString &cardSetName = QString(),
-                              const QString &cardSetCollectorNumber = QString(),
-                              const QString &cardProviderId = QString(),
-                              const bool formatLegal = true);
-    ///@}
-
-    /// @name Deck identity
-    ///@{
-    QString getDeckHash() const;
-    void refreshDeckHash();
-    ///@}
-
-    /**
-     * @brief Apply a function to every card in the deck tree.
-     *
-     * @param func Function taking (zone node, card node).
-     */
-    void forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func) const;
-    DeckListMemento createMemento(const QString &reason) const;
-    void restoreMemento(const DeckListMemento &m);
-};
-
-#endif
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
deleted file mode 100644
index 83c9cc0bb..000000000
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "deck_list_history_manager.h"
-
-void DeckListHistoryManager::save(const DeckListMemento &memento)
-{
-    undoStack.push(memento);
-    redoStack.clear();
-    emit undoRedoStateChanged();
-}
-
-void DeckListHistoryManager::clear()
-{
-    undoStack.clear();
-    redoStack.clear();
-    emit undoRedoStateChanged();
-}
-
-void DeckListHistoryManager::undo(DeckList *deck)
-{
-    if (undoStack.isEmpty())
-        return;
-
-    // Peek at the memento we are going to restore
-    const DeckListMemento &mementoToRestore = undoStack.top();
-
-    // Save current state for redo
-    DeckListMemento currentState = deck->createMemento(mementoToRestore.getReason());
-    redoStack.push(currentState);
-
-    // Pop the last state from undo stack and restore it
-    DeckListMemento memento = undoStack.pop();
-    deck->restoreMemento(memento);
-
-    emit undoRedoStateChanged();
-}
-
-void DeckListHistoryManager::redo(DeckList *deck)
-{
-    if (redoStack.isEmpty())
-        return;
-
-    // Peek at the memento we are going to restore
-    const DeckListMemento &mementoToRestore = redoStack.top();
-
-    // Save current state for undo
-    DeckListMemento currentState = deck->createMemento(mementoToRestore.getReason());
-    undoStack.push(currentState);
-
-    // Pop the next state from redo stack and restore it
-    DeckListMemento memento = redoStack.pop();
-    deck->restoreMemento(memento);
-
-    emit undoRedoStateChanged();
-}
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h
deleted file mode 100644
index e6bd27e2d..000000000
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef COCKATRICE_DECK_LIST_HISTORY_MANAGER_H
-#define COCKATRICE_DECK_LIST_HISTORY_MANAGER_H
-
-#include "deck_list.h"
-#include "deck_list_memento.h"
-
-#include <QObject>
-#include <QStack>
-
-class DeckListHistoryManager : public QObject
-{
-    Q_OBJECT
-
-signals:
-    void undoRedoStateChanged();
-
-public:
-    explicit DeckListHistoryManager(QObject *parent = nullptr) : QObject(parent)
-    {
-    }
-
-    void save(const DeckListMemento &memento);
-
-    void clear();
-
-    [[nodiscard]] bool canUndo() const
-    {
-        return !undoStack.isEmpty();
-    }
-
-    [[nodiscard]] bool canRedo() const
-    {
-        return !redoStack.isEmpty();
-    }
-
-    void undo(DeckList *deck);
-
-    void redo(DeckList *deck);
-
-    [[nodiscard]] QStack<DeckListMemento> getRedoStack() const
-    {
-        return redoStack;
-    }
-    [[nodiscard]] QStack<DeckListMemento> getUndoStack() const
-    {
-        return undoStack;
-    }
-
-private:
-    QStack<DeckListMemento> undoStack;
-    QStack<DeckListMemento> redoStack;
-};
-
-#endif // COCKATRICE_DECK_LIST_HISTORY_MANAGER_H
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_memento.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_memento.h
deleted file mode 100644
index 6ddf430c5..000000000
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_memento.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef COCKATRICE_DECK_LIST_MEMENTO_H
-#define COCKATRICE_DECK_LIST_MEMENTO_H
-#include <QString>
-
-class DeckListMemento
-{
-public:
-    DeckListMemento() = default;
-    explicit DeckListMemento(const QString &memento, const QString &reason = QString())
-        : memento(memento), reason(reason)
-    {
-    }
-
-    [[nodiscard]] QString getMemento() const
-    {
-        return memento;
-    }
-    [[nodiscard]] QString getReason() const
-    {
-        return reason;
-    }
-
-private:
-    QString memento;
-    QString reason;
-};
-
-#endif // COCKATRICE_DECK_LIST_MEMENTO_H
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
deleted file mode 100644
index 644e0851a..000000000
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-#include "deck_list_node_tree.h"
-
-#include "tree/deck_list_card_node.h"
-
-#include <QCryptographicHash>
-#include <QSet>
-
-DecklistNodeTree::DecklistNodeTree() : root(new InnerDecklistNode())
-{
-}
-
-DecklistNodeTree::DecklistNodeTree(const DecklistNodeTree &other) : root(new InnerDecklistNode(other.root))
-{
-}
-
-DecklistNodeTree &DecklistNodeTree::operator=(const DecklistNodeTree &other)
-{
-    if (this != &other) {
-        delete root;
-        root = new InnerDecklistNode(other.root);
-    }
-    return *this;
-}
-
-DecklistNodeTree::~DecklistNodeTree()
-{
-    delete root;
-}
-
-bool DecklistNodeTree::isEmpty() const
-{
-    return root->isEmpty();
-}
-
-void DecklistNodeTree::clear()
-{
-    root->clearTree();
-}
-
-QList<const DecklistCardNode *> DecklistNodeTree::getCardNodes(const QSet<QString> &restrictToZones) const
-{
-    QList<const DecklistCardNode *> result;
-
-    for (auto *zoneNode : getZoneNodes(restrictToZones)) {
-        for (auto *cardNode : *zoneNode) {
-            auto *cardCardNode = dynamic_cast<DecklistCardNode *>(cardNode);
-            if (cardCardNode) {
-                result.append(cardCardNode);
-            }
-        }
-    }
-
-    return result;
-}
-
-QList<const InnerDecklistNode *> DecklistNodeTree::getZoneNodes(const QSet<QString> &restrictToZones) const
-{
-    QList<const InnerDecklistNode *> zones;
-    for (auto *node : *root) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(node);
-        if (!currentZone)
-            continue;
-        if (!restrictToZones.isEmpty() && !restrictToZones.contains(currentZone->getName())) {
-            continue;
-        }
-        zones.append(currentZone);
-    }
-
-    return zones;
-}
-
-QString DecklistNodeTree::computeDeckHash() const
-{
-    auto mainDeckNodes = getCardNodes({DECK_ZONE_MAIN});
-    auto sideDeckNodes = getCardNodes({DECK_ZONE_SIDE});
-
-    static auto nodesToCardList = [](const QList<const DecklistCardNode *> &nodes, const QString &prefix = {}) {
-        QStringList result;
-        for (auto node : nodes) {
-            for (int i = 0; i < node->getNumber(); ++i) {
-                result.append(prefix + node->getName().toLower());
-            }
-        }
-        return result;
-    };
-
-    QStringList cardList = nodesToCardList(mainDeckNodes) + nodesToCardList(sideDeckNodes, "SB:");
-
-    cardList.sort();
-    QByteArray deckHashArray = QCryptographicHash::hash(cardList.join(";").toUtf8(), QCryptographicHash::Sha1);
-    quint64 number = (((quint64)(unsigned char)deckHashArray[0]) << 32) +
-                     (((quint64)(unsigned char)deckHashArray[1]) << 24) +
-                     (((quint64)(unsigned char)deckHashArray[2] << 16)) +
-                     (((quint64)(unsigned char)deckHashArray[3]) << 8) + (quint64)(unsigned char)deckHashArray[4];
-    return QString::number(number, 32).rightJustified(8, '0');
-}
-
-void DecklistNodeTree::write(QXmlStreamWriter *xml) const
-{
-    for (int i = 0; i < root->size(); i++) {
-        root->at(i)->writeElement(xml);
-    }
-}
-
-void DecklistNodeTree::readZoneElement(QXmlStreamReader *xml)
-{
-    QString zoneName = xml->attributes().value("name").toString();
-    InnerDecklistNode *newZone = getZoneObjFromName(zoneName);
-    newZone->readElement(xml);
-}
-
-DecklistCardNode *DecklistNodeTree::addCard(const QString &cardName,
-                                            int amount,
-                                            const QString &zoneName,
-                                            int position,
-                                            const QString &cardSetName,
-                                            const QString &cardSetCollectorNumber,
-                                            const QString &cardProviderId,
-                                            const bool formatLegal)
-{
-    auto *zoneNode = getZoneObjFromName(zoneName);
-    auto *node = new DecklistCardNode(cardName, amount, zoneNode, position, cardSetName, cardSetCollectorNumber,
-                                      cardProviderId, formatLegal);
-    return node;
-}
-
-bool DecklistNodeTree::deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode)
-{
-    if (node == root) {
-        return true;
-    }
-
-    if (rootNode == nullptr) {
-        rootNode = root;
-    }
-
-    int index = rootNode->indexOf(node);
-    if (index != -1) {
-        delete rootNode->takeAt(index);
-
-        if (rootNode->empty()) {
-            deleteNode(rootNode, rootNode->getParent());
-        }
-
-        return true;
-    }
-
-    for (int i = 0; i < rootNode->size(); i++) {
-        auto *inner = dynamic_cast<InnerDecklistNode *>(rootNode->at(i));
-        if (inner) {
-            if (deleteNode(node, inner)) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-void DecklistNodeTree::forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func) const
-{
-    // Support for this is only possible if the internal structure
-    // doesn't get more complicated.
-    for (int i = 0; i < root->size(); i++) {
-        InnerDecklistNode *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
-        for (int j = 0; j < node->size(); j++) {
-            DecklistCardNode *card = dynamic_cast<DecklistCardNode *>(node->at(j));
-            func(node, card);
-        }
-    }
-}
-
-/**
- * Gets the InnerDecklistNode that is the root node for the given zone, creating a new node if it doesn't exist.
- */
-InnerDecklistNode *DecklistNodeTree::getZoneObjFromName(const QString &zoneName) const
-{
-    for (int i = 0; i < root->size(); i++) {
-        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
-        if (node->getName() == zoneName) {
-            return node;
-        }
-    }
-
-    return new InnerDecklistNode(zoneName, root);
-}
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
deleted file mode 100644
index 6de760634..000000000
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef COCKATRICE_DECKLIST_NODE_TREE_H
-#define COCKATRICE_DECKLIST_NODE_TREE_H
-
-#include "libcockatrice/utility/card_ref.h"
-#include "tree/deck_list_card_node.h"
-#include "tree/inner_deck_list_node.h"
-
-#include <QSet>
-
-class DecklistNodeTree
-{
-    InnerDecklistNode *root; ///< Root of the deck tree (zones + cards).
-
-public:
-    /// @brief Constructs an empty DecklistNodeTree
-    explicit DecklistNodeTree();
-    /// @brief Copy constructor. Deep copies the tree
-    explicit DecklistNodeTree(const DecklistNodeTree &other);
-    /// @brief Copy-assignment operator. Deep copies the tree
-    DecklistNodeTree &operator=(const DecklistNodeTree &other);
-
-    virtual ~DecklistNodeTree();
-
-    /**
-     * @brief Gets a pointer to the underlying root node.
-     * Note: DO NOT call this method unless the object needs to have access to the underlying model.
-     * For now, only the DeckListModel should be calling this.
-     */
-    InnerDecklistNode *getRoot() const
-    {
-        return root;
-    }
-
-    bool isEmpty() const;
-
-    /**
-     * @brief Deletes all nodes except the root.
-     */
-    void clear();
-
-    /**
-     * Gets all card nodes in the tree
-     * @param restrictToZones Only get the nodes in these zones
-     * @return A QList containing all the card nodes in the zone.
-     */
-    QList<const DecklistCardNode *> getCardNodes(const QSet<QString> &restrictToZones = {}) const;
-
-    /**
-     * Gets all zone nodes in the tree
-     * @param restrictToZones If not empty, only get the zone nodes with these names.
-     * @return A QList containing all the zone nodes in the tree.
-     */
-    QList<const InnerDecklistNode *> getZoneNodes(const QSet<QString> &restrictToZones = {}) const;
-
-    /**
-     * @brief Computes the deck hash
-     */
-    QString computeDeckHash() const;
-
-    /**
-     *@brief Writes the contents of the deck to xml
-     */
-    void write(QXmlStreamWriter *xml) const;
-
-    /**
-     * @brief Reads a "zone" section of the xml to this tree
-     */
-    void readZoneElement(QXmlStreamReader *xml);
-
-    DecklistCardNode *addCard(const QString &cardName,
-                              int amount,
-                              const QString &zoneName,
-                              int position,
-                              const QString &cardSetName = QString(),
-                              const QString &cardSetCollectorNumber = QString(),
-                              const QString &cardProviderId = QString(),
-                              const bool formatLegal = true);
-    bool deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode = nullptr);
-
-    /**
-     * @brief Apply a function to every card in the deck tree. This can modify the cards.
-     *
-     * @param func Function taking (zone node, card node).
-     */
-    void forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func) const;
-
-private:
-    // Helpers for traversing the tree
-    InnerDecklistNode *getZoneObjFromName(const QString &zoneName) const;
-};
-
-#endif // COCKATRICE_DECKLIST_NODE_TREE_H
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
deleted file mode 100644
index d991ec98e..000000000
--- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "sideboard_plan.h"
-
-#include <QXmlStreamReader>
-
-SideboardPlan::SideboardPlan(const QString &_name, const QList<MoveCard_ToZone> &_moveList)
-    : name(_name), moveList(_moveList)
-{
-}
-
-void SideboardPlan::setMoveList(const QList<MoveCard_ToZone> &_moveList)
-{
-    moveList = _moveList;
-}
-
-bool SideboardPlan::readElement(QXmlStreamReader *xml)
-{
-    while (!xml->atEnd()) {
-        xml->readNext();
-        const QString childName = xml->name().toString();
-        if (xml->isStartElement()) {
-            if (childName == "name")
-                name = xml->readElementText();
-            else if (childName == "move_card_to_zone") {
-                MoveCard_ToZone m;
-                while (!xml->atEnd()) {
-                    xml->readNext();
-                    const QString childName2 = xml->name().toString();
-                    if (xml->isStartElement()) {
-                        if (childName2 == "card_name")
-                            m.set_card_name(xml->readElementText().toStdString());
-                        else if (childName2 == "start_zone")
-                            m.set_start_zone(xml->readElementText().toStdString());
-                        else if (childName2 == "target_zone")
-                            m.set_target_zone(xml->readElementText().toStdString());
-                    } else if (xml->isEndElement() && (childName2 == "move_card_to_zone")) {
-                        moveList.append(m);
-                        break;
-                    }
-                }
-            }
-        } else if (xml->isEndElement() && (childName == "sideboard_plan"))
-            return true;
-    }
-    return false;
-}
-
-void SideboardPlan::write(QXmlStreamWriter *xml) const
-{
-    xml->writeStartElement("sideboard_plan");
-    xml->writeTextElement("name", name);
-    for (auto &i : moveList) {
-        xml->writeStartElement("move_card_to_zone");
-        xml->writeTextElement("card_name", QString::fromStdString(i.card_name()));
-        xml->writeTextElement("start_zone", QString::fromStdString(i.start_zone()));
-        xml->writeTextElement("target_zone", QString::fromStdString(i.target_zone()));
-        xml->writeEndElement();
-    }
-    xml->writeEndElement();
-}
\ No newline at end of file
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
deleted file mode 100644
index 524217c2d..000000000
--- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef COCKATRICE_SIDEBOARD_PLAN_H
-#define COCKATRICE_SIDEBOARD_PLAN_H
-
-#include <QList>
-#include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
-
-class QXmlStreamWriter;
-class QXmlStreamReader;
-
-/**
- * @class SideboardPlan
- * @ingroup Decks
- * @brief Represents a predefined sideboarding strategy for a deck.
- *
- * Sideboard plans store a named list of card movements that should be applied
- * between the mainboard and sideboard for a specific matchup. Each movement
- * is expressed using a `MoveCard_ToZone` protobuf message.
- *
- * ### Responsibilities:
- * - Store the plan name and list of moves.
- * - Support XML serialization/deserialization.
- *
- * ### Typical usage:
- * A deck can contain multiple sideboard plans (e.g., "vs Aggro", "vs Control"),
- * each describing how to transform the main deck into its intended configuration.
- */
-class SideboardPlan
-{
-private:
-    QString name;                    ///< Human-readable name of this plan.
-    QList<MoveCard_ToZone> moveList; ///< List of move instructions for this plan.
-
-public:
-    /**
-     * @brief Construct a new SideboardPlan.
-     * @param _name The plan name.
-     * @param _moveList Initial list of card move instructions.
-     */
-    explicit SideboardPlan(const QString &_name = "", const QList<MoveCard_ToZone> &_moveList = {});
-
-    /**
-     * @brief Read a SideboardPlan from an XML stream.
-     * @param xml XML reader positioned at the plan element.
-     * @return true if parsing succeeded.
-     */
-    bool readElement(QXmlStreamReader *xml);
-
-    /**
-     * @brief Write this SideboardPlan to XML.
-     * @param xml Stream to append the serialized element to.
-     */
-    void write(QXmlStreamWriter *xml) const;
-
-    /// @return The plan name.
-    [[nodiscard]] QString getName() const
-    {
-        return name;
-    }
-
-    /// @return Const reference to the move list.
-    [[nodiscard]] const QList<MoveCard_ToZone> &getMoveList() const
-    {
-        return moveList;
-    }
-
-    /// @brief Replace the move list with a new one.
-    void setMoveList(const QList<MoveCard_ToZone> &_moveList);
-};
-
-#endif // COCKATRICE_SIDEBOARD_PLAN_H
diff --git a/libcockatrice_filters/CMakeLists.txt b/libcockatrice_filters/CMakeLists.txt
deleted file mode 100644
index 74566ca05..000000000
--- a/libcockatrice_filters/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS libcockatrice/filters/filter_card.h libcockatrice/filters/filter_string.h
-            libcockatrice/filters/filter_tree.h
-)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(
-  libcockatrice_filters STATIC ${MOC_SOURCES} libcockatrice/filters/filter_card.cpp
-                               libcockatrice/filters/filter_string.cpp libcockatrice/filters/filter_tree.cpp
-)
-
-add_dependencies(libcockatrice_filters libcockatrice_card)
-
-target_include_directories(libcockatrice_filters PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(libcockatrice_filters PUBLIC libcockatrice_card ${QT_CORE_MODULE})
diff --git a/libcockatrice_interfaces/CMakeLists.txt b/libcockatrice_interfaces/CMakeLists.txt
deleted file mode 100644
index 4f34f7985..000000000
--- a/libcockatrice_interfaces/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS
-    libcockatrice/interfaces/interface_card_database_path_provider.h
-    libcockatrice/interfaces/interface_card_preference_provider.h
-    libcockatrice/interfaces/interface_card_set_priority_controller.h
-    libcockatrice/interfaces/interface_network_settings_provider.h
-    libcockatrice/interfaces/noop_card_database_path_provider.h
-    libcockatrice/interfaces/noop_card_preference_provider.h
-    libcockatrice/interfaces/noop_card_set_priority_controller.h
-)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(libcockatrice_interfaces STATIC ${MOC_SOURCES})
-
-target_include_directories(libcockatrice_interfaces PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(libcockatrice_interfaces PUBLIC ${QT_CORE_MODULE})
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_database_path_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_database_path_provider.h
deleted file mode 100644
index dd55ab789..000000000
--- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_database_path_provider.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef COCKATRICE_INTERFACE_CARD_DATABASE_PATH_PROVIDER_H
-#define COCKATRICE_INTERFACE_CARD_DATABASE_PATH_PROVIDER_H
-#include <QObject>
-
-class ICardDatabasePathProvider : public QObject
-{
-    Q_OBJECT
-
-public:
-    virtual ~ICardDatabasePathProvider() = default;
-
-    [[nodiscard]] virtual QString getCardDatabasePath() const = 0;
-    [[nodiscard]] virtual QString getCustomCardDatabasePath() const = 0;
-    [[nodiscard]] virtual QString getTokenDatabasePath() const = 0;
-    [[nodiscard]] virtual QString getSpoilerCardDatabasePath() const = 0;
-
-signals:
-    void cardDatabasePathChanged();
-};
-
-#endif // COCKATRICE_INTERFACE_CARD_DATABASE_PATH_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h
deleted file mode 100644
index a6cf941fb..000000000
--- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef COCKATRICE_INTERFACE_CARD_PREFERENCE_PROVIDER_H
-#define COCKATRICE_INTERFACE_CARD_PREFERENCE_PROVIDER_H
-
-#include <QString>
-
-class ICardPreferenceProvider
-{
-public:
-    virtual ~ICardPreferenceProvider() = default;
-    [[nodiscard]] virtual QString getCardPreferenceOverride(const QString &cardName) const = 0;
-    [[nodiscard]] virtual bool getIncludeRebalancedCards() const = 0;
-};
-
-#endif // COCKATRICE_INTERFACE_CARD_PREFERENCE_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h
deleted file mode 100644
index b8fbbc74a..000000000
--- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef COCKATRICE_INTERFACE_CARD_SET_PRIORITY_CONTROLLER_H
-#define COCKATRICE_INTERFACE_CARD_SET_PRIORITY_CONTROLLER_H
-
-#include <QString>
-
-class ICardSetPriorityController
-{
-public:
-    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;
-};
-
-#endif // COCKATRICE_INTERFACE_CARD_SET_PRIORITY_CONTROLLER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_network_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_network_settings_provider.h
deleted file mode 100644
index bd136513d..000000000
--- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_network_settings_provider.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef COCKATRICE_INETWORKSETTINGSPROVIDER_H
-#define COCKATRICE_INETWORKSETTINGSPROVIDER_H
-#include <QString>
-
-class INetworkSettingsProvider
-{
-public:
-    virtual ~INetworkSettingsProvider() = default;
-
-    virtual QString getClientID() = 0;
-
-    [[nodiscard]] virtual int getTimeOut() const = 0;
-    [[nodiscard]] virtual int getKeepAlive() const = 0;
-    [[nodiscard]] virtual bool getNotifyAboutUpdates() const = 0;
-
-    virtual void setKnownMissingFeatures(const QString &_knownMissingFeatures) = 0;
-    virtual QString getKnownMissingFeatures() = 0;
-};
-
-#endif // COCKATRICE_INETWORKSETTINGSPROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_database_path_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_database_path_provider.h
deleted file mode 100644
index bacd7a2bb..000000000
--- a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_database_path_provider.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef COCKATRICE_NOOP_CARD_DATABASE_PATH_PROVIDER_H
-#define COCKATRICE_NOOP_CARD_DATABASE_PATH_PROVIDER_H
-#include "interface_card_database_path_provider.h"
-
-class NoopCardDatabasePathProvider : public ICardDatabasePathProvider
-{
-public:
-    [[nodiscard]] QString getCardDatabasePath() const override
-    {
-        return "";
-    }
-    [[nodiscard]] QString getCustomCardDatabasePath() const override
-    {
-        return "";
-    }
-    [[nodiscard]] QString getTokenDatabasePath() const override
-    {
-        return "";
-    }
-    [[nodiscard]] QString getSpoilerCardDatabasePath() const override
-    {
-        return "";
-    }
-};
-
-#endif // COCKATRICE_NOOP_CARD_DATABASE_PATH_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h
deleted file mode 100644
index 3781f4b63..000000000
--- a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef COCKATRICE_NOOP_CARD_PREFERENCE_PROVIDER_H
-#define COCKATRICE_NOOP_CARD_PREFERENCE_PROVIDER_H
-#include "interface_card_preference_provider.h"
-
-class NoopCardPreferenceProvider : public ICardPreferenceProvider
-{
-public:
-    [[nodiscard]] QString getCardPreferenceOverride(const QString &) const override
-    {
-        return {};
-    }
-
-    [[nodiscard]] bool getIncludeRebalancedCards() const override
-    {
-        return true;
-    }
-};
-
-#endif // COCKATRICE_NOOP_CARD_PREFERENCE_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h
deleted file mode 100644
index e5027648c..000000000
--- a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef COCKATRICE_NOOP_CARD_SET_PRIORITY_CONTROLLER_H
-#define COCKATRICE_NOOP_CARD_SET_PRIORITY_CONTROLLER_H
-
-#include "interface_card_set_priority_controller.h"
-
-class NoopCardSetPriorityController : public ICardSetPriorityController
-{
-public:
-    void setSortKey(QString /* shortName */, unsigned int /* sortKey */) override
-    {
-    }
-    void setEnabled(QString /* shortName */, bool /* enabled */) override
-    {
-    }
-    void setIsKnown(QString /* shortName */, bool /* isknown */) override
-    {
-    }
-
-    unsigned int getSortKey(QString /* shortName */) const override
-    {
-        return 0;
-    }
-    bool isEnabled(QString /* shortName */) const override
-    {
-        return true;
-    }
-    bool isKnown(QString /* shortName */) const override
-    {
-        return true;
-    }
-};
-
-#endif // COCKATRICE_NOOP_CARD_SET_PRIORITY_CONTROLLER_H
diff --git a/libcockatrice_models/CMakeLists.txt b/libcockatrice_models/CMakeLists.txt
deleted file mode 100644
index 7af35b2d5..000000000
--- a/libcockatrice_models/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-add_subdirectory(libcockatrice/models/database)
-add_subdirectory(libcockatrice/models/deck_list)
-
-add_library(libcockatrice_models INTERFACE)
-
-target_include_directories(libcockatrice_models INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(libcockatrice_models INTERFACE libcockatrice_models_database libcockatrice_models_deck_list)
diff --git a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
deleted file mode 100644
index 950d6d79f..000000000
--- a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS
-    card_database_model.h
-    card_database_display_model.h
-    card/card_completer_proxy_model.h
-    card/card_search_model.h
-    card_set/card_sets_model.h
-    token/token_display_model.h
-    token/token_edit_model.h
-)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(
-  libcockatrice_models_database STATIC
-  ${MOC_SOURCES}
-  card_database_model.cpp
-  card_database_display_model.cpp
-  card/card_completer_proxy_model.cpp
-  card/card_search_model.cpp
-  card_set/card_sets_model.cpp
-  token/token_display_model.cpp
-  token/token_edit_model.cpp
-)
-
-target_include_directories(libcockatrice_models_database PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(libcockatrice_models_database PUBLIC libcockatrice_card libcockatrice_filters ${QT_CORE_MODULE})
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
deleted file mode 100644
index 851636a35..000000000
--- a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS deck_list_model.h deck_list_sort_filter_proxy_model.h)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(
-  libcockatrice_models_deck_list STATIC ${MOC_SOURCES} deck_list_model.cpp deck_list_sort_filter_proxy_model.cpp
-)
-
-target_include_directories(libcockatrice_models_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(
-  libcockatrice_models_deck_list PUBLIC libcockatrice_card libcockatrice_deck_list ${QT_CORE_MODULE}
-)
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
deleted file mode 100644
index 86d36b7f9..000000000
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
+++ /dev/null
@@ -1,438 +0,0 @@
-#ifndef DECKLISTMODEL_H
-#define DECKLISTMODEL_H
-
-#include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h>
-#include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <QAbstractItemModel>
-#include <QList>
-#include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/deck_list/deck_list.h>
-
-class CardDatabase;
-class QPrinter;
-class QTextCursor;
-
-/**
- * @namespace DeckRoles
- * @brief Custom model roles used by the DeckListModel for data retrieval.
- *
- * These roles extend Qt's item data roles starting at Qt::UserRole.
- */
-namespace DeckRoles
-{
-/**
- * @enum DeckRoles
- * @brief Custom data roles for deck-related model items.
- *
- * These roles are used to retrieve specialized data from the DeckListModel.
- */
-enum
-{
-    IsCardRole = Qt::UserRole + 1, /**< Indicates whether the item represents a card. */
-    DepthRole,                     /**< Depth level within the deck's grouping hierarchy. */
-    IsLegalRole                    /**< Whether the card is legal in the current deck format. */
-};
-} // namespace DeckRoles
-
-/**
- * @namespace DeckListModelColumns
- * @brief Column indices for the DeckListModel.
- *
- * These values map to the columns in the deck list table representation.
- */
-namespace DeckListModelColumns
-{
-/**
- * @enum DeckListModelColumns
- * @brief Column identifiers for displaying card information in the deck list.
- */
-enum
-{
-    CARD_AMOUNT = 0,           /**< The number of copies of the card. */
-    CARD_NAME = 1,             /**< The card's name. */
-    CARD_SET = 2,              /**< The set or expansion the card belongs to. */
-    CARD_COLLECTOR_NUMBER = 3, /**< Collector number of the card within the set. */
-    CARD_PROVIDER_ID = 4       /**< ID used by the external data provider (e.g., Scryfall). */
-};
-} // namespace DeckListModelColumns
-
-/**
- * @namespace DeckListModelGroupCriteria
- * @brief Specifies criteria used to group cards in the DeckListModel.
- *
- * These values determine how cards are grouped in UI views such as the deck editor.
- */
-namespace DeckListModelGroupCriteria
-{
-/**
- * @enum DeckListModelGroupCriteria
- * @brief Available grouping strategies for deck visualization.
- */
-enum Type
-{
-    MAIN_TYPE, /**< Group cards by their main type (e.g., creature, instant). */
-    MANA_COST, /**< Group cards by their total mana cost. */
-    COLOR      /**< Group cards by their color identity. */
-};
-static inline QString toString(Type t)
-{
-    switch (t) {
-        case MAIN_TYPE:
-            return "Main Type";
-        case MANA_COST:
-            return "Mana Cost";
-        case COLOR:
-            return "Colors";
-    }
-    return {};
-}
-
-static inline Type fromString(const QString &s)
-{
-    if (s == "Main Type")
-        return MAIN_TYPE;
-    if (s == "Mana Cost")
-        return MANA_COST;
-    if (s == "Colors")
-        return COLOR;
-    return MAIN_TYPE; // default
-}
-} // namespace DeckListModelGroupCriteria
-
-/**
- * @class DecklistModelCardNode
- * @ingroup DeckModels
- * @brief Adapter node that wraps a DecklistCardNode for use in the DeckListModel tree.
- *
- * This class forwards all property accessors (name, number, provider ID, set info, etc.)
- * to the underlying DecklistCardNode. It exists so the model can represent cards
- * in the same hierarchy as InnerDecklistNode containers.
- */
-class DecklistModelCardNode : public AbstractDecklistCardNode
-{
-private:
-    DecklistCardNode *dataNode; /**< Pointer to the underlying data node. */
-
-public:
-    /**
-     * @brief Constructs a model node wrapping a DecklistCardNode.
-     * @param _dataNode The underlying DecklistCardNode to wrap.
-     * @param _parent The parent InnerDecklistNode in the model tree.
-     * @param position Optional position to insert in parent (-1 appends at end).
-     */
-    DecklistModelCardNode(DecklistCardNode *_dataNode, InnerDecklistNode *_parent, int position = -1)
-        : AbstractDecklistCardNode(_parent, position), dataNode(_dataNode)
-    {
-    }
-    [[nodiscard]] int getNumber() const override
-    {
-        return dataNode->getNumber();
-    }
-    void setNumber(int _number) override
-    {
-        dataNode->setNumber(_number);
-    }
-    [[nodiscard]] QString getName() const override
-    {
-        return dataNode->getName();
-    }
-    void setName(const QString &_name) override
-    {
-        dataNode->setName(_name);
-    }
-    [[nodiscard]] QString getCardProviderId() const override
-    {
-        return dataNode->getCardProviderId();
-    }
-    void setCardProviderId(const QString &_cardProviderId) override
-    {
-        dataNode->setCardProviderId(_cardProviderId);
-    }
-    [[nodiscard]] QString getCardSetShortName() const override
-    {
-        return dataNode->getCardSetShortName();
-    }
-    void setCardSetShortName(const QString &_cardSetShortName) override
-    {
-        dataNode->setCardSetShortName(_cardSetShortName);
-    }
-    [[nodiscard]] QString getCardCollectorNumber() const override
-    {
-        return dataNode->getCardCollectorNumber();
-    }
-    void setCardCollectorNumber(const QString &_cardSetNumber) override
-    {
-        dataNode->setCardCollectorNumber(_cardSetNumber);
-    }
-    bool getFormatLegality() const override
-    {
-        return dataNode->getFormatLegality();
-    }
-    void setFormatLegality(const bool _formatLegal) override
-    {
-        dataNode->setFormatLegality(_formatLegal);
-    }
-
-    /**
-     * @brief Returns the underlying data node.
-     * @return Pointer to the DecklistCardNode wrapped by this node.
-     */
-    [[nodiscard]] DecklistCardNode *getDataNode() const
-    {
-        return dataNode;
-    }
-    [[nodiscard]] bool isDeckHeader() const override
-    {
-        return false;
-    }
-};
-
-/**
- * @class DeckListModel
- * @ingroup DeckModels
- * @brief Qt model representing a decklist for use in views (tree/table).
- *
- * DeckListModel is a QAbstractItemModel that exposes the structure of a deck
- * (zones and cards) to Qt views. It organizes cards hierarchically under
- * InnerDecklistNode containers and supports grouping, sorting, adding/removing
- * cards, and printing decklists.
- *
- * Outside code should refrain from modifying the model with methods inherited from QAbstractItemModel, such as with
- * `setData` or `removeRow`.
- * Instead, use the custom methods on this class to modify the model, such as `addCard`, `offsetCountAtIndex`, or
- * `removeCardAtIndex`.
- * This ensures the custom signals for this class are correctly emitted.
- *
- * Signals:
- * - deckHashChanged(): emitted when the deck contents change in a way that
- *   affects its hash.
- *
- * Slots:
- * - rebuildTree(): rebuilds the model structure from the underlying node tree.
- */
-class DeckListModel : public QAbstractItemModel
-{
-    Q_OBJECT
-
-public slots:
-    /**
-     * @brief Rebuilds the model tree from the underlying node tree.
-     *
-     * This updates all indices and ensures the model reflects the current
-     * state of the deck.
-     */
-    void rebuildTree();
-
-    /**
-     * @brief Sets the criteria used to group cards in the model.
-     * @param newCriteria The new grouping criteria.
-     */
-    void setActiveGroupCriteria(DeckListModelGroupCriteria::Type newCriteria);
-
-    void setActiveFormat(const QString &_format);
-
-signals:
-    /**
-     * @brief Emitted whenever the deck hash changes due to modifications in the model.
-     */
-    void deckHashChanged();
-
-    /**
-     * @brief Emitted whenever the cards in the deck changes. This includes when the deck is replaced.
-     */
-    void cardsChanged();
-
-    /**
-     * @brief Emitted whenever a card is added to the deck, regardless of whether it's an entirely new card or an
-     * existing card that got incremented.
-     * @param index The index of the card that got added.
-     */
-    void cardAddedAt(const QModelIndex &index);
-
-    /**
-     * @brief Emitted whenever a card is removed from the deck, regardless of whether a card node was removed or an
-     * existing card got decremented.
-     */
-    void cardRemoved();
-
-    /**
-     * @brief Emitted whenever a card node is added or removed. This includes when the deck is replaced.
-     */
-    void cardNodesChanged();
-
-    /**
-     * @brief Emitted whenever a new card node is added.
-     * @param index The index of the card node that got added.
-     */
-    void cardNodeAddedAt(const QModelIndex &index);
-
-    /**
-     * @brief Emitted whenever a card node is removed.
-     */
-    void cardNodeRemoved();
-
-    /**
-     * @brief Emitted whenever the deck in the model has been replaced with a new one
-     */
-    void deckReplaced();
-
-public:
-    explicit DeckListModel(QObject *parent = nullptr);
-    explicit DeckListModel(QObject *parent, const QSharedPointer<DeckList> &deckList);
-    ~DeckListModel() override;
-
-    /**
-     * @brief Returns the root index of the model.
-     * @return QModelIndex representing the root node.
-     */
-    [[nodiscard]] QModelIndex getRoot() const
-    {
-        return nodeToIndex(root);
-    }
-
-    /// @name Qt model overrides
-    ///@{
-    [[nodiscard]] int rowCount(const QModelIndex &parent) const override;
-    [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-    [[nodiscard]] QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
-    [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent) const override;
-    [[nodiscard]] QModelIndex parent(const QModelIndex &index) const override;
-    [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override;
-    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
-    bool removeRows(int row, int count, const QModelIndex &parent) override;
-    void sort(int column, Qt::SortOrder order) override;
-    ///@}
-
-    /**
-     * @brief Finds a card by name, zone, and optional identifiers.
-     * @param cardName The card's name.
-     * @param zoneName The zone to search in (main/side/etc.).
-     * @param providerId Optional provider-specific ID.
-     * @param cardNumber Optional collector number.
-     * @return QModelIndex of the card, or invalid index if not found.
-     */
-    [[nodiscard]] QModelIndex findCard(const QString &cardName,
-                                       const QString &zoneName,
-                                       const QString &providerId = "",
-                                       const QString &cardNumber = "") const;
-
-    /**
-     * @brief Adds a card using the preferred printing if available.
-     *
-     * @param cardName Name of the card to add.
-     * @param zoneName Zone to insert the card into.
-     * @param abAddAnyway Whether to add the card even if resolution fails.
-     * @return QModelIndex pointing to the newly inserted card node.
-     */
-    QModelIndex addPreferredPrintingCard(const QString &cardName, const QString &zoneName, bool abAddAnyway);
-
-    /**
-     * @brief Adds an ExactCard to the specified zone.
-     * @param card The card to add.
-     * @param zoneName The zone to insert the card into.
-     * @return QModelIndex pointing to the newly inserted card node.
-     */
-    QModelIndex addCard(const ExactCard &card, const QString &zoneName);
-
-    /**
-     * @brief Changes the `amount` field in the card node at the index by the amount.
-     * Removes the node if it causes the amount to fall to 0 or below.
-     * @param idx The index of a card node. No-ops if the index is invalid or not a card node.
-     * @param offset The amount to change the amount field by.
-     * @return Whether the operation was successful
-     */
-    bool offsetCountAtIndex(const QModelIndex &idx, int offset);
-
-    /**
-     * @brief Removes the card node at the index
-     * @param idx The index of a card node. No-ops if the index is invalid or not a card node.
-     * @return Whether the node was removed.
-     */
-    bool removeCardAtIndex(const QModelIndex &idx);
-
-    /**
-     * @brief Removes all cards and resets the model.
-     */
-    void cleanList();
-
-    [[nodiscard]] QSharedPointer<DeckList> getDeckList() const
-    {
-        return deckList;
-    }
-    void setDeckList(const QSharedPointer<DeckList> &_deck);
-
-    /**
-     * @brief Apply a function to every card in the deck tree.
-     *
-     * @param func Function taking (zone node, card node).
-     */
-    void forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func);
-
-    /**
-     * @brief Gets a list of all card nodes in the deck.
-     */
-    [[nodiscard]] QList<const DecklistCardNode *> getCardNodes() const;
-    [[nodiscard]] QList<const DecklistCardNode *> getCardNodesForZone(const QString &zoneName) const;
-
-    /**
-     * @brief Gets a deduplicated list of all card names that appear in the model
-     */
-    [[nodiscard]] QList<QString> getCardNames() const;
-    /**
-     * @brief Gets a deduplicated list of all CardRefs that appear in the model
-     */
-    [[nodiscard]] QList<CardRef> getCardRefs() const;
-    /**
-     * @brief Gets a list of all zone names that appear in the model
-     */
-    [[nodiscard]] QList<QString> getZones() const;
-
-private:
-    QSharedPointer<DeckList> deckList; /**< Pointer to the decklist providing the underlying data. */
-    InnerDecklistNode *root;           /**< Root node of the model tree. */
-    DeckListModelGroupCriteria::Type activeGroupCriteria = DeckListModelGroupCriteria::MAIN_TYPE;
-    int lastKnownColumn;          /**< Last column used for sorting. */
-    Qt::SortOrder lastKnownOrder; /**< Last known sort order. */
-
-    InnerDecklistNode *createNodeIfNeeded(const QString &name, InnerDecklistNode *parent);
-    QModelIndex nodeToIndex(AbstractDecklistNode *node) const;
-    [[nodiscard]] DecklistModelCardNode *findCardNode(const QString &cardName,
-                                                      const QString &zoneName,
-                                                      const QString &providerId = "",
-                                                      const QString &cardNumber = "") const;
-
-    /**
-     * @brief Determines the sorted insertion row for a card.
-     * @param parent The parent node where the card will be inserted.
-     * @param cardInfo The card info to insert.
-     * @return Row index where the card should be inserted to maintain sort order.
-     */
-    int findSortedInsertRow(const InnerDecklistNode *parent, const CardInfoPtr &cardInfo) const;
-
-    /**
-     * @brief Recursively emits the dataChanged signal with role as Qt::BackgroundRole for all indices that are children
-     * of the given node. This is used to update the background color when changing formats.
-     * @param parent The parent node
-     */
-    void emitBackgroundUpdates(const QModelIndex &parent);
-
-    /**
-     * @brief Recursively emits the dataChanged signal for the given node and all parent nodes.
-     * @param index The parent node
-     */
-    void emitRecursiveUpdates(const QModelIndex &index);
-
-    void sortHelper(InnerDecklistNode *node, Qt::SortOrder order);
-
-    template <typename T> T getNode(const QModelIndex &index) const
-    {
-        if (!index.isValid())
-            return dynamic_cast<T>(root);
-        return dynamic_cast<T>(static_cast<AbstractDecklistNode *>(index.internalPointer()));
-    }
-
-    void refreshCardFormatLegalities();
-};
-
-#endif
diff --git a/libcockatrice_network/CMakeLists.txt b/libcockatrice_network/CMakeLists.txt
deleted file mode 100644
index 3069c0db4..000000000
--- a/libcockatrice_network/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-add_subdirectory(libcockatrice/network/client)
-add_subdirectory(libcockatrice/network/server)
-
-add_library(libcockatrice_network INTERFACE)
-
-target_include_directories(libcockatrice_network INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(
-  libcockatrice_network INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client libcockatrice_network_server
-)
diff --git a/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt
deleted file mode 100644
index bcf62463c..000000000
--- a/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-add_subdirectory(abstract)
-add_subdirectory(local)
-add_subdirectory(remote)
-
-add_library(libcockatrice_network_client INTERFACE)
-
-target_include_directories(libcockatrice_network_client INTERFACE .)
-
-target_link_libraries(
-  libcockatrice_network_client
-  INTERFACE ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets
-            libcockatrice_network_client_abstract libcockatrice_network_client_local
-            libcockatrice_network_client_remote
-)
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
deleted file mode 100644
index 2753246de..000000000
--- a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS abstract_client.h)
-
-set(SOURCES abstract_client.cpp)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(libcockatrice_network_client_abstract STATIC ${MOC_SOURCES} ${SOURCES})
-
-add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol libcockatrice_network_server_remote)
-
-target_include_directories(libcockatrice_network_client_abstract PUBLIC .)
-
-target_link_libraries(
-  libcockatrice_network_client_abstract
-  PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets libcockatrice_protocol
-         libcockatrice_network_server_remote
-)
diff --git a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
deleted file mode 100644
index d12a324dc..000000000
--- a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS local_client.h)
-
-set(SOURCES local_client.cpp)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(libcockatrice_network_client_local STATIC ${MOC_SOURCES} ${SOURCES})
-
-add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract)
-
-target_include_directories(libcockatrice_network_client_local PUBLIC .)
-
-target_link_libraries(
-  libcockatrice_network_client_local
-  PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets
-         libcockatrice_network_client_abstract
-)
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
deleted file mode 100644
index 0548700e4..000000000
--- a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS remote_client.h)
-
-set(SOURCES remote_client.cpp)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(libcockatrice_network_client_remote STATIC ${MOC_SOURCES} ${SOURCES})
-
-add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract libcockatrice_protocol)
-
-target_include_directories(libcockatrice_network_client_remote PUBLIC .)
-
-target_link_libraries(
-  libcockatrice_network_client_remote
-  PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets
-         libcockatrice_network_client_abstract libcockatrice_interfaces libcockatrice_utility libcockatrice_protocol
-)
diff --git a/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt
deleted file mode 100644
index cbb717ad8..000000000
--- a/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-add_subdirectory(local)
-add_subdirectory(remote)
-
-add_library(libcockatrice_network_server INTERFACE)
-
-target_include_directories(libcockatrice_network_server INTERFACE .)
-
-target_link_libraries(
-  libcockatrice_network_server INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_server_local
-                                         libcockatrice_network_server_remote
-)
diff --git a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
deleted file mode 100644
index 80fb379a4..000000000
--- a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS local_server.h local_server_interface.h)
-
-set(SOURCES local_server.cpp local_server_interface.cpp)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(libcockatrice_network_server_local STATIC ${MOC_SOURCES} ${SOURCES})
-
-add_dependencies(libcockatrice_network_server_local libcockatrice_protocol)
-
-target_include_directories(libcockatrice_network_server_local PUBLIC .)
-
-target_link_libraries(libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol)
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
deleted file mode 100644
index e883baa0d..000000000
--- a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS
-    game/server_abstract_participant.h
-    game/server_abstract_player.h
-    game/server_arrow.h
-    game/server_arrowtarget.h
-    game/server_card.h
-    game/server_cardzone.h
-    game/server_counter.h
-    game/server_game.h
-    game/server_player.h
-    game/server_spectator.h
-    server.h
-    server_abstractuserinterface.h
-    server_database_interface.h
-    server_protocolhandler.h
-    server_remoteuserinterface.h
-    server_response_containers.h
-    server_room.h
-    serverinfo_user_container.h
-)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(
-  libcockatrice_network_server_remote STATIC
-  ${MOC_SOURCES}
-  game/server_abstract_participant.cpp
-  game/server_abstract_player.cpp
-  game/server_arrow.cpp
-  game/server_arrowtarget.cpp
-  game/server_card.cpp
-  game/server_cardzone.cpp
-  game/server_counter.cpp
-  game/server_game.cpp
-  game/server_player.cpp
-  game/server_spectator.cpp
-  server.cpp
-  server_abstractuserinterface.cpp
-  server_database_interface.cpp
-  server_protocolhandler.cpp
-  server_remoteuserinterface.cpp
-  server_response_containers.cpp
-  server_room.cpp
-  serverinfo_user_container.cpp
-)
-
-add_dependencies(libcockatrice_network_server_remote libcockatrice_protocol)
-
-target_include_directories(libcockatrice_network_server_remote PUBLIC .)
-
-# Make cockatrice_server depend on cockatrice_protocol
-target_link_libraries(
-  libcockatrice_network_server_remote PUBLIC libcockatrice_protocol libcockatrice_utility libcockatrice_rng
-                                             libcockatrice_deck_list ${COCKATRICE_QT_MODULES}
-)
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_move_card_struct.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_move_card_struct.h
deleted file mode 100644
index c5b293b6d..000000000
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_move_card_struct.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef MOVE_CARD_STRUCT
-#define MOVE_CARD_STRUCT
-
-#include "server_card.h"
-class CardToMove;
-
-struct MoveCardStruct
-{
-    Server_Card *card;
-    int position;
-    const CardToMove *cardToMove;
-    int xCoord, yCoord;
-    MoveCardStruct(Server_Card *_card, int _position, const CardToMove *_cardToMove)
-        : card(_card), position(_position), cardToMove(_cardToMove), xCoord(_card->getX()), yCoord(_card->getY())
-
-    {
-    }
-    bool operator<(const MoveCardStruct &other) const
-    {
-        return (yCoord == other.yCoord &&
-                ((xCoord == other.xCoord && position < other.position) || xCoord < other.xCoord)) ||
-               yCoord < other.yCoord;
-    }
-};
-
-#endif
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
deleted file mode 100644
index 1175e4b57..000000000
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
+++ /dev/null
@@ -1,598 +0,0 @@
-#include "server_player.h"
-
-#include "../server.h"
-#include "../server_abstractuserinterface.h"
-#include "../server_database_interface.h"
-#include "../server_room.h"
-#include "server_card.h"
-#include "server_cardzone.h"
-#include "server_counter.h"
-#include "server_game.h"
-#include "server_move_card_struct.h"
-
-#include <QDebug>
-#include <QRegularExpression>
-#include <algorithm>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
-#include <libcockatrice/protocol/pb/command_concede.pb.h>
-#include <libcockatrice/protocol/pb/command_create_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_deck_select.pb.h>
-#include <libcockatrice/protocol/pb/command_del_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_draw_cards.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_set_active_phase.pb.h>
-#include <libcockatrice/protocol/pb/command_set_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
-#include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
-#include <libcockatrice/protocol/pb/command_shuffle.pb.h>
-#include <libcockatrice/protocol/pb/context_deck_select.pb.h>
-#include <libcockatrice/protocol/pb/context_mulligan.pb.h>
-#include <libcockatrice/protocol/pb/context_set_sideboard_lock.pb.h>
-#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_player_properties_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_set_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_shuffle.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_download.pb.h>
-#include <libcockatrice/protocol/pb/response_dump_zone.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/rng/rng_abstract.h>
-#include <libcockatrice/utility/color.h>
-#include <libcockatrice/utility/trice_limits.h>
-#include <libcockatrice/utility/zone_names.h>
-
-Server_Player::Server_Player(Server_Game *_game,
-                             int _playerId,
-                             const ServerInfo_User &_userInfo,
-                             bool _judge,
-                             Server_AbstractUserInterface *_userInterface)
-    : Server_AbstractPlayer(_game, _playerId, _userInfo, _judge, _userInterface)
-{
-}
-
-Server_Player::~Server_Player() = default;
-
-int Server_Player::newCounterId() const
-{
-    int id = 0;
-    QMapIterator<int, Server_Counter *> i(counters);
-    while (i.hasNext()) {
-        Server_Counter *c = i.next().value();
-        if (c->getId() > id) {
-            id = c->getId();
-        }
-    }
-    return id + 1;
-}
-
-void Server_Player::setupZones()
-{
-    Server_AbstractPlayer::setupZones();
-
-    // This may need to be customized according to the game rules.
-    // ------------------------------------------------------------------
-
-    // Create zones
-    auto *deckZone = new Server_CardZone(this, ZoneNames::DECK, false, ServerInfo_Zone::HiddenZone);
-    addZone(deckZone);
-    auto *sbZone = new Server_CardZone(this, ZoneNames::SIDEBOARD, false, ServerInfo_Zone::HiddenZone);
-    addZone(sbZone);
-    addZone(new Server_CardZone(this, ZoneNames::TABLE, true, ServerInfo_Zone::PublicZone));
-    addZone(new Server_CardZone(this, ZoneNames::HAND, false, ServerInfo_Zone::PrivateZone));
-    addZone(new Server_CardZone(this, ZoneNames::STACK, false, ServerInfo_Zone::PublicZone));
-    addZone(new Server_CardZone(this, ZoneNames::GRAVE, false, ServerInfo_Zone::PublicZone));
-    addZone(new Server_CardZone(this, ZoneNames::EXILE, false, ServerInfo_Zone::PublicZone));
-
-    addCounter(new Server_Counter(0, "life", makeColor(255, 255, 255), 25, game->getStartingLifeTotal()));
-    addCounter(new Server_Counter(1, "w", makeColor(255, 255, 150), 20, 0));
-    addCounter(new Server_Counter(2, "u", makeColor(150, 150, 255), 20, 0));
-    addCounter(new Server_Counter(3, "b", makeColor(150, 150, 150), 20, 0));
-    addCounter(new Server_Counter(4, "r", makeColor(250, 150, 150), 20, 0));
-    addCounter(new Server_Counter(5, "g", makeColor(150, 255, 150), 20, 0));
-    addCounter(new Server_Counter(6, "x", makeColor(255, 255, 255), 20, 0));
-    addCounter(new Server_Counter(7, "storm", makeColor(255, 150, 30), 20, 0));
-
-    // ------------------------------------------------------------------
-
-    // Assign card ids and create deck from deck list
-    auto insertCardsIntoZone = [this](auto cards, auto *zone) {
-        for (auto card : cards) {
-            for (int k = 0; k < card->getNumber(); ++k) {
-                zone->insertCard(new Server_Card(card->toCardRef(), nextCardId++, 0, 0, zone), -1, 0);
-            }
-        }
-    };
-
-    insertCardsIntoZone(deck->getCardNodes({DECK_ZONE_MAIN}), deckZone);
-    insertCardsIntoZone(deck->getCardNodes({DECK_ZONE_SIDE}), sbZone);
-
-    const QList<MoveCard_ToZone> &sideboardPlan = deck->getCurrentSideboardPlan();
-    for (const auto &m : sideboardPlan) {
-        const QString startZone = nameFromStdString(m.start_zone());
-        const QString targetZone = nameFromStdString(m.target_zone());
-
-        Server_CardZone *start, *target;
-        if (startZone == DECK_ZONE_MAIN) {
-            start = deckZone;
-        } else if (startZone == DECK_ZONE_SIDE) {
-            start = sbZone;
-        } else {
-            continue;
-        }
-        if (targetZone == DECK_ZONE_MAIN) {
-            target = deckZone;
-        } else if (targetZone == DECK_ZONE_SIDE) {
-            target = sbZone;
-        } else {
-            continue;
-        }
-
-        for (int j = 0; j < start->getCards().size(); ++j) {
-            if (start->getCards()[j]->getName() == nameFromStdString(m.card_name())) {
-                Server_Card *card = start->getCard(j, nullptr, true);
-                target->insertCard(card, -1, 0);
-                break;
-            }
-        }
-    }
-
-    deckZone->shuffle();
-}
-
-void Server_Player::clearZones()
-{
-    Server_AbstractPlayer::clearZones();
-    for (Server_Counter *counter : counters) {
-        delete counter;
-    }
-    counters.clear();
-
-    lastDrawList.clear();
-}
-
-void Server_Player::addCounter(Server_Counter *counter)
-{
-    counters.insert(counter->getId(), counter);
-}
-
-Response::ResponseCode Server_Player::drawCards(GameEventStorage &ges, int number)
-{
-    Server_CardZone *deckZone = zones.value(ZoneNames::DECK);
-    Server_CardZone *handZone = zones.value(ZoneNames::HAND);
-    if (deckZone->getCards().size() < number) {
-        number = deckZone->getCards().size();
-    }
-
-    Event_DrawCards eventOthers;
-    eventOthers.set_number(number);
-    Event_DrawCards eventPrivate(eventOthers);
-
-    for (int i = 0; i < number; ++i) {
-        Server_Card *card = deckZone->getCard(0, nullptr, true);
-        handZone->insertCard(card, -1, 0);
-        lastDrawList.append(card->getId());
-
-        ServerInfo_Card *cardInfo = eventPrivate.add_cards();
-        cardInfo->set_id(card->getId());
-        cardInfo->set_name(card->getName().toStdString());
-        cardInfo->set_provider_id(card->getProviderId().toStdString());
-    }
-
-    ges.enqueueGameEvent(eventPrivate, playerId, GameEventStorageItem::SendToPrivate, playerId);
-    ges.enqueueGameEvent(eventOthers, playerId, GameEventStorageItem::SendToOthers);
-
-    if (number > 0) {
-        revealTopCardIfNeeded(deckZone, ges);
-        int currentKnownCards = deckZone->getCardsBeingLookedAt();
-        deckZone->setCardsBeingLookedAt(currentKnownCards - number);
-    }
-
-    return Response::RespOk;
-}
-
-void Server_Player::onCardBeingMoved(GameEventStorage &ges,
-                                     const MoveCardStruct &cardStruct,
-                                     Server_CardZone *startzone,
-                                     Server_CardZone *targetzone,
-                                     bool undoingDraw)
-{
-    Server_AbstractPlayer::onCardBeingMoved(ges, cardStruct, startzone, targetzone, undoingDraw);
-
-    Server_Card *card = cardStruct.card;
-
-    // "Undo draw" should only remain valid if the just-drawn card stays within the user's hand (e.g., they only
-    // reorder their hand). If a just-drawn card leaves the hand then remove cards before it from the list
-    // (Ignore the case where the card is currently being un-drawn.)
-    if (startzone->getName() == ZoneNames::HAND && targetzone->getName() != ZoneNames::HAND && !undoingDraw) {
-        int index = lastDrawList.lastIndexOf(card->getId());
-        if (index != -1) {
-            lastDrawList.erase(lastDrawList.begin(), lastDrawList.begin() + index);
-        }
-    }
-}
-
-Response::ResponseCode
-Server_Player::cmdDeckSelect(const Command_DeckSelect &cmd, ResponseContainer &rc, GameEventStorage &ges)
-{
-    if (game->getGameStarted()) {
-        return Response::RespContextError;
-    }
-
-    DeckList *newDeck;
-    if (cmd.has_deck_id()) {
-        try {
-            newDeck = game->getRoom()->getServer()->getDatabaseInterface()->getDeckFromDatabase(cmd.deck_id(),
-                                                                                                userInfo->id());
-        } catch (Response::ResponseCode &r) {
-            return r;
-        }
-    } else {
-        newDeck = new DeckList(fileFromStdString(cmd.deck()));
-    }
-
-    if (!newDeck) {
-        return Response::RespInternalError;
-    }
-
-    delete deck;
-    deck = newDeck;
-    sideboardLocked = true;
-
-    Event_PlayerPropertiesChanged event;
-    event.mutable_player_properties()->set_sideboard_locked(true);
-    event.mutable_player_properties()->set_deck_hash(deck->getDeckHash().toStdString());
-    ges.enqueueGameEvent(event, playerId);
-
-    Context_DeckSelect context;
-    context.set_deck_hash(deck->getDeckHash().toStdString());
-    context.set_sideboard_size(deck->getSideboardSize());
-    if (game->getShareDecklistsOnLoad()) {
-        context.set_deck_list(deck->writeToString_Native().toStdString());
-    }
-    ges.setGameEventContext(context);
-
-    auto *re = new Response_DeckDownload;
-    re->set_deck(deck->writeToString_Native().toStdString());
-
-    rc.setResponseExtension(re);
-    return Response::RespOk;
-}
-
-Response::ResponseCode Server_Player::cmdSetSideboardPlan(const Command_SetSideboardPlan &cmd,
-                                                          ResponseContainer & /*rc*/,
-                                                          GameEventStorage & /*ges*/)
-{
-    if (readyStart) {
-        return Response::RespContextError;
-    }
-    if (!deck) {
-        return Response::RespContextError;
-    }
-    if (sideboardLocked) {
-        return Response::RespContextError;
-    }
-
-    QList<MoveCard_ToZone> sideboardPlan;
-    for (int i = 0; i < cmd.move_list_size(); ++i) {
-        sideboardPlan.append(cmd.move_list(i));
-    }
-    deck->setCurrentSideboardPlan(sideboardPlan);
-
-    return Response::RespOk;
-}
-
-Response::ResponseCode Server_Player::cmdSetSideboardLock(const Command_SetSideboardLock &cmd,
-                                                          ResponseContainer & /*rc*/,
-                                                          GameEventStorage &ges)
-{
-    if (readyStart) {
-        return Response::RespContextError;
-    }
-    if (!deck) {
-        return Response::RespContextError;
-    }
-    if (sideboardLocked == cmd.locked()) {
-        return Response::RespContextError;
-    }
-
-    sideboardLocked = cmd.locked();
-    if (sideboardLocked) {
-        deck->setCurrentSideboardPlan(QList<MoveCard_ToZone>());
-    }
-
-    Event_PlayerPropertiesChanged event;
-    event.mutable_player_properties()->set_sideboard_locked(sideboardLocked);
-    ges.enqueueGameEvent(event, playerId);
-    ges.setGameEventContext(Context_SetSideboardLock());
-
-    return Response::RespOk;
-}
-
-Response::ResponseCode
-Server_Player::cmdShuffle(const Command_Shuffle &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
-{
-    if (!game->getGameStarted()) {
-        return Response::RespGameNotStarted;
-    }
-
-    if (conceded) {
-        return Response::RespContextError;
-    }
-
-    if (cmd.has_zone_name() && cmd.zone_name() != ZoneNames::DECK) {
-        return Response::RespFunctionNotAllowed;
-    }
-
-    Server_CardZone *zone = zones.value(ZoneNames::DECK);
-    if (!zone) {
-        return Response::RespNameNotFound;
-    }
-
-    zone->shuffle(cmd.start(), cmd.end());
-
-    Event_Shuffle event;
-    event.set_zone_name(zone->getName().toStdString());
-    event.set_start(cmd.start());
-    event.set_end(cmd.end());
-    ges.enqueueGameEvent(event, playerId);
-    revealTopCardIfNeeded(zone, ges);
-
-    return Response::RespOk;
-}
-
-Response::ResponseCode
-Server_Player::cmdMulligan(const Command_Mulligan &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
-{
-    if (!game->getGameStarted()) {
-        return Response::RespGameNotStarted;
-    }
-    if (conceded) {
-        return Response::RespContextError;
-    }
-
-    Server_CardZone *hand = zones.value(ZoneNames::HAND);
-    Server_CardZone *_deck = zones.value(ZoneNames::DECK);
-    int number = cmd.number();
-
-    if (!hand->getCards().isEmpty()) {
-        auto cardsToMove = QList<const CardToMove *>();
-        for (auto &card : hand->getCards()) {
-            auto *cardToMove = new CardToMove;
-            cardToMove->set_card_id(card->getId());
-            cardsToMove.append(cardToMove);
-        }
-        moveCard(ges, hand, cardsToMove, _deck, -1, 0, false);
-        qDeleteAll(cardsToMove);
-    }
-
-    _deck->shuffle();
-    ges.enqueueGameEvent(Event_Shuffle(), playerId);
-
-    drawCards(ges, number);
-
-    Context_Mulligan context;
-    context.set_number(static_cast<google::protobuf::uint32>(hand->getCards().size()));
-    ges.setGameEventContext(context);
-
-    return Response::RespOk;
-}
-
-Response::ResponseCode
-Server_Player::cmdDrawCards(const Command_DrawCards &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
-{
-    if (!game->getGameStarted()) {
-        return Response::RespGameNotStarted;
-    }
-    if (conceded) {
-        return Response::RespContextError;
-    }
-
-    return drawCards(ges, cmd.number());
-}
-
-Response::ResponseCode
-Server_Player::cmdUndoDraw(const Command_UndoDraw & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges)
-{
-    if (!game->getGameStarted()) {
-        return Response::RespGameNotStarted;
-    }
-    if (conceded) {
-        return Response::RespContextError;
-    }
-
-    if (lastDrawList.isEmpty()) {
-        return Response::RespContextError;
-    }
-
-    Response::ResponseCode retVal;
-    auto *cardToMove = new CardToMove;
-    cardToMove->set_card_id(lastDrawList.takeLast());
-    retVal = moveCard(ges, zones.value(ZoneNames::HAND), QList<const CardToMove *>() << cardToMove,
-                      zones.value(ZoneNames::DECK), 0, 0, false, true);
-    delete cardToMove;
-
-    return retVal;
-}
-
-Response::ResponseCode
-Server_Player::cmdIncCounter(const Command_IncCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
-{
-    if (!game->getGameStarted()) {
-        return Response::RespGameNotStarted;
-    }
-    if (conceded) {
-        return Response::RespContextError;
-    }
-
-    Server_Counter *c = counters.value(cmd.counter_id(), 0);
-    if (!c) {
-        return Response::RespNameNotFound;
-    }
-
-    c->setCount(c->getCount() + cmd.delta());
-
-    Event_SetCounter event;
-    event.set_counter_id(c->getId());
-    event.set_value(c->getCount());
-    ges.enqueueGameEvent(event, playerId);
-
-    return Response::RespOk;
-}
-
-Response::ResponseCode
-Server_Player::cmdCreateCounter(const Command_CreateCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
-{
-    if (!game->getGameStarted()) {
-        return Response::RespGameNotStarted;
-    }
-    if (conceded) {
-        return Response::RespContextError;
-    }
-
-    auto *c = new Server_Counter(newCounterId(), nameFromStdString(cmd.counter_name()), cmd.counter_color(),
-                                 cmd.radius(), cmd.value());
-    addCounter(c);
-
-    Event_CreateCounter event;
-    ServerInfo_Counter *counterInfo = event.mutable_counter_info();
-    counterInfo->set_id(c->getId());
-    counterInfo->set_name(c->getName().toStdString());
-    counterInfo->mutable_counter_color()->CopyFrom(cmd.counter_color());
-    counterInfo->set_radius(c->getRadius());
-    counterInfo->set_count(c->getCount());
-    ges.enqueueGameEvent(event, playerId);
-
-    return Response::RespOk;
-}
-
-Response::ResponseCode
-Server_Player::cmdSetCounter(const Command_SetCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
-{
-    if (!game->getGameStarted()) {
-        return Response::RespGameNotStarted;
-    }
-    if (conceded) {
-        return Response::RespContextError;
-    }
-
-    Server_Counter *c = counters.value(cmd.counter_id(), 0);
-    if (!c) {
-        return Response::RespNameNotFound;
-    }
-
-    c->setCount(cmd.value());
-
-    Event_SetCounter event;
-    event.set_counter_id(c->getId());
-    event.set_value(c->getCount());
-    ges.enqueueGameEvent(event, playerId);
-
-    return Response::RespOk;
-}
-
-Response::ResponseCode
-Server_Player::cmdDelCounter(const Command_DelCounter &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
-{
-    if (!game->getGameStarted()) {
-        return Response::RespGameNotStarted;
-    }
-    if (conceded) {
-        return Response::RespContextError;
-    }
-
-    Server_Counter *counter = counters.value(cmd.counter_id(), 0);
-    if (!counter) {
-        return Response::RespNameNotFound;
-    }
-    counters.remove(cmd.counter_id());
-    delete counter;
-
-    Event_DelCounter event;
-    event.set_counter_id(cmd.counter_id());
-    ges.enqueueGameEvent(event, playerId);
-
-    return Response::RespOk;
-}
-
-Response::ResponseCode
-Server_Player::cmdNextTurn(const Command_NextTurn & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage & /*ges*/)
-{
-    if (!game->getGameStarted()) {
-        return Response::RespGameNotStarted;
-    }
-
-    if (conceded && !judge) {
-        return Response::RespContextError;
-    }
-
-    game->nextTurn();
-    return Response::RespOk;
-}
-
-Response::ResponseCode Server_Player::cmdSetActivePhase(const Command_SetActivePhase &cmd,
-                                                        ResponseContainer & /*rc*/,
-                                                        GameEventStorage & /*ges*/)
-{
-    if (!game->getGameStarted()) {
-        return Response::RespGameNotStarted;
-    }
-
-    if (!judge) {
-        if (conceded) {
-            return Response::RespContextError;
-        }
-
-        if (game->getActivePlayer() != playerId) {
-            return Response::RespContextError;
-        }
-    }
-
-    game->setActivePhase(cmd.phase());
-
-    return Response::RespOk;
-}
-
-Response::ResponseCode Server_Player::cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
-                                                              ResponseContainer &rc,
-                                                              GameEventStorage &ges)
-{
-    auto ret = Server_AbstractPlayer::cmdChangeZoneProperties(cmd, rc, ges);
-
-    Server_CardZone *zone = zones.value(nameFromStdString(cmd.zone_name()));
-    if (!zone) {
-        return Response::RespNameNotFound;
-    }
-
-    revealTopCardIfNeeded(zone, ges);
-    return ret;
-}
-
-Response::ResponseCode
-Server_Player::cmdReverseTurn(const Command_ReverseTurn &cmd, ResponseContainer &rc, GameEventStorage &ges)
-{
-
-    if (!judge && conceded) {
-        return Response::RespContextError;
-    }
-    return Server_AbstractParticipant::cmdReverseTurn(cmd, rc, ges);
-}
-
-void Server_Player::getInfo(ServerInfo_Player *info,
-                            Server_AbstractParticipant *recipient,
-                            bool omniscient,
-                            bool withUserInfo)
-{
-    Server_AbstractPlayer::getInfo(info, recipient, omniscient, withUserInfo);
-
-    for (Server_Counter *counter : counters) {
-        counter->getInfo(info->add_counter_list());
-    }
-}
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
deleted file mode 100644
index 5925ed3c2..000000000
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef PLAYER_H
-#define PLAYER_H
-
-#include "server_abstract_player.h"
-
-class Server_Player : public Server_AbstractPlayer
-{
-    Q_OBJECT
-private:
-    QMap<int, Server_Counter *> counters;
-    QList<int> lastDrawList;
-
-public:
-    Server_Player(Server_Game *_game,
-                  int _playerId,
-                  const ServerInfo_User &_userInfo,
-                  bool _judge,
-                  Server_AbstractUserInterface *_handler);
-    ~Server_Player() override;
-    const QMap<int, Server_Counter *> &getCounters() const
-    {
-        return counters;
-    }
-    int newCounterId() const;
-    void addCounter(Server_Counter *counter);
-
-    void setupZones() override;
-    void clearZones() override;
-
-    Response::ResponseCode drawCards(GameEventStorage &ges, int number);
-    void onCardBeingMoved(GameEventStorage &ges,
-                          const MoveCardStruct &cardStruct,
-                          Server_CardZone *startzone,
-                          Server_CardZone *targetzone,
-                          bool undoingDraw) override;
-
-    Response::ResponseCode
-    cmdDeckSelect(const Command_DeckSelect &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdSetSideboardPlan(const Command_SetSideboardPlan &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdSetSideboardLock(const Command_SetSideboardLock &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdShuffle(const Command_Shuffle &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdMulligan(const Command_Mulligan &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdDrawCards(const Command_DrawCards &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdUndoDraw(const Command_UndoDraw &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdIncCounter(const Command_IncCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdCreateCounter(const Command_CreateCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdSetCounter(const Command_SetCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdDelCounter(const Command_DelCounter &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdNextTurn(const Command_NextTurn &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdSetActivePhase(const Command_SetActivePhase &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
-    Response::ResponseCode
-    cmdReverseTurn(const Command_ReverseTurn & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges) override;
-    Response::ResponseCode cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
-                                                   ResponseContainer &rc,
-                                                   GameEventStorage &ges) override;
-
-    void getInfo(ServerInfo_Player *info,
-                 Server_AbstractParticipant *playerWhosAsking,
-                 bool omniscient,
-                 bool withUserInfo) override;
-};
-
-#endif
diff --git a/libcockatrice_protocol/CMakeLists.txt b/libcockatrice_protocol/CMakeLists.txt
deleted file mode 100644
index 7dc0a0360..000000000
--- a/libcockatrice_protocol/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Top-level wrapper for the protobuf library
-
-add_subdirectory(libcockatrice/protocol/pb)
-
-add_library(libcockatrice_protocol STATIC)
-
-set(SOURCES libcockatrice/protocol/debug_pb_message.cpp libcockatrice/protocol/featureset.cpp
-            libcockatrice/protocol/get_pb_extension.cpp libcockatrice/protocol/pending_command.cpp
-)
-
-set(HEADERS libcockatrice/protocol/debug_pb_message.h libcockatrice/protocol/featureset.h
-            libcockatrice/protocol/get_pb_extension.h libcockatrice/protocol/pending_command.h
-)
-
-target_sources(libcockatrice_protocol PRIVATE ${SOURCES} ${HEADERS})
-
-add_dependencies(libcockatrice_protocol libcockatrice_protocol_pb)
-
-# Link the actual generated protobuf library
-target_link_libraries(libcockatrice_protocol PUBLIC ${QT_CORE_MODULE} libcockatrice_protocol_pb libcockatrice_utility)
-
-# Expose include paths
-target_include_directories(
-  libcockatrice_protocol PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-                                ${CMAKE_CURRENT_BINARY_DIR} # points to the generated headers
-)
diff --git a/libcockatrice_rng/CMakeLists.txt b/libcockatrice_rng/CMakeLists.txt
deleted file mode 100644
index 6ff2a4537..000000000
--- a/libcockatrice_rng/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS libcockatrice/rng/rng_abstract.h libcockatrice/rng/rng_sfmt.h libcockatrice/rng/sfmt/SFMT.h)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(
-  libcockatrice_rng STATIC ${MOC_SOURCES} libcockatrice/rng/rng_abstract.cpp libcockatrice/rng/rng_sfmt.cpp
-                           libcockatrice/rng/sfmt/SFMT.c
-)
-
-target_include_directories(libcockatrice_rng PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(libcockatrice_rng PUBLIC ${QT_CORE_MODULE})
diff --git a/libcockatrice_settings/CMakeLists.txt b/libcockatrice_settings/CMakeLists.txt
deleted file mode 100644
index 3afe6e00a..000000000
--- a/libcockatrice_settings/CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS
-    libcockatrice/settings/card_database_settings.h
-    libcockatrice/settings/card_override_settings.h
-    libcockatrice/settings/debug_settings.h
-    libcockatrice/settings/download_settings.h
-    libcockatrice/settings/game_filters_settings.h
-    libcockatrice/settings/layouts_settings.h
-    libcockatrice/settings/message_settings.h
-    libcockatrice/settings/recents_settings.h
-    libcockatrice/settings/servers_settings.h
-    libcockatrice/settings/settings_manager.h
-)
-
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
-
-add_library(
-  libcockatrice_settings STATIC
-  ${MOC_SOURCES}
-  libcockatrice/settings/card_database_settings.cpp
-  libcockatrice/settings/card_override_settings.cpp
-  libcockatrice/settings/debug_settings.cpp
-  libcockatrice/settings/download_settings.cpp
-  libcockatrice/settings/game_filters_settings.cpp
-  libcockatrice/settings/layouts_settings.cpp
-  libcockatrice/settings/message_settings.cpp
-  libcockatrice/settings/recents_settings.cpp
-  libcockatrice/settings/servers_settings.cpp
-  libcockatrice/settings/settings_manager.cpp
-)
-
-target_include_directories(
-  libcockatrice_settings
-  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-  PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network
-)
-
-target_link_libraries(libcockatrice_settings PUBLIC libcockatrice_card libcockatrice_utility ${QT_CORE_MODULE})
diff --git a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
deleted file mode 100644
index bb946ea80..000000000
--- a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @file card_database_settings.h
- * @ingroup CardDatabase
- * @ingroup CardSettings
- * @brief TODO: Document this.
- */
-
-#ifndef CARDDATABASESETTINGS_H
-#define CARDDATABASESETTINGS_H
-
-#include "settings_manager.h"
-
-#include <libcockatrice/interfaces/interface_card_set_priority_controller.h>
-
-class CardDatabaseSettings : public SettingsManager, public ICardSetPriorityController
-{
-    Q_OBJECT
-    friend class SettingsCache;
-
-public:
-    void setSortKey(QString shortName, unsigned int sortKey) override;
-    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;
-
-private:
-    explicit CardDatabaseSettings(const QString &settingPath, QObject *parent = nullptr);
-};
-
-#endif // CARDDATABASESETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
deleted file mode 100644
index 4f5bf52ee..000000000
--- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-#include "game_filters_settings.h"
-
-#include <QCryptographicHash>
-#include <QTime>
-
-GameFiltersSettings::GameFiltersSettings(const QString &settingPath, QObject *parent)
-    : SettingsManager(settingPath + "gamefilters.ini", "filter_games", QString(), parent)
-{
-}
-
-/**
- * The game type might contain special characters, so to use it in
- * QSettings we just hash it.
- */
-static QString hashGameType(const QString &gameType)
-{
-    return QCryptographicHash::hash(gameType.toUtf8(), QCryptographicHash::Md5).toHex();
-}
-
-void GameFiltersSettings::setHideBuddiesOnlyGames(bool hide)
-{
-    setValue(hide, "hide_buddies_only_games");
-}
-
-bool GameFiltersSettings::isHideBuddiesOnlyGames() const
-{
-    QVariant previous = getValue("hide_buddies_only_games");
-    return previous == QVariant() ? false : previous.toBool();
-}
-
-void GameFiltersSettings::setHideFullGames(bool hide)
-{
-    setValue(hide, "hide_full_games");
-}
-
-bool GameFiltersSettings::isHideFullGames() const
-{
-    QVariant previous = getValue("hide_full_games");
-    return previous == QVariant() ? false : previous.toBool();
-}
-
-void GameFiltersSettings::setHideGamesThatStarted(bool hide)
-{
-    setValue(hide, "hide_games_that_started");
-}
-
-bool GameFiltersSettings::isHideGamesThatStarted() const
-{
-    QVariant previous = getValue("hide_games_that_started");
-    return previous == QVariant() ? false : previous.toBool();
-}
-
-void GameFiltersSettings::setHidePasswordProtectedGames(bool hide)
-{
-    setValue(hide, "hide_password_protected_games");
-}
-
-bool GameFiltersSettings::isHidePasswordProtectedGames() const
-{
-    QVariant previous = getValue("hide_password_protected_games");
-    return previous == QVariant() ? false : previous.toBool();
-}
-
-void GameFiltersSettings::setHideIgnoredUserGames(bool hide)
-{
-    setValue(hide, "hide_ignored_user_games");
-}
-
-bool GameFiltersSettings::isHideIgnoredUserGames() const
-{
-    QVariant previous = getValue("hide_ignored_user_games");
-    return previous == QVariant() ? true : previous.toBool();
-}
-
-void GameFiltersSettings::setHideNotBuddyCreatedGames(bool hide)
-{
-    setValue(hide, "hide_not_buddy_created_games");
-}
-
-bool GameFiltersSettings::isHideNotBuddyCreatedGames() const
-{
-    QVariant previous = getValue("hide_not_buddy_created_games");
-    return previous == QVariant() ? false : previous.toBool();
-}
-
-void GameFiltersSettings::setHideOpenDecklistGames(bool hide)
-{
-    setValue(hide, "hide_open_decklist_games");
-}
-
-bool GameFiltersSettings::isHideOpenDecklistGames() const
-{
-    QVariant previous = getValue("hide_open_decklist_games");
-    return previous == QVariant() ? false : previous.toBool();
-}
-
-void GameFiltersSettings::setGameNameFilter(QString gameName)
-{
-    setValue(gameName, "game_name_filter");
-}
-
-QString GameFiltersSettings::getGameNameFilter() const
-{
-    return getValue("game_name_filter").toString();
-}
-
-void GameFiltersSettings::setCreatorNameFilters(QStringList creatorName)
-{
-    setValue(creatorName, "creator_name_filter");
-}
-
-QStringList GameFiltersSettings::getCreatorNameFilters() const
-{
-    return getValue("creator_name_filter").toStringList();
-}
-
-void GameFiltersSettings::setMinPlayers(int min)
-{
-    setValue(min, "min_players");
-}
-
-int GameFiltersSettings::getMinPlayers() const
-{
-    QVariant previous = getValue("min_players");
-    return previous == QVariant() ? 1 : previous.toInt();
-}
-
-void GameFiltersSettings::setMaxPlayers(int max)
-{
-    setValue(max, "max_players");
-}
-
-int GameFiltersSettings::getMaxPlayers() const
-{
-    QVariant previous = getValue("max_players");
-    return previous == QVariant() ? 99 : previous.toInt();
-}
-
-void GameFiltersSettings::setMaxGameAge(const QTime &maxGameAge)
-{
-    setValue(maxGameAge, "max_game_age_time");
-}
-
-QTime GameFiltersSettings::getMaxGameAge() const
-{
-    QVariant previous = getValue("max_game_age_time");
-    return previous.toTime();
-}
-
-void GameFiltersSettings::setGameTypeEnabled(QString gametype, bool enabled)
-{
-    setValue(enabled, "game_type/" + hashGameType(gametype));
-}
-
-void GameFiltersSettings::setGameHashedTypeEnabled(QString gametypeHASHED, bool enabled)
-{
-    setValue(enabled, gametypeHASHED);
-}
-
-bool GameFiltersSettings::isGameTypeEnabled(QString gametype) const
-{
-    QVariant previous = getValue("game_type/" + hashGameType(gametype));
-    return previous == QVariant() ? false : previous.toBool();
-}
-
-void GameFiltersSettings::setShowOnlyIfSpectatorsCanWatch(bool show)
-{
-    setValue(show, "show_only_if_spectators_can_watch");
-}
-
-bool GameFiltersSettings::isShowOnlyIfSpectatorsCanWatch() const
-{
-    QVariant previous = getValue("show_only_if_spectators_can_watch");
-    return previous == QVariant() ? false : previous.toBool();
-}
-
-void GameFiltersSettings::setShowSpectatorPasswordProtected(bool show)
-{
-    setValue(show, "show_spectator_password_protected");
-}
-
-bool GameFiltersSettings::isShowSpectatorPasswordProtected() const
-{
-    QVariant previous = getValue("show_spectator_password_protected");
-    return previous == QVariant() ? false : previous.toBool();
-}
-
-void GameFiltersSettings::setShowOnlyIfSpectatorsCanChat(bool show)
-{
-    setValue(show, "show_only_if_spectators_can_chat");
-}
-
-bool GameFiltersSettings::isShowOnlyIfSpectatorsCanChat() const
-{
-    QVariant previous = getValue("show_only_if_spectators_can_chat");
-    return previous == QVariant() ? false : previous.toBool();
-}
-
-void GameFiltersSettings::setShowOnlyIfSpectatorsCanSeeHands(bool show)
-{
-    setValue(show, "show_only_if_spectators_can_see_hands");
-}
-
-bool GameFiltersSettings::isShowOnlyIfSpectatorsCanSeeHands() const
-{
-    QVariant previous = getValue("show_only_if_spectators_can_see_hands");
-    return previous == QVariant() ? false : previous.toBool();
-}
\ No newline at end of file
diff --git a/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
deleted file mode 100644
index e914dc2d8..000000000
--- a/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-#include "layouts_settings.h"
-
-const static QString STATE_PROP = "state";
-const static QString GEOMETRY_PROP = "geometry";
-const static QString SIZE_PROP = "widgetSize";
-
-const static QString GROUP_MAIN_WINDOW = "mainWindow";
-const static QString GROUP_DECK_EDITOR = "deckEditor";
-const static QString GROUP_VISUAL_DECK_EDITOR = "visualDeckEditor";
-const static QString GROUP_DECK_EDITOR_DB = "deckEditorDb";
-const static QString GROUP_SETS_DIALOG = "setsDialog";
-const static QString GROUP_TOKEN_DIALOG = "tokenDialog";
-const static QString GROUP_GAME_PLAY_AREA = "gamePlayArea";
-const static QString GROUP_REPLAY_PLAY_AREA = "replayPlayArea";
-
-LayoutsSettings::LayoutsSettings(const QString &settingPath, QObject *parent)
-    : SettingsManager(settingPath + "layouts.ini", QString(), QString(), parent)
-{
-}
-
-void LayoutsSettings::setMainWindowGeometry(const QByteArray &value)
-{
-    setValue(value, GEOMETRY_PROP, GROUP_MAIN_WINDOW);
-}
-
-QByteArray LayoutsSettings::getMainWindowGeometry() const
-{
-    return getValue(GEOMETRY_PROP, GROUP_MAIN_WINDOW).toByteArray();
-}
-
-QByteArray LayoutsSettings::getDeckEditorLayoutState() const
-{
-    return getValue(STATE_PROP, GROUP_DECK_EDITOR).toByteArray();
-}
-
-void LayoutsSettings::setDeckEditorLayoutState(const QByteArray &value)
-{
-    setValue(value, STATE_PROP, GROUP_DECK_EDITOR);
-}
-
-QByteArray LayoutsSettings::getDeckEditorGeometry() const
-{
-    return getValue(GEOMETRY_PROP, GROUP_DECK_EDITOR).toByteArray();
-}
-
-void LayoutsSettings::setDeckEditorGeometry(const QByteArray &value)
-{
-    setValue(value, GEOMETRY_PROP, GROUP_DECK_EDITOR);
-}
-
-QByteArray LayoutsSettings::getVisualDeckEditorLayoutState() const
-{
-    return getValue(STATE_PROP, GROUP_VISUAL_DECK_EDITOR).toByteArray();
-}
-
-void LayoutsSettings::setVisualDeckEditorLayoutState(const QByteArray &value)
-{
-    setValue(value, STATE_PROP, GROUP_VISUAL_DECK_EDITOR);
-}
-
-QByteArray LayoutsSettings::getVisualDeckEditorGeometry() const
-{
-    return getValue(GEOMETRY_PROP, GROUP_VISUAL_DECK_EDITOR).toByteArray();
-}
-
-void LayoutsSettings::setVisualDeckEditorGeometry(const QByteArray &value)
-{
-    setValue(value, GEOMETRY_PROP, GROUP_VISUAL_DECK_EDITOR);
-}
-
-QByteArray LayoutsSettings::getDeckEditorDbHeaderState() const
-{
-    return getValue(STATE_PROP, GROUP_DECK_EDITOR_DB, "header").toByteArray();
-}
-
-void LayoutsSettings::setDeckEditorDbHeaderState(const QByteArray &value)
-{
-    setValue(value, STATE_PROP, GROUP_DECK_EDITOR_DB, "header");
-}
-
-QByteArray LayoutsSettings::getSetsDialogHeaderState() const
-{
-    return getValue(STATE_PROP, GROUP_SETS_DIALOG, "header").toByteArray();
-}
-
-void LayoutsSettings::setSetsDialogHeaderState(const QByteArray &value)
-{
-    setValue(value, STATE_PROP, GROUP_SETS_DIALOG, "header");
-}
-
-void LayoutsSettings::setSetsDialogGeometry(const QByteArray &value)
-{
-    setValue(value, GEOMETRY_PROP, GROUP_SETS_DIALOG);
-}
-
-QByteArray LayoutsSettings::getSetsDialogGeometry() const
-{
-    return getValue(GEOMETRY_PROP, GROUP_SETS_DIALOG).toByteArray();
-}
-
-void LayoutsSettings::setTokenDialogGeometry(const QByteArray &value)
-{
-    setValue(value, GEOMETRY_PROP, GROUP_TOKEN_DIALOG);
-}
-
-QByteArray LayoutsSettings::getTokenDialogGeometry() const
-{
-    return getValue(GEOMETRY_PROP, GROUP_TOKEN_DIALOG).toByteArray();
-}
-
-void LayoutsSettings::setGamePlayAreaGeometry(const QByteArray &value)
-{
-    setValue(value, GEOMETRY_PROP, GROUP_GAME_PLAY_AREA);
-}
-
-void LayoutsSettings::setGamePlayAreaState(const QByteArray &value)
-{
-    setValue(value, STATE_PROP, GROUP_GAME_PLAY_AREA);
-}
-
-QByteArray LayoutsSettings::getGamePlayAreaLayoutState() const
-{
-    return getValue(STATE_PROP, GROUP_GAME_PLAY_AREA).toByteArray();
-}
-
-QByteArray LayoutsSettings::getGamePlayAreaGeometry() const
-{
-    return getValue(GEOMETRY_PROP, GROUP_GAME_PLAY_AREA).toByteArray();
-}
-
-void LayoutsSettings::setReplayPlayAreaGeometry(const QByteArray &value)
-{
-    setValue(value, GEOMETRY_PROP, GROUP_REPLAY_PLAY_AREA);
-}
-
-void LayoutsSettings::setReplayPlayAreaState(const QByteArray &value)
-{
-    setValue(value, STATE_PROP, GROUP_REPLAY_PLAY_AREA);
-}
-
-QByteArray LayoutsSettings::getReplayPlayAreaLayoutState() const
-{
-    return getValue(STATE_PROP, GROUP_REPLAY_PLAY_AREA).toByteArray();
-}
-
-QByteArray LayoutsSettings::getReplayPlayAreaGeometry() const
-{
-    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
deleted file mode 100644
index 5353ce15a..000000000
--- a/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * @file layouts_settings.h
- * @ingroup CoreSettings
- * @brief TODO: Document this.
- */
-
-#ifndef LAYOUTSSETTINGS_H
-#define LAYOUTSSETTINGS_H
-
-#include "settings_manager.h"
-
-#include <QSize>
-
-class LayoutsSettings : public SettingsManager
-{
-    Q_OBJECT
-    friend class SettingsCache;
-
-public:
-    void setMainWindowGeometry(const QByteArray &value);
-
-    void setDeckEditorLayoutState(const QByteArray &value);
-    void setDeckEditorGeometry(const QByteArray &value);
-
-    void setVisualDeckEditorLayoutState(const QByteArray &value);
-    void setVisualDeckEditorGeometry(const QByteArray &value);
-
-    void setDeckEditorDbHeaderState(const QByteArray &value);
-    void setSetsDialogHeaderState(const QByteArray &value);
-    void setSetsDialogGeometry(const QByteArray &value);
-    void setTokenDialogGeometry(const QByteArray &value);
-
-    void setGamePlayAreaGeometry(const QByteArray &value);
-    void setGamePlayAreaState(const QByteArray &value);
-
-    void setReplayPlayAreaGeometry(const QByteArray &value);
-    void setReplayPlayAreaState(const QByteArray &value);
-
-    QByteArray getMainWindowGeometry() const;
-
-    QByteArray getDeckEditorLayoutState() const;
-    QByteArray getDeckEditorGeometry() const;
-
-    QByteArray getVisualDeckEditorLayoutState() const;
-    QByteArray getVisualDeckEditorGeometry() const;
-
-    QByteArray getDeckEditorDbHeaderState() const;
-    QByteArray getSetsDialogHeaderState() const;
-    QByteArray getSetsDialogGeometry() const;
-    QByteArray getTokenDialogGeometry() const;
-
-    QByteArray getGamePlayAreaLayoutState() const;
-    QByteArray getGamePlayAreaGeometry() const;
-
-    QByteArray getReplayPlayAreaLayoutState() const;
-    QByteArray getReplayPlayAreaGeometry() const;
-signals:
-
-public slots:
-
-private:
-    explicit LayoutsSettings(const QString &settingPath, QObject *parent = nullptr);
-    LayoutsSettings(const LayoutsSettings & /*other*/);
-};
-
-#endif // LAYOUTSSETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/message_settings.cpp b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
deleted file mode 100644
index 50da39df6..000000000
--- a/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "message_settings.h"
-
-MessageSettings::MessageSettings(const QString &settingPath, QObject *parent)
-    : SettingsManager(settingPath + "messages.ini", "messages", QString(), parent)
-{
-}
-
-QString MessageSettings::getMessageAt(int index) const
-{
-    return getValue(QString("msg%1").arg(index)).toString();
-}
-
-int MessageSettings::getCount() const
-{
-    return getValue("count").toInt();
-}
-
-void MessageSettings::setCount(int count)
-{
-    setValue(count, "count");
-}
-
-void MessageSettings::setMessageAt(int index, QString message)
-{
-    setValue(message, QString("msg%1").arg(index));
-}
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
deleted file mode 100644
index 2d4f1c441..000000000
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-#include "settings_manager.h"
-
-SettingsManager::SettingsManager(const QString &_settingPath,
-                                 const QString &_defaultGroup,
-                                 const QString &_defaultSubGroup,
-                                 QObject *parent)
-    : QObject(parent), settingPath(_settingPath), defaultGroup(_defaultGroup), defaultSubGroup(_defaultSubGroup)
-{
-}
-
-QSettings SettingsManager::getSettings() const
-{
-    return QSettings(settingPath, QSettings::IniFormat);
-}
-
-void SettingsManager::setValue(const QVariant &value, const QString &name)
-{
-    auto settings = getSettings();
-
-    if (!defaultGroup.isEmpty()) {
-        settings.beginGroup(defaultGroup);
-    }
-
-    if (!defaultSubGroup.isEmpty()) {
-        settings.beginGroup(defaultSubGroup);
-    }
-
-    settings.setValue(name, value);
-
-    if (!defaultSubGroup.isEmpty()) {
-        settings.endGroup();
-    }
-
-    if (!defaultGroup.isEmpty()) {
-        settings.endGroup();
-    }
-}
-
-void SettingsManager::setValue(const QVariant &value,
-                               const QString &name,
-                               const QString &group,
-                               const QString &subGroup)
-{
-    auto settings = getSettings();
-
-    if (!group.isEmpty()) {
-        settings.beginGroup(group);
-    }
-
-    if (!subGroup.isEmpty()) {
-        settings.beginGroup(subGroup);
-    }
-
-    settings.setValue(name, value);
-
-    if (!subGroup.isEmpty()) {
-        settings.endGroup();
-    }
-
-    if (!group.isEmpty()) {
-        settings.endGroup();
-    }
-}
-
-void SettingsManager::deleteValue(const QString &name)
-{
-    auto settings = getSettings();
-
-    if (!defaultGroup.isEmpty()) {
-        settings.beginGroup(defaultGroup);
-    }
-
-    if (!defaultSubGroup.isEmpty()) {
-        settings.beginGroup(defaultSubGroup);
-    }
-
-    settings.remove(name);
-
-    if (!defaultSubGroup.isEmpty()) {
-        settings.endGroup();
-    }
-
-    if (!defaultGroup.isEmpty()) {
-        settings.endGroup();
-    }
-}
-
-void SettingsManager::deleteValue(const QString &name, const QString &group, const QString &subGroup)
-{
-    auto settings = getSettings();
-
-    if (!group.isEmpty()) {
-        settings.beginGroup(group);
-    }
-
-    if (!subGroup.isEmpty()) {
-        settings.beginGroup(subGroup);
-    }
-
-    settings.remove(name);
-
-    if (!subGroup.isEmpty()) {
-        settings.endGroup();
-    }
-
-    if (!group.isEmpty()) {
-        settings.endGroup();
-    }
-}
-
-QVariant SettingsManager::getValue(const QString &name) const
-{
-    auto settings = getSettings();
-
-    if (!defaultGroup.isEmpty()) {
-        settings.beginGroup(defaultGroup);
-    }
-
-    if (!defaultSubGroup.isEmpty()) {
-        settings.beginGroup(defaultSubGroup);
-    }
-
-    QVariant value = settings.value(name);
-
-    if (!defaultSubGroup.isEmpty()) {
-        settings.endGroup();
-    }
-
-    if (!defaultGroup.isEmpty()) {
-        settings.endGroup();
-    }
-
-    return value;
-}
-
-QVariant SettingsManager::getValue(const QString &name, const QString &group, const QString &subGroup) const
-{
-    auto settings = getSettings();
-
-    if (!group.isEmpty()) {
-        settings.beginGroup(group);
-    }
-
-    if (!subGroup.isEmpty()) {
-        settings.beginGroup(subGroup);
-    }
-
-    QVariant value = settings.value(name);
-
-    if (!subGroup.isEmpty()) {
-        settings.endGroup();
-    }
-
-    if (!group.isEmpty()) {
-        settings.endGroup();
-    }
-
-    return value;
-}
-
-/**
- * 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
deleted file mode 100644
index ad828f089..000000000
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file settings_manager.h
- * @ingroup Settings
- * @brief TODO: Document this.
- */
-
-#ifndef SETTINGSMANAGER_H
-#define SETTINGSMANAGER_H
-
-#include <QSettings>
-#include <QStringList>
-#include <QVariant>
-
-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 sync();
-
-protected:
-    QString settingPath;
-    QString defaultGroup;
-    QString defaultSubGroup;
-
-    QSettings getSettings() const;
-
-    void setValue(const QVariant &value, const QString &name);
-    void
-    setValue(const QVariant &value, const QString &name, const QString &group, const QString &subGroup = QString());
-    void deleteValue(const QString &name);
-    void deleteValue(const QString &name, const QString &group, const QString &subGroup = QString());
-};
-
-#endif // SETTINGSMANAGER_H
diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt
deleted file mode 100644
index c0c7d8cc9..000000000
--- a/libcockatrice_utility/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-project(Utility VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(UTILITY_SOURCES libcockatrice/utility/expression.cpp libcockatrice/utility/levenshtein.cpp
-                    libcockatrice/utility/passwordhasher.cpp
-)
-
-set(UTILITY_HEADERS
-    libcockatrice/utility/color.h
-    libcockatrice/utility/expression.h
-    libcockatrice/utility/levenshtein.h
-    libcockatrice/utility/macros.h
-    libcockatrice/utility/passwordhasher.h
-    libcockatrice/utility/trice_limits.h
-    libcockatrice/utility/zone_names.h
-)
-
-add_library(libcockatrice_utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS})
-
-target_include_directories(libcockatrice_utility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng ${QT_CORE_MODULE})
-
-set(ORACLE_LIBS)
-
-include_directories(${${COCKATRICE_QT_VERSION_NAME}Core_INCLUDE_DIRS})
diff --git a/libcockatrice_utility/libcockatrice/utility/color.h b/libcockatrice_utility/libcockatrice/utility/color.h
deleted file mode 100644
index f02df3a0e..000000000
--- a/libcockatrice_utility/libcockatrice/utility/color.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef COLOR_H
-#define COLOR_H
-
-#ifdef QT_GUI_LIB
-#include <QColor>
-#endif
-
-#include <libcockatrice/protocol/pb/color.pb.h>
-
-#ifdef QT_GUI_LIB
-inline QColor convertColorToQColor(const color &c)
-{
-    return QColor(c.r(), c.g(), c.b());
-}
-
-inline color convertQColorToColor(const QColor &c)
-{
-    color result;
-    result.set_r(c.red());
-    result.set_g(c.green());
-    result.set_b(c.blue());
-    return result;
-}
-
-#include <QSet>
-
-namespace GameSpecificColors
-{
-namespace MTG
-{
-inline QColor colorHelper(const QString &name)
-{
-    static const QMap<QString, QColor> colorMap = {
-        {"W", QColor(245, 245, 220)},
-        {"U", QColor(80, 140, 255)},
-        {"B", QColor(60, 60, 60)},
-        {"R", QColor(220, 60, 50)},
-        {"G", QColor(70, 160, 70)},
-        {"Creature", QColor(70, 130, 180)},
-        {"Instant", QColor(138, 43, 226)},
-        {"Sorcery", QColor(199, 21, 133)},
-        {"Enchantment", QColor(218, 165, 32)},
-        {"Artifact", QColor(169, 169, 169)},
-        {"Planeswalker", QColor(210, 105, 30)},
-        {"Land", QColor(110, 80, 50)},
-    };
-
-    if (colorMap.contains(name))
-        return colorMap[name];
-
-    if (name.length() == 1 && colorMap.contains(name.toUpper()))
-        return colorMap[name.toUpper()];
-
-    uint h = qHash(name);
-    int r = 100 + (h % 120);
-    int g = 100 + ((h >> 8) % 120);
-    int b = 100 + ((h >> 16) % 120);
-
-    return QColor(r, g, b);
-}
-
-inline QList<QPair<QString, int>> sortManaMapWUBRGCFirst(const QMap<QString, int> &input)
-{
-    static const QStringList priorityOrder = {"W", "U", "B", "R", "G", "C"};
-
-    QList<QPair<QString, int>> result;
-    QSet<QString> consumed;
-
-    // 1. Add priority colors in fixed order
-    for (const QString &key : priorityOrder) {
-        auto it = input.find(key);
-        if (it != input.end()) {
-            result.append({it.key(), it.value()});
-            consumed.insert(it.key());
-        }
-    }
-
-    // 2. Add remaining keys (QMap iteration is already sorted)
-    for (auto it = input.begin(); it != input.end(); ++it) {
-        if (!consumed.contains(it.key())) {
-            result.append({it.key(), it.value()});
-        }
-    }
-
-    return result;
-}
-} // namespace MTG
-} // namespace GameSpecificColors
-#endif
-
-inline color makeColor(int r, int g, int b)
-{
-    color result;
-    result.set_r(r);
-    result.set_g(g);
-    result.set_b(b);
-    return result;
-}
-
-#endif
diff --git a/libcockatrice_utility/libcockatrice/utility/peglib.h b/libcockatrice_utility/libcockatrice/utility/peglib.h
deleted file mode 100644
index 3ae6040c4..000000000
--- a/libcockatrice_utility/libcockatrice/utility/peglib.h
+++ /dev/null
@@ -1,5758 +0,0 @@
-//
-//  peglib.h
-//
-//  Copyright (c) 2022 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#pragma once
-
-/*
- * Configuration
- */
-
-#ifndef CPPPEGLIB_HEURISTIC_ERROR_TOKEN_MAX_CHAR_COUNT
-#define CPPPEGLIB_HEURISTIC_ERROR_TOKEN_MAX_CHAR_COUNT 32
-#endif
-
-#include <algorithm>
-#include <any>
-#include <bitset>
-#include <cassert>
-#include <cctype>
-#if __has_include(<charconv>)
-#include <charconv>
-#endif
-#include <cstring>
-#include <functional>
-#include <initializer_list>
-#include <iostream>
-#include <limits>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <optional>
-#include <set>
-#include <sstream>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#if !defined(__cplusplus) || __cplusplus < 201703L
-#error "Requires complete C++17 support"
-#endif
-
-namespace peg {
-
-/*-----------------------------------------------------------------------------
- *  scope_exit
- *---------------------------------------------------------------------------*/
-
-// This is based on
-// "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} {}
-
-  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(); }
-  }
-
-  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;
-
-  EF exit_function;
-  bool execute_on_destruction;
-};
-
-/*-----------------------------------------------------------------------------
- *  UTF8 functions
- *---------------------------------------------------------------------------*/
-
-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;
-    }
-  }
-  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;
-    }
-    i += len;
-    count++;
-  }
-  return count;
-}
-
-inline size_t encode_codepoint(char32_t cp, char *buff) {
-  if (cp < 0x0080) {
-    buff[0] = static_cast<char>(cp & 0x7F);
-    return 1;
-  } else if (cp < 0x0800) {
-    buff[0] = static_cast<char>(0xC0 | ((cp >> 6) & 0x1F));
-    buff[1] = static_cast<char>(0x80 | (cp & 0x3F));
-    return 2;
-  } else if (cp < 0xD800) {
-    buff[0] = static_cast<char>(0xE0 | ((cp >> 12) & 0xF));
-    buff[1] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | (cp & 0x3F));
-    return 3;
-  } else if (cp < 0xE000) {
-    // D800 - DFFF is invalid...
-    return 0;
-  } else if (cp < 0x10000) {
-    buff[0] = static_cast<char>(0xE0 | ((cp >> 12) & 0xF));
-    buff[1] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | (cp & 0x3F));
-    return 3;
-  } else if (cp < 0x110000) {
-    buff[0] = static_cast<char>(0xF0 | ((cp >> 18) & 0x7));
-    buff[1] = static_cast<char>(0x80 | ((cp >> 12) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
-    buff[3] = static_cast<char>(0x80 | (cp & 0x3F));
-    return 4;
-  }
-  return 0;
-}
-
-inline std::string encode_codepoint(char32_t cp) {
-  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;
-      }
-    }
-  }
-  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;
-}
-
-inline char32_t decode_codepoint(const char *s8, size_t l) {
-  char32_t cp = 0;
-  decode_codepoint(s8, l, cp);
-  return cp;
-}
-
-inline std::u32string decode(const char *s8, size_t l) {
-  std::u32string out;
-  size_t i = 0;
-  while (i < l) {
-    auto beg = i++;
-    while (i < l && (s8[i] & 0xc0) == 0x80) {
-      i++;
-    }
-    out += decode_codepoint(&s8[beg], (i - beg));
-  }
-  return out;
-}
-
-template <typename T> const char *u8(const T *s) {
-  return reinterpret_cast<const char *>(s);
-}
-
-/*-----------------------------------------------------------------------------
- *  escape_characters
- *---------------------------------------------------------------------------*/
-
-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;
-    }
-  }
-  return str;
-}
-
-inline std::string escape_characters(std::string_view sv) {
-  return escape_characters(sv.data(), sv.size());
-}
-
-/*-----------------------------------------------------------------------------
- *  resolve_escape_sequence
- *---------------------------------------------------------------------------*/
-
-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;
-}
-
-inline bool is_digit(char c, int &v) {
-  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);
-}
-
-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);
-}
-
-inline std::string resolve_escape_sequence(const char *s, size_t 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++;
-    }
-  }
-  return r;
-}
-
-/*-----------------------------------------------------------------------------
- *  token_to_number_ - This function should be removed eventually
- *---------------------------------------------------------------------------*/
-
-template <typename T> T token_to_number_(std::string_view sv) {
-  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);
-#else
-  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;
-}
-
-/*-----------------------------------------------------------------------------
- *  Trie
- *---------------------------------------------------------------------------*/
-
-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;
-        }
-      }
-      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;
-        }
-        if (it->second.done) { done = true; }
-      }
-      len += 1;
-    }
-    return match_len;
-  }
-
-  size_t size() const { return dic_.size(); }
-  size_t items_count() const { return items_count_; }
-
-  friend struct ComputeFirstSet;
-
-private:
-  struct Info {
-    bool done;
-    bool match;
-    size_t id;
-  };
-
-  // TODO: Use unordered_map when heterogeneous lookup is supported in C++20
-  // std::unordered_map<std::string, Info> dic_;
-  std::map<std::string, Info, std::less<>> dic_;
-
-  bool ignore_case_;
-  size_t items_count_;
-  size_t max_len_ = 0;
-};
-
-/*-----------------------------------------------------------------------------
- *  PEG
- *---------------------------------------------------------------------------*/
-
-/*
- * 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;
-
-  while (p < cur) {
-    if (*p == '\n') {
-      no++;
-      col_ptr = p + 1;
-    }
-    p++;
-  }
-
-  auto col = codepoint_count(col_ptr, p - col_ptr) + 1;
-
-  return std::pair(no, col);
-}
-
-/*
- * String tag
- */
-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));
-}
-
-inline constexpr unsigned int str2tag(std::string_view sv) {
-  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);
-}
-
-} // namespace udl
-
-/*
- * Semantic values
- */
-class Context;
-
-struct SemanticValues : protected std::vector<std::any> {
-  SemanticValues() = default;
-  SemanticValues(Context *c) : c_(c) {}
-
-  // Input text
-  const char *path = nullptr;
-  const char *ss = nullptr;
-
-  // Matched string
-  std::string_view sv() const { return sv_; }
-
-  // Definition name
-  const std::string &name() const { return name_; }
-
-  std::vector<unsigned int> tags;
-
-  // 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 number (0 based index)
-  size_t choice() const { return choice_; }
-
-  // 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]));
-    }
-    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;
-
-private:
-  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_;
-};
-
-/*
- * 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)...));
-  }
-}
-
-template <typename T>
-struct argument_count : argument_count<decltype(&T::operator())> {};
-template <typename R, typename... Args>
-struct argument_count<R (*)(Args...)>
-    : std::integral_constant<unsigned, sizeof...(Args)> {};
-template <typename R, typename C, typename... Args>
-struct argument_count<R (C::*)(Args...)>
-    : std::integral_constant<unsigned, sizeof...(Args)> {};
-template <typename R, typename C, typename... Args>
-struct argument_count<R (C::*)(Args...) const>
-    : std::integral_constant<unsigned, sizeof...(Args)> {};
-
-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;
-
-  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);
-  }
-
-private:
-  using Fty = std::function<std::any(SemanticValues &vs, std::any &dt,
-                                     const std::any &predicate_data)>;
-
-  template <typename F> Fty make_adaptor(F fn) {
-    if constexpr (argument_count<F>::value == 1) {
-      return [fn](auto &vs, auto & /*dt*/, const auto & /*predicate_data*/) {
-        return call(fn, vs);
-      };
-    } else if constexpr (argument_count<F>::value == 2) {
-      return [fn](auto &vs, auto &dt, const auto & /*predicate_data*/) {
-        return call(fn, vs, dt);
-      };
-    } else {
-      return [fn](auto &vs, auto &dt, const auto &predicate_data) {
-        return call(fn, vs, dt, predicate_data);
-      };
-    }
-  }
-
-  Fty fn_;
-};
-
-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_;
-};
-
-/*
- * Parse result helper
- */
-inline bool success(size_t len) { return len != static_cast<size_t>(-1); }
-
-inline bool fail(size_t len) { return len == static_cast<size_t>(-1); }
-
-/*
- * Log
- */
-using Log = std::function<void(size_t line, size_t col, const std::string &msg,
-                               const std::string &rule)>;
-
-/*
- * ErrorInfo
- */
-class Definition;
-
-struct ErrorInfo {
-  const char *error_pos = nullptr;
-  std::vector<std::pair<const char *, const Definition *>> expected_tokens;
-  const char *message_pos = nullptr;
-  std::string message;
-  std::string label;
-  const char *last_output_pos = nullptr;
-  bool keep_previous_token = false;
-
-  void clear() {
-    error_pos = nullptr;
-    expected_tokens.clear();
-    message_pos = nullptr;
-    message.clear();
-  }
-
-  void add(const char *error_literal, const Definition *error_rule) {
-    for (const auto &[t, r] : expected_tokens) {
-      if (t == error_literal && r == error_rule) { return; }
-    }
-    expected_tokens.emplace_back(error_literal, error_rule);
-  }
-
-  void output_log(const Log &log, const char *s, size_t n);
-
-private:
-  int cast_char(char c) const { return static_cast<unsigned char>(c); }
-
-  std::string heuristic_error_token(const char *s, size_t n,
-                                    const char *pos) const {
-    auto len = n - std::distance(s, pos);
-    if (len) {
-      size_t i = 0;
-      auto c = cast_char(pos[i++]);
-      if (!std::ispunct(c) && !std::isspace(c)) {
-        while (i < len && !std::ispunct(cast_char(pos[i])) &&
-               !std::isspace(cast_char(pos[i]))) {
-          i++;
-        }
-      }
-
-      size_t count = CPPPEGLIB_HEURISTIC_ERROR_TOKEN_MAX_CHAR_COUNT;
-      size_t j = 0;
-      while (count > 0 && j < i) {
-        j += codepoint_length(&pos[j], i - j);
-        count--;
-      }
-
-      return escape_characters(pos, j);
-    }
-    return std::string();
-  }
-
-  std::string replace_all(std::string str, const std::string &from,
-                          const std::string &to) const {
-    size_t pos = 0;
-    while ((pos = str.find(from, pos)) != std::string::npos) {
-      str.replace(pos, from.length(), to);
-      pos += to.length();
-    }
-    return str;
-  }
-};
-
-/*
- * Context
- */
-class Ope;
-
-using TracerEnter = std::function<void(
-    const Ope &name, const char *s, size_t n, const SemanticValues &vs,
-    const Context &c, const std::any &dt, std::any &trace_data)>;
-
-using TracerLeave = std::function<void(
-    const Ope &ope, const char *s, size_t n, const SemanticValues &vs,
-    const Context &c, const std::any &dt, size_t, std::any &trace_data)>;
-
-using TracerStartOrEnd = std::function<void(std::any &trace_data)>;
-
-class Context {
-public:
-  const char *path;
-  const char *s;
-  const size_t l;
-
-  ErrorInfo error_info;
-  bool recovered = false;
-
-  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;
-
-  size_t in_token_boundary_count = 0;
-
-  std::shared_ptr<Ope> whitespaceOpe;
-  bool in_whitespace = false;
-
-  std::shared_ptr<Ope> wordOpe;
-
-  std::vector<std::pair<std::string_view, std::string>> capture_entries;
-
-  std::vector<bool> cut_stack;
-
-  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;
-
-  // 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;
-
-  // Rules whose lr_memo was hit during the current parse scope.
-  // Used to track LR cycle membership.
-  std::set<const Definition *> lr_refs_hit;
-
-  // Rules currently in their seeding/growing phase at a given position.
-  // Protected from having their lr_memo erased by inner growers.
-  std::set<std::pair<const Definition *, const char *>> lr_active_seeds;
-
-  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;
-    }
-
-    auto col = a_s - s;
-    auto idx = def_count * static_cast<size_t>(col) + def_id;
-
-    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(); }
-    }
-
-    auto &vs = *value_stack[value_stack_size++];
-    vs.path = path;
-    vs.ss = s;
-    return vs;
-  }
-
-  void pop_semantic_values_scope() { value_stack_size--; }
-
-  // Arguments
-  void push_args(std::vector<std::shared_ptr<Ope>> &&args) {
-    args_stack.emplace_back(std::move(args));
-  }
-
-  void pop_args() { args_stack.pop_back(); }
-
-  const std::vector<std::shared_ptr<Ope>> &top_args() const {
-    return args_stack[args_stack.size() - 1];
-  }
-
-  // Snapshot/Rollback
-  struct Snapshot {
-    size_t sv_size;
-    size_t sv_tags_size;
-    size_t sv_tokens_size;
-    std::string_view sv_sv;
-    size_t choice_count;
-    size_t choice;
-    size_t capture_size;
-  };
-
-  Snapshot snapshot(const SemanticValues &vs) const {
-    return {vs.size(),        vs.tags.size(), vs.tokens.size(),      vs.sv_,
-            vs.choice_count_, vs.choice_,     capture_entries.size()};
-  }
-
-  void 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);
-  }
-
-  // Skip trailing whitespace with trace suppression.
-  // Returns whitespace length, or -1 on failure.
-  // No-op (returns 0) if inside a token boundary or no whitespaceOpe.
-  size_t skip_whitespace(const char *a_s, size_t n, SemanticValues &vs,
-                         std::any &dt);
-
-  // Error
-  void set_error_pos(const char *a_s, const char *literal = nullptr);
-
-  // 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;
-};
-
-/*
- * Parser operators
- */
-class Ope {
-public:
-  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; });
-  }
-};
-
-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)) {}
-
-  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                    std::any &dt) const override {
-    // Keyword-guarded identifier fast path:
-    // Fuses !ReservedKeyword <identifier> into scan-then-lookup
-    if (kw_guard_) {
-      if (auto result = parse_keyword_guarded(s, n, vs, c, dt)) {
-        return *result;
-      }
-      // nullopt means prefix keyword match — fall through to normal path
-    }
-    size_t i = 0;
-    for (const auto &ope : opes_) {
-      auto len = ope->parse(s + i, n - i, vs, c, dt);
-      if (fail(len)) { return len; }
-      i += len;
-    }
-    return i;
-  }
-
-  void accept(Visitor &v) override;
-
-  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
-  }
-};
-
-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;
-  }
-
-  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(); }
-    });
-
-    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);
-              }
-            }
-          }
-          id++;
-          continue;
-        }
-      }
-
-      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++;
-    }
-
-    c.error_info.keep_previous_token = false;
-    return len;
-  }
-
-  void accept(Visitor &v) override;
-
-  size_t size() const { return opes_.size(); }
-
-  std::vector<std::shared_ptr<Ope>> opes_;
-  bool for_label_ = false;
-  std::vector<FirstSet> first_sets_;
-};
-
-class Repetition : public Ope {
-public:
-  Repetition(const std::shared_ptr<Ope> &ope, size_t min, size_t max)
-      : ope_(ope), min_(min), max_(max) {}
-
-  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++;
-        }
-      } else {
-        auto limit = std::min(n, max_);
-        while (i < limit && bitset.test(static_cast<unsigned char>(s[i]))) {
-          i++;
-        }
-      }
-      if (i < min_) {
-        c.set_error_pos(s + i);
-        return static_cast<size_t>(-1);
-      }
-      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++;
-    }
-
-    while (count < max_) {
-      auto snap = c.snapshot(vs);
-      auto len = ope_->parse(s + i, n - i, vs, c, dt);
-      if (fail(len)) {
-        c.rollback(vs, snap);
-        break;
-      }
-      i += len;
-      count++;
-    }
-    return i;
-  }
-
-  void accept(Visitor &v) override;
-
-  bool is_zom() const {
-    return min_ == 0 && max_ == std::numeric_limits<size_t>::max();
-  }
-
-  static std::shared_ptr<Repetition> zom(const std::shared_ptr<Ope> &ope) {
-    return std::make_shared<Repetition>(ope, 0,
-                                        std::numeric_limits<size_t>::max());
-  }
-
-  static std::shared_ptr<Repetition> oom(const std::shared_ptr<Ope> &ope) {
-    return std::make_shared<Repetition>(ope, 1,
-                                        std::numeric_limits<size_t>::max());
-  }
-
-  static std::shared_ptr<Repetition> opt(const std::shared_ptr<Ope> &ope) {
-    return std::make_shared<Repetition>(ope, 0, 1);
-  }
-
-  std::shared_ptr<Ope> ope_;
-  size_t min_;
-  size_t max_;
-  const std::bitset<256> *span_bitset_ =
-      nullptr; // non-owning, set by SetupFirstSets
-};
-
-class AndPredicate : public Ope {
-public:
-  AndPredicate(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
-
-  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                    std::any &dt) const override {
-    auto snap = c.snapshot(vs);
-    auto len = ope_->parse(s, n, vs, c, dt);
-    c.rollback(vs, snap); // Always rollback — predicates consume nothing
-    if (success(len)) {
-      return 0;
-    } else {
-      return len;
-    }
-  }
-
-  void accept(Visitor &v) override;
-
-  std::shared_ptr<Ope> ope_;
-};
-
-class NotPredicate : public Ope {
-public:
-  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;
-    }
-  }
-
-  void accept(Visitor &v) override;
-
-  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;
-  }
-
-  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                    std::any &dt) const override;
-
-  void accept(Visitor &v) override;
-
-  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(const std::string &s, bool ignore_case)
-      : lit_(s), ignore_case_(ignore_case),
-        lower_lit_(ignore_case ? to_lower(lit_) : std::string()),
-        is_word_(false) {}
-
-  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                    std::any &dt) const override;
-
-  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_;
-};
-
-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;
-        }
-      }
-    }
-
-    if (negated_) {
-      return len;
-    } else {
-      c.set_error_pos(s);
-      return static_cast<size_t>(-1);
-    }
-  }
-
-  void accept(Visitor &v) override;
-
-  friend struct ComputeFirstSet;
-
-  bool is_ascii_only() const { return is_ascii_only_; }
-  const std::bitset<256> &ascii_bitset() const { return ascii_bitset_; }
-
-private:
-  bool in_range(const std::pair<char32_t, char32_t> &range, char32_t cp) const {
-    if (ignore_case_) {
-      auto cpl = std::tolower(cp);
-      return std::tolower(range.first) <= cpl &&
-             cpl <= std::tolower(range.second);
-    } else {
-      return range.first <= cp && cp <= range.second;
-    }
-  }
-
-  void setup_ascii_bitset() {
-    if (negated_) { return; } // negated classes can match non-ASCII
-    for (const auto &[lo, hi] : ranges_) {
-      if (lo > 0x7F || hi > 0x7F) { return; }
-    }
-    is_ascii_only_ = true;
-    for (const auto &[lo, hi] : ranges_) {
-      for (auto cp = lo; cp <= hi; cp++) {
-        auto ch = static_cast<unsigned char>(cp);
-        ascii_bitset_.set(ch);
-        if (ignore_case_) {
-          ascii_bitset_.set(static_cast<unsigned char>(std::toupper(ch)));
-          ascii_bitset_.set(static_cast<unsigned char>(std::tolower(ch)));
-        }
-      }
-    }
-  }
-
-  std::vector<std::pair<char32_t, char32_t>> ranges_;
-  bool negated_;
-  bool ignore_case_;
-  std::bitset<256> ascii_bitset_;
-  bool is_ascii_only_ = false;
-};
-
-class Character : public Ope, public std::enable_shared_from_this<Character> {
-public:
-  Character(char32_t ch) : ch_(ch) {}
-
-  size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
-                    Context &c, std::any & /*dt*/) const override {
-    if (n < 1) {
-      c.set_error_pos(s);
-      return static_cast<size_t>(-1);
-    }
-
-    char32_t cp = 0;
-    auto len = decode_codepoint(s, n, cp);
-
-    if (cp != ch_) {
-      c.set_error_pos(s);
-      return static_cast<size_t>(-1);
-    }
-    return len;
-  }
-
-  void accept(Visitor &v) override;
-
-  char32_t ch_;
-};
-
-class AnyCharacter : public Ope,
-                     public std::enable_shared_from_this<AnyCharacter> {
-public:
-  size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
-                    Context &c, std::any & /*dt*/) const override {
-    auto len = codepoint_length(s, n);
-    if (len < 1) {
-      c.set_error_pos(s);
-      return static_cast<size_t>(-1);
-    }
-    return len;
-  }
-
-  void accept(Visitor &v) override;
-};
-
-class CaptureScope : public Ope {
-public:
-  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;
-  }
-
-  void accept(Visitor &v) override;
-
-  std::shared_ptr<Ope> ope_;
-};
-
-class Capture : public Ope {
-public:
-  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) {}
-
-  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;
-
-  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;
-  }
-
-  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                    std::any &dt) const override;
-
-  void accept(Visitor &v) override;
-
-  std::shared_ptr<Ope> ope_;
-};
-
-class Ignore : public Ope {
-public:
-  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);
-  }
-
-  void accept(Visitor &v) override;
-
-  std::shared_ptr<Ope> ope_;
-};
-
-using Parser = std::function<size_t(const char *s, size_t n, SemanticValues &vs,
-                                    std::any &dt)>;
-
-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_;
-};
-
-class WeakHolder : public Ope {
-public:
-  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);
-  }
-
-  void accept(Visitor &v) override;
-
-  std::weak_ptr<Ope> weak_;
-};
-
-class Holder : public Ope {
-public:
-  Holder(Definition *outer) : outer_(outer) {}
-
-  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                    std::any &dt) const override;
-
-  void accept(Visitor &v) override;
-
-  std::any reduce(SemanticValues &vs, std::any &dt,
-                  const std::any &predicate_data) const;
-
-  const std::string &name() const;
-  const std::string &trace_name() const;
-
-  std::shared_ptr<Ope> ope_;
-  Definition *outer_;
-  mutable std::once_flag trace_name_init_;
-  mutable std::string trace_name_;
-
-  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) {}
-
-  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                    std::any &dt) const override;
-
-  void accept(Visitor &v) override;
-
-  std::shared_ptr<Ope> get_core_operator() const;
-
-  const Grammar &grammar_;
-  const std::string name_;
-  const char *s_;
-
-  const bool is_macro_;
-  const std::vector<std::shared_ptr<Ope>> args_;
-
-  Definition *rule_;
-  size_t iarg_;
-};
-
-class Whitespace : public Ope {
-public:
-  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);
-  }
-
-  void accept(Visitor &v) override;
-
-  std::shared_ptr<Ope> ope_;
-};
-
-class BackReference : public Ope {
-public:
-  BackReference(std::string &&name) : name_(std::move(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;
-
-  void accept(Visitor &v) override;
-
-  std::string name_;
-};
-
-class PrecedenceClimbing : public Ope {
-public:
-  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) {}
-
-  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;
-
-  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;
-
-  Definition &get_reference_for_binop(Context &c) const;
-};
-
-class Recovery : public Ope {
-public:
-  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;
-
-  void accept(Visitor &v) override;
-
-  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;
-  }
-
-  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)...);
-}
-
-template <typename... Args> std::shared_ptr<Ope> cho(Args &&...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)...);
-}
-
-inline std::shared_ptr<Ope> zom(const std::shared_ptr<Ope> &ope) {
-  return Repetition::zom(ope);
-}
-
-inline std::shared_ptr<Ope> oom(const std::shared_ptr<Ope> &ope) {
-  return Repetition::oom(ope);
-}
-
-inline std::shared_ptr<Ope> opt(const std::shared_ptr<Ope> &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);
-}
-
-inline std::shared_ptr<Ope> apd(const std::shared_ptr<Ope> &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);
-}
-
-inline std::shared_ptr<Ope> dic(const std::vector<std::string> &v,
-                                bool 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);
-}
-
-inline std::shared_ptr<Ope> liti(std::string &&s) {
-  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);
-}
-
-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);
-}
-
-inline std::shared_ptr<Ope> ncls(const std::string &s) {
-  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);
-}
-
-inline std::shared_ptr<Ope> chr(char32_t dt) {
-  return std::make_shared<Character>(dt);
-}
-
-inline std::shared_ptr<Ope> dot() { return std::make_shared<AnyCharacter>(); }
-
-inline std::shared_ptr<Ope> csc(const std::shared_ptr<Ope> &ope) {
-  return std::make_shared<CaptureScope>(ope);
-}
-
-inline std::shared_ptr<Ope> cap(const std::shared_ptr<Ope> &ope,
-                                Capture::MatchAction 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);
-}
-
-inline std::shared_ptr<Ope> ign(const std::shared_ptr<Ope> &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);
-}
-
-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);
-}
-
-inline std::shared_ptr<Ope> wsp(const std::shared_ptr<Ope> &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);
-}
-
-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);
-}
-
-inline std::shared_ptr<Ope> rec(const std::shared_ptr<Ope> &ope) {
-  return std::make_shared<Recovery>(ope);
-}
-
-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); }
-};
-
-struct TraceOpeName : public Ope::Visitor {
-  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"; }
-
-  static std::string get(Ope &ope) {
-    TraceOpeName vis;
-    ope.accept(vis);
-    return vis.name_;
-  }
-
-private:
-  const char *name_ = nullptr;
-};
-
-struct AssignIDToDefinition : public TraversalVisitor {
-  using TraversalVisitor::visit;
-
-  void visit(Holder &ope) override;
-  void visit(Reference &ope) override;
-  void visit(PrecedenceClimbing &ope) override;
-
-  std::unordered_map<void *, size_t> ids;
-};
-
-struct IsLiteralToken : public Ope::Visitor {
-  using Ope::Visitor::visit;
-
-  void visit(PrioritizedChoice &ope) override {
-    for (const auto &op : ope.opes_) {
-      if (!IsLiteralToken::check(*op)) { return; }
-    }
-    result_ = true;
-  }
-
-  void visit(Dictionary &) override { result_ = true; }
-  void visit(LiteralString &) override { result_ = true; }
-
-  static bool check(Ope &ope) {
-    IsLiteralToken vis;
-    ope.accept(vis);
-    return vis.result_;
-  }
-
-private:
-  bool result_ = false;
-};
-
-struct TokenChecker : public TraversalVisitor {
-  using TraversalVisitor::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;
-
-  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_;
-  }
-
-private:
-  bool has_token_boundary_ = false;
-  bool has_rule_ = false;
-};
-
-struct FindLiteralToken : public Ope::Visitor {
-  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); }
-
-  static const char *token(Ope &ope) {
-    FindLiteralToken vis;
-    ope.accept(vis);
-    return vis.token_;
-  }
-
-private:
-  const char *token_ = nullptr;
-};
-
-struct DetectLeftRecursion : public TraversalVisitor {
-  using TraversalVisitor::visit;
-
-  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(PrioritizedChoice &ope) override {
-    for (const auto &op : ope.opes_) {
-      op->accept(*this);
-      if (error_s) {
-        done_ = true;
-        break;
-      }
-    }
-  }
-  void visit(Repetition &ope) override {
-    ope.ope_->accept(*this);
-    done_ = ope.min_ > 0;
-  }
-  void visit(AndPredicate &ope) override {
-    ope.ope_->accept(*this);
-    done_ = false;
-  }
-  void visit(NotPredicate &ope) override {
-    ope.ope_->accept(*this);
-    done_ = false;
-  }
-  void visit(Dictionary &) override { done_ = true; }
-  void visit(LiteralString &ope) override { done_ = !ope.lit_.empty(); }
-  void visit(CharacterClass &) override { done_ = true; }
-  void visit(Character &) override { done_ = true; }
-  void visit(AnyCharacter &) override { done_ = true; }
-  void visit(User &) override { done_ = true; }
-  void visit(Reference &ope) override;
-  void visit(BackReference &) override { done_ = true; }
-  void visit(Cut &) override { done_ = true; }
-
-  const char *error_s = nullptr;
-
-  std::shared_ptr<Ope> resolve_macro_arg(size_t iarg) const;
-
-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_;
-};
-
-struct ComputeCanBeEmpty : public TraversalVisitor {
-  using TraversalVisitor::visit;
-
-  bool result = false;
-
-  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(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;
-
-  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_;
-};
-
-struct DetectInfiniteLoop : public TraversalVisitor {
-  using TraversalVisitor::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; }
-    }
-  }
-  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;
-
-private:
-  std::vector<std::pair<const char *, std::string>> &refs_;
-  std::unordered_map<std::string, bool> &has_error_cache_;
-};
-
-struct ReferenceChecker : public TraversalVisitor {
-  using TraversalVisitor::visit;
-
-  ReferenceChecker(const Grammar &grammar,
-                   const std::vector<std::string> &params)
-      : grammar_(grammar), params_(params) {}
-
-  void visit(Reference &ope) override;
-
-  std::unordered_map<std::string, const char *> error_s;
-  std::unordered_map<std::string, std::string> error_message;
-  std::unordered_set<std::string> referenced;
-
-private:
-  const Grammar &grammar_;
-  const std::vector<std::string> &params_;
-};
-
-struct LinkReferences : public TraversalVisitor {
-  using TraversalVisitor::visit;
-
-  LinkReferences(Grammar &grammar, const std::vector<std::string> &params)
-      : grammar_(grammar), params_(params) {}
-
-  void visit(Reference &ope) override;
-
-private:
-  Grammar &grammar_;
-  const std::vector<std::string> &params_;
-};
-
-struct FindReference : public Ope::Visitor {
-  using Ope::Visitor::visit;
-
-  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_) {
-      auto save = result_;
-      result_ = FirstSet{};
-      op->accept(*this);
-      auto element_fs = result_;
-      result_ = save;
-      result_.chars |= element_fs.chars;
-      if (element_fs.any_char) { result_.any_char = true; }
-      if (!result_.first_literal) {
-        result_.first_literal = element_fs.first_literal;
-      }
-      if (!result_.first_rule) { result_.first_rule = element_fs.first_rule; }
-      if (!element_fs.can_be_empty) { return; }
-      // This element can be empty, continue to next
-    }
-    result_.can_be_empty = true;
-  }
-  void visit(PrioritizedChoice &ope) override {
-    auto save = result_;
-    for (const auto &op : ope.opes_) {
-      result_ = FirstSet{};
-      op->accept(*this);
-      save.merge(result_);
-    }
-    result_ = save;
-  }
-  void visit(Repetition &ope) override {
-    ope.ope_->accept(*this);
-    if (ope.min_ == 0) { result_.can_be_empty = true; }
-  }
-  void visit(AndPredicate &) override { result_.can_be_empty = true; }
-  void visit(NotPredicate &) override { result_.can_be_empty = true; }
-  void visit(Dictionary &ope) override {
-    for (const auto &[key, info] : ope.trie_.dic_) {
-      if (!key.empty()) {
-        auto ch = static_cast<unsigned char>(key[0]);
-        result_.chars.set(ch);
-        if (ope.trie_.ignore_case_) {
-          result_.chars.set(static_cast<unsigned char>(std::toupper(ch)));
-          result_.chars.set(static_cast<unsigned char>(std::tolower(ch)));
-        }
-      }
-    }
-  }
-  void visit(LiteralString &ope) override {
-    if (ope.lit_.empty()) {
-      result_.can_be_empty = true;
-    } else {
-      auto ch = static_cast<unsigned char>(ope.lit_[0]);
-      result_.chars.set(ch);
-      if (ope.ignore_case_) {
-        result_.chars.set(static_cast<unsigned char>(std::toupper(ch)));
-        result_.chars.set(static_cast<unsigned char>(std::tolower(ch)));
-      }
-      if (!result_.first_literal) { result_.first_literal = ope.lit_.c_str(); }
-    }
-  }
-  void visit(CharacterClass &ope) override {
-    for (const auto &range : ope.ranges_) {
-      auto cp1 = range.first;
-      auto cp2 = range.second;
-      if (cp1 > 0x7F || cp2 > 0x7F) {
-        // Non-ASCII range: conservative fallback
-        result_.any_char = true;
-        return;
-      }
-      for (auto cp = cp1; cp <= cp2; cp++) {
-        auto ch = static_cast<unsigned char>(cp);
-        result_.chars.set(ch);
-        if (ope.ignore_case_) {
-          result_.chars.set(static_cast<unsigned char>(std::toupper(ch)));
-          result_.chars.set(static_cast<unsigned char>(std::tolower(ch)));
-        }
-      }
-    }
-    if (ope.negated_) {
-      result_.chars.flip();
-      result_.any_char = true; // negated class can match non-ASCII
-    }
-  }
-  void visit(Character &ope) override {
-    if (ope.ch_ > 0x7F) {
-      result_.any_char = true;
-    } else {
-      result_.chars.set(static_cast<unsigned char>(ope.ch_));
-    }
-  }
-  void visit(AnyCharacter &) override { result_.any_char = true; }
-  void visit(User &) override { result_.any_char = true; }
-  void visit(Reference &ope) override;
-  void visit(BackReference &) override { result_.any_char = true; }
-  void visit(Cut &) override { result_.can_be_empty = true; }
-
-  FirstSet result_;
-
-private:
-  std::unordered_set<std::string> refs_;
-};
-
-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;
-      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:
-  std::unordered_set<std::string> refs_;
-};
-
-/*
- * Keywords
- */
-static const char *WHITESPACE_DEFINITION_NAME = "%whitespace";
-static const char *WORD_DEFINITION_NAME = "%word";
-static const char *RECOVER_DEFINITION_NAME = "%recover";
-
-/*
- * Definition
- */
-class Definition {
-public:
-  struct Result {
-    bool ret;
-    bool recovered;
-    size_t len;
-    ErrorInfo error_info;
-  };
-
-  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]);
-    }
-    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, 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, 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, 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, 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; }
-
-  template <typename T> Definition &operator,(T fn) {
-    operator=(fn);
-    return *this;
-  }
-
-  Definition &operator~() {
-    ignoreSemanticValue = true;
-    return *this;
-  }
-
-  void accept(Ope::Visitor &v) { holder_->accept(v); }
-
-  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_;
-  }
-
-  std::string name;
-  const char *s_ = nullptr;
-  std::pair<size_t, size_t> line_ = {1, 1};
-
-  Predicate predicate;
-
-  size_t id = 0;
-  Action action;
-  std::function<void(const Context &c, const char *s, size_t n, std::any &dt)>
-      enter;
-  std::function<void(const Context &c, const char *s, size_t n, size_t matchlen,
-                     std::any &value, std::any &dt)>
-      leave;
-  bool ignoreSemanticValue = false;
-  std::shared_ptr<Ope> whitespaceOpe;
-  std::shared_ptr<Ope> wordOpe;
-  bool enablePackratParsing = false;
-  bool is_macro = false;
-  std::vector<std::string> params;
-  bool disable_action = false;
-  bool is_left_recursive = false;
-  bool can_be_empty = false;
-
-  TracerEnter tracer_enter;
-  TracerLeave tracer_leave;
-  bool verbose_trace = false;
-  TracerStartOrEnd tracer_start;
-  TracerStartOrEnd tracer_end;
-
-  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_;
-
-private:
-  friend class Reference;
-  friend class ParserGenerator;
-
-  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_;
-    }
-
-    if (enablePackratParsing) {
-      initialize_packrat_filter();
-      if (!packrat_filter_.empty()) {
-        c.packrat_rule_filter = &packrat_filter_;
-      }
-    }
-
-    size_t i = 0;
-
-    if (whitespaceOpe) {
-      auto save_ignore_trace_state = c.ignore_trace_state;
-      c.ignore_trace_state = !c.verbose_trace;
-      auto se =
-          scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
-
-      auto len = whitespaceOpe->parse(s, n, vs, c, dt);
-      if (fail(len)) { return Result{false, c.recovered, i, c.error_info}; }
-
-      i = len;
-    }
-
-    auto len = ope->parse(s + i, n - i, vs, c, dt);
-    auto ret = success(len);
-    if (ret) {
-      i += len;
-      if (eoi_check) {
-        if (i < n) {
-          if (c.error_info.error_pos - c.s < s + i - c.s) {
-            c.error_info.message_pos = s + i;
-            c.error_info.message = "expected end of input";
-          }
-          ret = false;
-        }
-      }
-    }
-    return Result{ret, c.recovered, i, c.error_info};
-  }
-
-  std::shared_ptr<Holder> holder_;
-  mutable std::once_flag is_token_init_;
-  mutable bool is_token_ = false;
-  mutable std::once_flag assign_id_to_definition_init_;
-  mutable std::once_flag definition_ids_init_;
-  mutable std::unordered_map<void *, size_t> definition_ids_;
-  mutable std::once_flag packrat_filter_init_;
-  mutable std::vector<bool> packrat_filter_;
-};
-
-/*
- * Implementations
- */
-
-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);
-    }
-  }
-
-  // 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;
-
-      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;
-
-      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;
-
-  return i;
-}
-
-inline std::pair<size_t, size_t> SemanticValues::line_info() const {
-  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);
-
-        auto unexpected_char = unexpected_token.substr(
-            0,
-            codepoint_length(unexpected_token.data(), unexpected_token.size()));
-
-        msg = replace_all(msg, "%c", unexpected_char);
-      } else {
-        msg = message;
-      }
-      log(line.first, line.second, msg, label);
-    }
-  } else if (error_pos) {
-    if (error_pos > last_output_pos) {
-      last_output_pos = error_pos;
-      auto line = line_info(s, error_pos);
-
-      std::string msg;
-      if (expected_tokens.empty()) {
-        msg = "syntax error.";
-      } else {
-        msg = "syntax error";
-
-        // unexpected token
-        if (auto unexpected_token = heuristic_error_token(s, n, error_pos);
-            !unexpected_token.empty()) {
-          msg += ", unexpected '";
-          msg += unexpected_token;
-          msg += "'";
-        }
-
-        auto first_item = true;
-        size_t i = 0;
-        while (i < expected_tokens.size()) {
-          auto [error_literal, error_rule] = expected_tokens[i];
-
-          // Skip rules start with '_'
-          if (!(error_rule && error_rule->name[0] == '_')) {
-            msg += (first_item ? ", expecting " : ", ");
-            if (error_literal) {
-              msg += "'";
-              msg += error_literal;
-              msg += "'";
-            } else {
-              msg += "<" + error_rule->name + ">";
-              if (label.empty()) { label = error_rule->name; }
-            }
-            first_item = false;
-          }
-
-          i++;
-        }
-        msg += ".";
-      }
-      log(line.first, line.second, msg, label);
-    }
-  }
-}
-
-inline size_t Context::skip_whitespace(const char *a_s, size_t n,
-                                       SemanticValues &vs, std::any &dt) {
-  if (in_token_boundary_count || !whitespaceOpe) { return 0; }
-  auto save = ignore_trace_state;
-  ignore_trace_state = !verbose_trace;
-  auto se = scope_exit([&]() { ignore_trace_state = save; });
-  return whitespaceOpe->parse(a_s, n, vs, *this, dt);
-}
-
-inline void Context::set_error_pos(const char *a_s, const char *literal) {
-  if (log) {
-    if (error_info.error_pos <= a_s) {
-      if (error_info.error_pos < a_s || !error_info.keep_previous_token) {
-        error_info.error_pos = a_s;
-        error_info.expected_tokens.clear();
-      }
-
-      const char *error_literal = nullptr;
-      const Definition *error_rule = nullptr;
-
-      if (literal) {
-        error_literal = literal;
-      } else if (!rule_stack.empty()) {
-        auto rule = rule_stack.back();
-        auto ope = rule->get_core_operator();
-        if (auto token = FindLiteralToken::token(*ope);
-            token && token[0] != '\0') {
-          error_literal = token;
-        }
-      }
-
-      for (auto r : rule_stack) {
-        error_rule = r;
-        if (r->is_token()) { break; }
-      }
-
-      if (error_literal || error_rule) {
-        error_info.add(error_literal, error_rule);
-      }
-    }
-  }
-}
-
-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);
-}
-
-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();
-}
-
-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;
-}
-
-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);
-}
-
-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);
-
-  if (i == 0) {
-    c.set_error_pos(s);
-    return static_cast<size_t>(-1);
-  }
-
-  vs.choice_count_ = trie_.items_count();
-  vs.choice_ = id;
-
-  // Word check
-  if (c.wordOpe) {
-    auto save_ignore_trace_state = c.ignore_trace_state;
-    c.ignore_trace_state = !c.verbose_trace;
-    auto se =
-        scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
-
-    {
-      SemanticValues dummy_vs;
-      Context dummy_c(nullptr, c.s, c.l, 0, nullptr, nullptr, false, nullptr,
-                      nullptr, nullptr, false, nullptr);
-      std::any dummy_dt;
-
-      NotPredicate ope(c.wordOpe);
-      auto len = ope.parse(s + i, n - i, dummy_vs, dummy_c, dummy_dt);
-      if (fail(len)) {
-        c.set_error_pos(s);
-        return len;
-      }
-      i += len;
-    }
-  }
-
-  // Skip whitespace
-  auto wl = c.skip_whitespace(s + i, n - i, vs, dt);
-  if (fail(wl)) { return wl; }
-  i += wl;
-
-  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_);
-}
-
-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; });
-
-  size_t len;
-  {
-    c.in_token_boundary_count++;
-    auto se = scope_exit([&]() { c.in_token_boundary_count--; });
-    len = ope_->parse(s, n, vs, c, dt);
-  }
-
-  if (success(len)) {
-    vs.tokens.emplace_back(std::string_view(s, len));
-
-    auto wl = c.skip_whitespace(s + len, n - len, vs, dt);
-    if (fail(wl)) { return wl; }
-    len += wl;
-  }
-  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...");
-  }
-
-  // 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;
-
-  // 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;
-
-    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_);
-    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(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;
-}
-
-inline std::any Holder::reduce(SemanticValues &vs, std::any &dt,
-                               const std::any &predicate_data) const {
-  if (outer_->action && !outer_->disable_action) {
-    return outer_->action(vs, dt, predicate_data);
-  } else if (vs.empty()) {
-    return std::any();
-  } else {
-    return std::move(vs.front());
-  }
-}
-
-inline const std::string &Holder::name() const { return outer_->name; }
-
-inline const std::string &Holder::trace_name() const {
-  std::call_once(trace_name_init_,
-                 [this]() { trace_name_ = "[" + outer_->name + "]"; });
-  return trace_name_;
-}
-
-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);
-    }
-  } 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_;
-}
-
-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);
-    }
-  }
-
-  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_;
-  }
-
-  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; }
-
-  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); });
-
-  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();
-
-    if (fail(chlen)) { 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);
-
-    if (level < min_prec) { break; }
-
-    vs.emplace_back(std::move(chvs[0]));
-    i += chlen;
-
-    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();
-
-    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);
-      static const std::any empty_predicate_data;
-      val = rule_.action(vs, dt, empty_predicate_data);
-    } else if (!vs.empty()) {
-      val = vs[0];
-    }
-    vs.clear();
-    vs.emplace_back(std::move(val));
-  }
-
-  return i;
-}
-
-inline size_t Recovery::parse_core(const char *s, size_t n,
-                                   SemanticValues & /*vs*/, Context &c,
-                                   std::any & /*dt*/) const {
-  const auto &rule = dynamic_cast<Reference &>(*ope_);
-
-  // 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;
-
-    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); }
-inline void PrioritizedChoice::accept(Visitor &v) { v.visit(*this); }
-inline void Repetition::accept(Visitor &v) { v.visit(*this); }
-inline void AndPredicate::accept(Visitor &v) { v.visit(*this); }
-inline void NotPredicate::accept(Visitor &v) { v.visit(*this); }
-inline void Dictionary::accept(Visitor &v) { v.visit(*this); }
-inline void LiteralString::accept(Visitor &v) { v.visit(*this); }
-inline void CharacterClass::accept(Visitor &v) { v.visit(*this); }
-inline void Character::accept(Visitor &v) { v.visit(*this); }
-inline void AnyCharacter::accept(Visitor &v) { v.visit(*this); }
-inline void CaptureScope::accept(Visitor &v) { v.visit(*this); }
-inline void Capture::accept(Visitor &v) { v.visit(*this); }
-inline void TokenBoundary::accept(Visitor &v) { v.visit(*this); }
-inline void Ignore::accept(Visitor &v) { v.visit(*this); }
-inline void User::accept(Visitor &v) { v.visit(*this); }
-inline void WeakHolder::accept(Visitor &v) { v.visit(*this); }
-inline void Holder::accept(Visitor &v) { v.visit(*this); }
-inline void Reference::accept(Visitor &v) { v.visit(*this); }
-inline void Whitespace::accept(Visitor &v) { v.visit(*this); }
-inline void BackReference::accept(Visitor &v) { v.visit(*this); }
-inline void PrecedenceClimbing::accept(Visitor &v) { v.visit(*this); }
-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);
-}
-
-inline void AssignIDToDefinition::visit(Reference &ope) {
-  if (ope.rule_) {
-    for (const auto &arg : ope.args_) {
-      arg->accept(*this);
-    }
-    ope.rule_->accept(*this);
-  }
-}
-
-inline void AssignIDToDefinition::visit(PrecedenceClimbing &ope) {
-  ope.atom_->accept(*this);
-  ope.binop_->accept(*this);
-}
-
-inline void TokenChecker::visit(Reference &ope) {
-  if (ope.is_macro_) {
-    for (const auto &arg : ope.args_) {
-      arg->accept(*this);
-    }
-  } else {
-    has_rule_ = true;
-  }
-}
-
-inline void FindLiteralToken::visit(Reference &ope) {
-  if (ope.is_macro_) {
-    ope.rule_->accept(*this);
-    for (const auto &arg : ope.args_) {
-      arg->accept(*this);
-    }
-  }
-}
-
-inline void ComputeCanBeEmpty::visit(Reference &ope) {
-  result = ope.rule_ && ope.rule_->can_be_empty;
-}
-
-inline void DetectLeftRecursion::visit(Reference &ope) {
-  if (ope.name_ == name_) {
-    error_s = ope.s_;
-  } else if (!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; }
-    }
-  } 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;
-}
-
-inline void HasEmptyElement::visit(Sequence &ope) {
-  auto save_is_empty = false;
-  const char *save_error_s = nullptr;
-  std::string save_error_name;
-
-  auto it = ope.opes_.begin();
-  while (it != ope.opes_.end()) {
-    (*it)->accept(*this);
-    if (!is_empty) {
-      ++it;
-      while (it != ope.opes_.end()) {
-        DetectInfiniteLoop vis(refs_, has_error_cache_);
-        (*it)->accept(vis);
-        if (vis.has_error) {
-          is_empty = true;
-          error_s = vis.error_s;
-          error_name = vis.error_name;
-        }
-        ++it;
-      }
-      return;
-    }
-
-    save_is_empty = is_empty;
-    save_error_s = error_s;
-    save_error_name = error_name;
-
-    is_empty = false;
-    error_name.clear();
-    ++it;
-  }
-
-  is_empty = save_is_empty;
-  error_s = save_error_s;
-  error_name = save_error_name;
-}
-
-inline void HasEmptyElement::visit(Reference &ope) {
-  auto it = std::find_if(refs_.begin(), refs_.end(),
-                         [&](const std::pair<const char *, std::string> &ref) {
-                           return ope.name_ == ref.second;
-                         });
-  if (it != refs_.end()) { return; }
-
-  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; }
-
-  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);
-    }
-  }
-}
-
-inline void ReferenceChecker::visit(Reference &ope) {
-  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()) {
-        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;
-  }
-  if (refs_.count(ope.name_)) { return; }
-  refs_.insert(ope.name_);
-  ope.rule_->accept(*this);
-  if (!result_.first_rule && ope.rule_->is_token()) {
-    result_.first_rule = ope.rule_;
-  }
-  refs_.erase(ope.name_);
-}
-
-inline void SetupFirstSets::visit(Reference &ope) {
-  if (!ope.rule_ || refs_.count(ope.name_)) { return; }
-  refs_.insert(ope.name_);
-  ope.rule_->accept(*this);
-  refs_.erase(ope.name_);
-}
-
-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 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);
-  }
-}
-
-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;
-    }
-  }
-  found_ope = ope.shared_from_this();
-}
-
-/*-----------------------------------------------------------------------------
- *  PEG parser generator
- *---------------------------------------------------------------------------*/
-
-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;
-  };
-
-  static ParserContext parse(const char *s, size_t n, const Rules &rules,
-                             Log log, std::string_view start,
-                             bool enable_left_recursion = true) {
-    return get_instance().perform_core(s, n, rules, log, std::string(start),
-                                       enable_left_recursion);
-  }
-
-  // For debugging purpose
-  static bool parse_test(const char *d, const char *s) {
-    Data data;
-    std::any dt = &data;
-
-    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));
-  }
-#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;
-    }
-  }
-
-  void setup_actions() {
-    g["Definition"] = [&](const SemanticValues &vs, std::any &dt) {
-      auto &data = *std::any_cast<Data *>(dt);
-
-      auto is_macro = vs.choice() == 0;
-      auto ignore = std::any_cast<bool>(vs[0]);
-      auto name = std::any_cast<std::string>(vs[1]);
-
-      std::vector<std::string> params;
-      std::shared_ptr<Ope> ope;
-      auto has_instructions = false;
-
-      if (is_macro) {
-        params = std::any_cast<std::vector<std::string>>(vs[2]);
-        ope = std::any_cast<std::shared_ptr<Ope>>(vs[4]);
-        if (vs.size() == 6) { has_instructions = true; }
-      } else {
-        ope = std::any_cast<std::shared_ptr<Ope>>(vs[3]);
-        if (vs.size() == 5) { has_instructions = true; }
-      }
-
-      if (has_instructions) {
-        auto index = is_macro ? 5 : 4;
-        std::unordered_set<std::string> types;
-        for (const auto &instruction :
-             std::any_cast<std::vector<Instruction>>(vs[index])) {
-          const auto &type = instruction.type;
-          if (types.find(type) == types.end()) {
-            data.instructions[name].push_back(instruction);
-            types.insert(instruction.type);
-            if (type == "declare_symbol" || type == "check_symbol") {
-              if (!TokenChecker::is_token(*ope)) { ope = tok(ope); }
-            }
-          } else {
-            data.duplicates_of_instruction.emplace_back(type,
-                                                        instruction.sv.data());
-          }
-        }
-      }
-
-      auto &grammar = *data.grammar;
-      if (!grammar.count(name)) {
-        auto &rule = grammar[name];
-        rule <= ope;
-        rule.name = name;
-        rule.s_ = vs.sv().data();
-        rule.line_ = line_info(vs.ss, rule.s_);
-        rule.ignoreSemanticValue = ignore;
-        rule.is_macro = is_macro;
-        rule.params = params;
-
-        if (data.start.empty()) {
-          data.start = rule.name;
-          data.start_pos = rule.s_;
-        }
-      } else {
-        data.duplicates_of_definition.emplace_back(name, vs.sv().data());
-      }
-    };
-
-    g["Definition"].enter = [](const Context & /*c*/, const char * /*s*/,
-                               size_t /*n*/, std::any &dt) {
-      auto &data = *std::any_cast<Data *>(dt);
-      data.captures_in_current_definition.clear();
-    };
-
-    g["Expression"] = [&](const SemanticValues &vs) {
-      if (vs.size() == 1) {
-        return std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-      } else {
-        std::vector<std::shared_ptr<Ope>> opes;
-        for (auto i = 0u; i < vs.size(); i++) {
-          opes.emplace_back(std::any_cast<std::shared_ptr<Ope>>(vs[i]));
-        }
-        const std::shared_ptr<Ope> ope =
-            std::make_shared<PrioritizedChoice>(opes);
-        return ope;
-      }
-    };
-
-    g["Sequence"] = [&](const SemanticValues &vs) {
-      if (vs.empty()) {
-        return npd(lit(""));
-      } else if (vs.size() == 1) {
-        return std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-      } else {
-        std::vector<std::shared_ptr<Ope>> opes;
-        for (const auto &x : vs) {
-          opes.emplace_back(std::any_cast<std::shared_ptr<Ope>>(x));
-        }
-        const std::shared_ptr<Ope> ope = std::make_shared<Sequence>(opes);
-        return ope;
-      }
-    };
-
-    g["Prefix"] = [&](const SemanticValues &vs) {
-      std::shared_ptr<Ope> ope;
-      if (vs.size() == 1) {
-        ope = std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-      } else {
-        assert(vs.size() == 2);
-        auto tok = std::any_cast<char>(vs[0]);
-        ope = std::any_cast<std::shared_ptr<Ope>>(vs[1]);
-        if (tok == '&') {
-          ope = apd(ope);
-        } else { // '!'
-          ope = npd(ope);
-        }
-      }
-      return ope;
-    };
-
-    g["SuffixWithLabel"] = [&](const SemanticValues &vs, std::any &dt) {
-      auto ope = std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-      if (vs.size() == 1) {
-        return ope;
-      } else {
-        assert(vs.size() == 2);
-        auto &data = *std::any_cast<Data *>(dt);
-        const auto &ident = std::any_cast<std::string>(vs[1]);
-        auto label = ref(*data.grammar, ident, vs.sv().data(), false, {});
-        auto recovery = rec(ref(*data.grammar, RECOVER_DEFINITION_NAME,
-                                vs.sv().data(), true, {label}));
-        return cho4label_(ope, recovery);
-      }
-    };
-
-    struct Loop {
-      enum class Type { opt = 0, zom, oom, rep };
-      Type type;
-      std::pair<size_t, size_t> range;
-    };
-
-    g["Suffix"] = [&](const SemanticValues &vs) {
-      auto ope = std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-      if (vs.size() == 1) {
-        return ope;
-      } else {
-        assert(vs.size() == 2);
-        auto loop = std::any_cast<Loop>(vs[1]);
-        switch (loop.type) {
-        case Loop::Type::opt: return opt(ope);
-        case Loop::Type::zom: return zom(ope);
-        case Loop::Type::oom: return oom(ope);
-        default: // Regex-like repetition
-          return rep(ope, loop.range.first, loop.range.second);
-        }
-      }
-    };
-
-    g["Loop"] = [&](const SemanticValues &vs) {
-      switch (vs.choice()) {
-      case 0: // Option
-        return Loop{Loop::Type::opt, std::pair<size_t, size_t>()};
-      case 1: // Zero or More
-        return Loop{Loop::Type::zom, std::pair<size_t, size_t>()};
-      case 2: // One or More
-        return Loop{Loop::Type::oom, std::pair<size_t, size_t>()};
-      default: // Regex-like repetition
-        return Loop{Loop::Type::rep,
-                    std::any_cast<std::pair<size_t, size_t>>(vs[0])};
-      }
-    };
-
-    g["Primary"] = [&](const SemanticValues &vs, std::any &dt) {
-      auto &data = *std::any_cast<Data *>(dt);
-
-      switch (vs.choice()) {
-      case 0:   // Macro Reference
-      case 1: { // Reference
-        auto is_macro = vs.choice() == 0;
-        auto ignore = std::any_cast<bool>(vs[0]);
-        const auto &ident = std::any_cast<std::string>(vs[1]);
-
-        std::vector<std::shared_ptr<Ope>> args;
-        if (is_macro) {
-          args = std::any_cast<std::vector<std::shared_ptr<Ope>>>(vs[2]);
-        }
-
-        auto ope = ref(*data.grammar, ident, vs.sv().data(), is_macro, args);
-        if (ident == RECOVER_DEFINITION_NAME) { ope = rec(ope); }
-
-        if (ignore) {
-          return ign(ope);
-        } else {
-          return ope;
-        }
-      }
-      case 2: { // (Expression)
-        return std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-      }
-      case 3: { // TokenBoundary
-        return tok(std::any_cast<std::shared_ptr<Ope>>(vs[0]));
-      }
-      case 4: { // CaptureScope
-        return csc(std::any_cast<std::shared_ptr<Ope>>(vs[0]));
-      }
-      case 5: { // Capture
-        const auto &name = std::any_cast<std::string_view>(vs[0]);
-        auto ope = std::any_cast<std::shared_ptr<Ope>>(vs[1]);
-
-        data.captures_stack.back().insert(name);
-        data.captures_in_current_definition.insert(name);
-
-        return cap(ope, [name](const char *a_s, size_t a_n, Context &c) {
-          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());
-        }
-        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 (const auto &v : vs) {
-        auto tokens = std::any_cast<std::vector<std::string_view>>(v);
-        auto assoc = tokens[0][0];
-        for (size_t i = 1; i < tokens.size(); i++) {
-          binOpeInfo[tokens[i]] = std::pair(level, assoc);
-        }
-        level++;
-      }
-      Instruction instruction;
-      instruction.type = "precedence";
-      instruction.data = binOpeInfo;
-      instruction.sv = vs.sv();
-      return instruction;
-    };
-    g["PrecedenceInfo"] = [](const SemanticValues &vs) {
-      return vs.transform<std::string_view>();
-    };
-    g["PrecedenceOpe"] = [](const SemanticValues &vs) { return vs.token(); };
-    g["PrecedenceAssoc"] = [](const SemanticValues &vs) { return vs.token(); };
-
-    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;
-  }
-
-  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;
-};
-
-/*-----------------------------------------------------------------------------
- *  AST
- *---------------------------------------------------------------------------*/
-
-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::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) {}
-
-  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 bool is_token;
-  const std::string_view token;
-
-  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);
-  }
-
-  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);
-  }
-}
-
-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;
-}
-
-struct AstOptimizer {
-  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;
-
-    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;
-    }
-
-    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_;
-};
-
-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();
-
-    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());
-
-    for (auto &node : ast->nodes) {
-      node->parent = ast;
-    }
-    return ast;
-  };
-}
-
-#define PEG_EXPAND(...) __VA_ARGS__
-#define PEG_CONCAT(a, b) a##b
-#define PEG_CONCAT2(a, b) PEG_CONCAT(a, b)
-
-#define PEG_PICK(                                                              \
-    a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, \
-    a17, a18, a19, a20, a21, a22, a23, a24, a25, a26, a27, a28, a29, a30, a31, \
-    a32, a33, a34, a35, a36, a37, a38, a39, a40, a41, a42, a43, a44, a45, a46, \
-    a47, a48, a49, a50, a51, a52, a53, a54, a55, a56, a57, a58, a59, a60, a61, \
-    a62, a63, a64, a65, a66, a67, a68, a69, a70, a71, a72, a73, a74, a75, a76, \
-    a77, a78, a79, a80, a81, a82, a83, a84, a85, a86, a87, a88, a89, a90, a91, \
-    a92, a93, a94, a95, a96, a97, a98, a99, a100, ...)                         \
-  a100
-
-#define PEG_COUNT(...)                                                         \
-  PEG_EXPAND(PEG_PICK(                                                         \
-      __VA_ARGS__, 100, 99, 98, 97, 96, 95, 94, 93, 92, 91, 90, 89, 88, 87,    \
-      86, 85, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69,  \
-      68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51,  \
-      50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33,  \
-      32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15,  \
-      14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
-
-#define PEG_DEF_1(r)                                                           \
-  peg::Definition r;                                                           \
-  r.name = #r;                                                                 \
-  peg::add_ast_action(r);
-
-#define PEG_DEF_2(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_1(__VA_ARGS__))
-#define PEG_DEF_3(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_2(__VA_ARGS__))
-#define PEG_DEF_4(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_3(__VA_ARGS__))
-#define PEG_DEF_5(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_4(__VA_ARGS__))
-#define PEG_DEF_6(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_5(__VA_ARGS__))
-#define PEG_DEF_7(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_6(__VA_ARGS__))
-#define PEG_DEF_8(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_7(__VA_ARGS__))
-#define PEG_DEF_9(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_8(__VA_ARGS__))
-#define PEG_DEF_10(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_9(__VA_ARGS__))
-#define PEG_DEF_11(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_10(__VA_ARGS__))
-#define PEG_DEF_12(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_11(__VA_ARGS__))
-#define PEG_DEF_13(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_12(__VA_ARGS__))
-#define PEG_DEF_14(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_13(__VA_ARGS__))
-#define PEG_DEF_15(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_14(__VA_ARGS__))
-#define PEG_DEF_16(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_15(__VA_ARGS__))
-#define PEG_DEF_17(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_16(__VA_ARGS__))
-#define PEG_DEF_18(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_17(__VA_ARGS__))
-#define PEG_DEF_19(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_18(__VA_ARGS__))
-#define PEG_DEF_20(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_19(__VA_ARGS__))
-#define PEG_DEF_21(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_20(__VA_ARGS__))
-#define PEG_DEF_22(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_21(__VA_ARGS__))
-#define PEG_DEF_23(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_22(__VA_ARGS__))
-#define PEG_DEF_24(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_23(__VA_ARGS__))
-#define PEG_DEF_25(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_24(__VA_ARGS__))
-#define PEG_DEF_26(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_25(__VA_ARGS__))
-#define PEG_DEF_27(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_26(__VA_ARGS__))
-#define PEG_DEF_28(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_27(__VA_ARGS__))
-#define PEG_DEF_29(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_28(__VA_ARGS__))
-#define PEG_DEF_30(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_29(__VA_ARGS__))
-#define PEG_DEF_31(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_30(__VA_ARGS__))
-#define PEG_DEF_32(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_31(__VA_ARGS__))
-#define PEG_DEF_33(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_32(__VA_ARGS__))
-#define PEG_DEF_34(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_33(__VA_ARGS__))
-#define PEG_DEF_35(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_34(__VA_ARGS__))
-#define PEG_DEF_36(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_35(__VA_ARGS__))
-#define PEG_DEF_37(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_36(__VA_ARGS__))
-#define PEG_DEF_38(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_37(__VA_ARGS__))
-#define PEG_DEF_39(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_38(__VA_ARGS__))
-#define PEG_DEF_40(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_39(__VA_ARGS__))
-#define PEG_DEF_41(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_40(__VA_ARGS__))
-#define PEG_DEF_42(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_41(__VA_ARGS__))
-#define PEG_DEF_43(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_42(__VA_ARGS__))
-#define PEG_DEF_44(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_43(__VA_ARGS__))
-#define PEG_DEF_45(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_44(__VA_ARGS__))
-#define PEG_DEF_46(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_45(__VA_ARGS__))
-#define PEG_DEF_47(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_46(__VA_ARGS__))
-#define PEG_DEF_48(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_47(__VA_ARGS__))
-#define PEG_DEF_49(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_48(__VA_ARGS__))
-#define PEG_DEF_50(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_49(__VA_ARGS__))
-#define PEG_DEF_51(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_50(__VA_ARGS__))
-#define PEG_DEF_52(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_51(__VA_ARGS__))
-#define PEG_DEF_53(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_52(__VA_ARGS__))
-#define PEG_DEF_54(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_53(__VA_ARGS__))
-#define PEG_DEF_55(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_54(__VA_ARGS__))
-#define PEG_DEF_56(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_55(__VA_ARGS__))
-#define PEG_DEF_57(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_56(__VA_ARGS__))
-#define PEG_DEF_58(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_57(__VA_ARGS__))
-#define PEG_DEF_59(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_58(__VA_ARGS__))
-#define PEG_DEF_60(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_59(__VA_ARGS__))
-#define PEG_DEF_61(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_60(__VA_ARGS__))
-#define PEG_DEF_62(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_61(__VA_ARGS__))
-#define PEG_DEF_63(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_62(__VA_ARGS__))
-#define PEG_DEF_64(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_63(__VA_ARGS__))
-#define PEG_DEF_65(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_64(__VA_ARGS__))
-#define PEG_DEF_66(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_65(__VA_ARGS__))
-#define PEG_DEF_67(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_66(__VA_ARGS__))
-#define PEG_DEF_68(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_67(__VA_ARGS__))
-#define PEG_DEF_69(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_68(__VA_ARGS__))
-#define PEG_DEF_70(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_69(__VA_ARGS__))
-#define PEG_DEF_71(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_70(__VA_ARGS__))
-#define PEG_DEF_72(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_71(__VA_ARGS__))
-#define PEG_DEF_73(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_72(__VA_ARGS__))
-#define PEG_DEF_74(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_73(__VA_ARGS__))
-#define PEG_DEF_75(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_74(__VA_ARGS__))
-#define PEG_DEF_76(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_75(__VA_ARGS__))
-#define PEG_DEF_77(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_76(__VA_ARGS__))
-#define PEG_DEF_78(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_77(__VA_ARGS__))
-#define PEG_DEF_79(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_78(__VA_ARGS__))
-#define PEG_DEF_80(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_79(__VA_ARGS__))
-#define PEG_DEF_81(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_80(__VA_ARGS__))
-#define PEG_DEF_82(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_81(__VA_ARGS__))
-#define PEG_DEF_83(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_82(__VA_ARGS__))
-#define PEG_DEF_84(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_83(__VA_ARGS__))
-#define PEG_DEF_85(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_84(__VA_ARGS__))
-#define PEG_DEF_86(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_85(__VA_ARGS__))
-#define PEG_DEF_87(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_86(__VA_ARGS__))
-#define PEG_DEF_88(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_87(__VA_ARGS__))
-#define PEG_DEF_89(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_88(__VA_ARGS__))
-#define PEG_DEF_90(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_89(__VA_ARGS__))
-#define PEG_DEF_91(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_90(__VA_ARGS__))
-#define PEG_DEF_92(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_91(__VA_ARGS__))
-#define PEG_DEF_93(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_92(__VA_ARGS__))
-#define PEG_DEF_94(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_93(__VA_ARGS__))
-#define PEG_DEF_95(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_94(__VA_ARGS__))
-#define PEG_DEF_96(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_95(__VA_ARGS__))
-#define PEG_DEF_97(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_96(__VA_ARGS__))
-#define PEG_DEF_98(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_97(__VA_ARGS__))
-#define PEG_DEF_99(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_98(__VA_ARGS__))
-#define PEG_DEF_100(r1, ...) PEG_EXPAND(PEG_DEF_1(r1) PEG_DEF_99(__VA_ARGS__))
-
-#define AST_DEFINITIONS(...)                                                   \
-  PEG_EXPAND(PEG_CONCAT2(PEG_DEF_, PEG_COUNT(__VA_ARGS__))(__VA_ARGS__))
-
-/*-----------------------------------------------------------------------------
- *  parser
- *---------------------------------------------------------------------------*/
-
-class parser {
-public:
-  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, 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, 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, std::string_view start = {})
-      : parser(reinterpret_cast<const char *>(sv.data()), sv.size(), Rules(),
-               start) {}
-#endif
-
-  operator bool() const { return grammar_ != nullptr; }
-
-  bool load_grammar(const char *s, size_t n, const Rules &rules,
-                    std::string_view start = {}) {
-    auto cxt =
-        ParserGenerator::parse(s, n, rules, log_, start, 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);
-    }
-    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 {
-    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, 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, 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]; }
-
-  const Definition &operator[](const char *s) const { return (*grammar_)[s]; }
-
-  const Grammar &get_grammar() const { return *grammar_; }
-
-  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_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 set_verbose_trace(bool verbose_trace) {
-    if (grammar_ != nullptr) {
-      auto &rule = (*grammar_)[start_];
-      rule.verbose_trace = verbose_trace;
-    }
-  }
-
-  template <typename T = Ast> parser &enable_ast() {
-    for (auto &[_, rule] : *grammar_) {
-      if (!rule.action) { add_ast_action<T>(rule); }
-    }
-    return *this;
-  }
-
-  template <typename T>
-  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(
-      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); }
-    }
-    return rules;
-  }
-
-  std::shared_ptr<Grammar> grammar_;
-  std::string start_;
-  bool enableLeftRecursion_ = true;
-  bool enablePackratParsing_ = false;
-  Log log_;
-};
-
-/*-----------------------------------------------------------------------------
- *  enable_tracing
- *---------------------------------------------------------------------------*/
-
-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));
-
-          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 &) {});
-}
-
-/*-----------------------------------------------------------------------------
- *  enable_profiling
- *---------------------------------------------------------------------------*/
-
-inline void enable_profiling(parser &parser, std::ostream &os) {
-  struct Stats {
-    struct Item {
-      std::string name;
-      size_t success;
-      size_t fail;
-    };
-    std::vector<Item> items;
-    std::map<std::string, size_t> index;
-    size_t total = 0;
-    std::chrono::steady_clock::time_point start;
-  };
-
-  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;
-            }
-
-            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;
-      });
-}
-} // namespace peg
diff --git a/libcockatrice_utility/libcockatrice/utility/qt_utils.h b/libcockatrice_utility/libcockatrice/utility/qt_utils.h
deleted file mode 100644
index 606947143..000000000
--- a/libcockatrice_utility/libcockatrice/utility/qt_utils.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef COCKATRICE_QT_UTILS_H
-#define COCKATRICE_QT_UTILS_H
-#include <QObject>
-
-namespace QtUtils
-{
-template <typename T> T *findParentOfType(const QObject *obj)
-{
-    const QObject *p = obj ? obj->parent() : nullptr;
-    while (p) {
-        if (auto casted = qobject_cast<T *>(const_cast<QObject *>(p))) {
-            return casted;
-        }
-        p = p->parent();
-    }
-    return nullptr;
-}
-
-static inline void clearLayoutRec(QLayout *l)
-{
-    if (!l)
-        return;
-    QLayoutItem *it;
-    while ((it = l->takeAt(0)) != nullptr) {
-        if (QWidget *w = it->widget())
-            w->deleteLater();
-        if (QLayout *sub = it->layout())
-            clearLayoutRec(sub);
-        delete it;
-    }
-}
-} // namespace QtUtils
-
-#endif // COCKATRICE_QT_UTILS_H
diff --git a/libcockatrice_utility/libcockatrice/utility/zone_names.h b/libcockatrice_utility/libcockatrice/utility/zone_names.h
deleted file mode 100644
index d1463de6a..000000000
--- a/libcockatrice_utility/libcockatrice/utility/zone_names.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef ZONE_NAMES_H
-#define ZONE_NAMES_H
-
-namespace ZoneNames
-{
-// Protocol-level zone identifiers shared between client and server.
-// These must match exactly across all components.
-
-constexpr const char *TABLE = "table";
-constexpr const char *GRAVE = "grave";
-constexpr const char *EXILE = "rfg"; // "removed from game"
-constexpr const char *HAND = "hand";
-constexpr const char *DECK = "deck";
-constexpr const char *SIDEBOARD = "sb";
-constexpr const char *STACK = "stack";
-
-} // namespace ZoneNames
-
-#endif // ZONE_NAMES_H
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index 3bb4de5df..50b3a20dc 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -1,42 +1,47 @@
-cmake_minimum_required(VERSION 3.16)
+# CMakeLists for oracle directory
+#
+# provides the oracle binary
+
 project(Oracle VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
-# ------------------------
-# Paths and directories
-# ------------------------
+# paths
 set(DESKTOPDIR
     share/applications
     CACHE STRING "path to .desktop files"
 )
 
-set(ORACLE_MAC_QM_INSTALL_DIR "oracle.app/Contents/Resources/translations")
-set(ORACLE_UNIX_QM_INSTALL_DIR "share/oracle/translations")
-set(ORACLE_WIN32_QM_INSTALL_DIR "translations")
-
-# ------------------------
-# Sources
-# ------------------------
 set(oracle_SOURCES
     src/main.cpp
     src/oraclewizard.cpp
     src/oracleimporter.cpp
-    src/pages.cpp
     src/pagetemplates.cpp
     src/parsehelpers.cpp
     src/qt-json/json.cpp
-    ../cockatrice/src/client/settings/cache_settings.cpp
-    ../cockatrice/src/client/settings/card_counter_settings.cpp
-    ../cockatrice/src/client/settings/shortcuts_settings.cpp
-    ../cockatrice/src/client/network/update/client/release_channel.cpp
+    ../cockatrice/src/card/card_info.cpp
+    ../cockatrice/src/client/network/release_channel.cpp
+    ../cockatrice/src/database/parser/card_database_parser.cpp
+    ../cockatrice/src/database/parser/cockatrice_xml_3.cpp
+    ../cockatrice/src/database/parser/cockatrice_xml_4.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
+    ../cockatrice/src/settings/cache_settings.cpp
+    ../cockatrice/src/settings/card_counter_settings.cpp
+    ../cockatrice/src/settings/card_database_settings.cpp
+    ../cockatrice/src/settings/card_override_settings.cpp
+    ../cockatrice/src/settings/debug_settings.cpp
+    ../cockatrice/src/settings/download_settings.cpp
+    ../cockatrice/src/settings/game_filters_settings.cpp
+    ../cockatrice/src/settings/layouts_settings.cpp
+    ../cockatrice/src/settings/message_settings.cpp
+    ../cockatrice/src/settings/recents_settings.cpp
+    ../cockatrice/src/settings/servers_settings.cpp
+    ../cockatrice/src/settings/settings_manager.cpp
+    ../cockatrice/src/settings/shortcuts_settings.cpp
     ${VERSION_STRING_CPP}
 )
 
-# ------------------------
-# Translations
-# ------------------------
+set(oracle_RESOURCES oracle.qrc)
 
 if(UPDATE_TRANSLATIONS)
   file(GLOB_RECURSE translate_oracle_SRCS src/*.cpp src/*.h ../cockatrice/src/settingscache.cpp)
@@ -58,49 +63,37 @@ if(APPLE)
   set(oracle_SOURCES ${oracle_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
 endif(APPLE)
 
-set(oracle_RESOURCES oracle.qrc)
-
-# ------------------------
-# Qt resources
-# ------------------------
 if(Qt6_FOUND)
   qt6_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
 elseif(Qt5_FOUND)
   qt5_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
 endif()
 
-# ------------------------
-# Include directories
-# ------------------------
 include_directories(../cockatrice/src)
+include_directories(../common)
 
-# ------------------------
-# Optional libraries
-# ------------------------
-# ZLIB
+# Libz is required to support zipped files
 find_package(ZLIB)
 if(ZLIB_FOUND)
   include_directories(${ZLIB_INCLUDE_DIRS})
   add_definitions("-DHAS_ZLIB")
-  list(APPEND oracle_SOURCES src/zip/unzip.cpp src/zip/zipglobal.cpp)
+
+  set(oracle_SOURCES ${oracle_SOURCES} src/zip/unzip.cpp src/zip/zipglobal.cpp)
 else()
   message(STATUS "Oracle: zlib not found; ZIP support disabled")
 endif()
 
-# LZMA
+# LibLZMA is required to support xz files
 find_package(LibLZMA)
 if(LIBLZMA_FOUND)
   include_directories(${LIBLZMA_INCLUDE_DIRS})
   add_definitions("-DHAS_LZMA")
-  list(APPEND oracle_SOURCES src/lzma/decompress.cpp)
+
+  set(oracle_SOURCES ${oracle_SOURCES} src/lzma/decompress.cpp)
 else()
   message(STATUS "Oracle: LibLZMA not found; xz support disabled")
 endif()
 
-# ------------------------
-# Build executable
-# ------------------------
-
 set(ORACLE_MAC_QM_INSTALL_DIR "oracle.app/Contents/Resources/translations")
 set(ORACLE_UNIX_QM_INSTALL_DIR "share/oracle/translations")
 set(ORACLE_WIN32_QM_INSTALL_DIR "translations")
@@ -137,16 +130,7 @@ elseif(Qt5_FOUND)
   endif()
 endif()
 
-# ------------------------
-# Link libraries
-# ------------------------
-target_link_libraries(
-  oracle
-  PUBLIC libcockatrice_card
-  PUBLIC libcockatrice_settings
-  PUBLIC libcockatrice_network
-  PUBLIC ${ORACLE_QT_MODULES}
-)
+target_link_libraries(oracle PUBLIC ${ORACLE_QT_MODULES})
 
 if(ZLIB_FOUND)
   target_link_libraries(oracle PUBLIC ${ZLIB_LIBRARIES})
@@ -156,9 +140,6 @@ if(LIBLZMA_FOUND)
   target_link_libraries(oracle PUBLIC ${LIBLZMA_LIBRARIES})
 endif()
 
-# ------------------------
-# Install rules
-# ------------------------
 if(UNIX)
   if(APPLE)
     set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}")
@@ -184,9 +165,6 @@ if(NOT WIN32 AND NOT APPLE)
   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR})
 endif(NOT WIN32 AND NOT APPLE)
 
-# ------------------------
-# Qt plugin handling
-# ------------------------
 if(APPLE)
   # these needs to be relative to CMAKE_INSTALL_PREFIX
   set(plugin_dest_dir oracle.app/Contents/Plugins)
@@ -281,9 +259,6 @@ Translations = Resources/translations\")
   )
 endif()
 
-# ------------------------
-# Qt translations
-# ------------------------
 if(Qt6_FOUND AND Qt6LinguistTools_FOUND)
   #Qt6 Translations happen after the executable is built up
   if(UPDATE_TRANSLATIONS)
diff --git a/oracle/oracle_en@source.ts b/oracle/oracle_en@source.ts
index 943b44a97..e0fd59842 100644
--- a/oracle/oracle_en@source.ts
+++ b/oracle/oracle_en@source.ts
@@ -4,22 +4,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27,134 +27,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -162,57 +162,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -220,57 +205,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -278,7 +248,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation type="unfinished"></translation>
     </message>
@@ -286,7 +256,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -294,22 +264,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -317,73 +287,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -391,56 +361,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -589,7 +537,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp
index 5def0c887..f2930f975 100644
--- a/oracle/src/main.cpp
+++ b/oracle/src/main.cpp
@@ -2,8 +2,8 @@
 
 #include "interface/theme_manager.h"
 #include "oraclewizard.h"
+#include "settings/cache_settings.h"
 
-#include <../../cockatrice/src/client/settings/cache_settings.h>
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QIcon>
diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index 578afd98d..91137e634 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -1,7 +1,6 @@
 #include "oracleimporter.h"
 
-#include "libcockatrice/interfaces/noop_card_preference_provider.h"
-#include "libcockatrice/interfaces/noop_card_set_priority_controller.h"
+#include "database/parser/cockatrice_xml_4.h"
 #include "parsehelpers.h"
 #include "qt-json/json.h"
 
@@ -9,12 +8,6 @@
 #include <QRegularExpression>
 #include <algorithm>
 #include <climits>
-#include <libcockatrice/card/database/parser/cockatrice_xml_4.h>
-#include <libcockatrice/card/relation/card_relation.h>
-
-static const QList<AllowedCount> kConstructedCounts = {{4, "legal"}, {0, "banned"}};
-
-static const QList<AllowedCount> kSingletonCounts = {{1, "legal"}, {0, "banned"}};
 
 SplitCardPart::SplitCardPart(const QString &_name,
                              const QString &_text,
@@ -44,6 +37,8 @@ static CardSet::Priority getSetPriority(const QString &setType, const QString &s
 
 bool OracleImporter::readSetsFromByteArray(const QByteArray &data)
 {
+    QList<SetToDownload> newSetList;
+
     bool ok;
     auto setsMap = QtJson::Json::parse(QString(data), ok).toMap().value("data").toMap();
     if (!ok) {
@@ -51,8 +46,6 @@ bool OracleImporter::readSetsFromByteArray(const QByteArray &data)
         return false;
     }
 
-    QList<SetToDownload> newSetList;
-
     QListIterator it(setsMap.values());
 
     while (it.hasNext()) {
@@ -156,8 +149,7 @@ CardInfoPtr OracleImporter::addCard(QString name,
         QStringList symbols = manacost.split("}");
         QString formattedCardCost;
         for (QString symbol : symbols) {
-            static const auto manaCostPattern = QRegularExpression("[0-9WUBGRP]/[0-9WUBGRP]");
-            if (symbol.contains(manaCostPattern)) {
+            if (symbol.contains(QRegularExpression("[0-9WUBGRP]/[0-9WUBGRP]"))) {
                 symbol.append("}");
             } else {
                 symbol.remove(QChar('{'));
@@ -191,9 +183,9 @@ 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")
         tableRow = 2;
@@ -207,11 +199,11 @@ CardInfoPtr OracleImporter::addCard(QString name,
     bool upsideDown = layout == "flip" && side == "back";
 
     // insert the card and its properties
+    QList<CardRelation *> reverseRelatedCards;
     SetToPrintingsMap setsInfo;
     setsInfo[printingInfo.getSet()->getShortName()].append(printingInfo);
-    CardInfo::UiAttributes attributes = {cipt, landscapeOrientation, tableRow, upsideDown};
-    CardInfoPtr newCard =
-        CardInfo::newInstance(name, text, isToken, properties, relatedCards, {}, setsInfo, attributes);
+    CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards,
+                                                setsInfo, cipt, landscapeOrientation, tableRow, upsideDown);
 
     if (name.isEmpty()) {
         qDebug() << "warning: an empty card was added to set" << printingInfo.getSet()->getShortName();
@@ -242,26 +234,26 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
     // mtgjson name => xml name
     static const QMap<QString, QString> identifierProperties{{"multiverseId", "muid"}, {"scryfallId", "uuid"}};
 
-    static const QString ptSeparator = "/";
+    int numCards = 0;
+    QMap<QString, QPair<QList<SplitCardPart>, QString>> splitCards;
+    QString ptSeparator("/");
+    QVariantMap card;
+    QString layout, name, text, colors, colorIdentity, faceName;
     static constexpr bool isToken = false;
     static const QList<QString> setsWithCardsWithSameNameButDifferentText = {"UST"};
-
-    int numCards = 0;
-
-    // Keeps track of any split card faces encountered so far
-    QMap<QString, QPair<QList<SplitCardPart>, QString>> splitCards;
-
-    // Keeps track of all names encountered so far
+    QVariantHash properties;
+    PrintingInfo printingInfo;
+    QList<CardRelation *> relatedCards;
     QList<QString> allNameProps;
 
     for (const QVariant &cardVar : cardsList) {
-        QVariantMap card = cardVar.toMap();
+        card = cardVar.toMap();
 
         /* Currently used layouts are:
          * augment, double_faced_token, flip, host, leveler, meld, normal, planar,
          * saga, scheme, split, token, transform, vanguard
          */
-        QString layout = getStringPropertyFromMap(card, "layout");
+        layout = getStringPropertyFromMap(card, "layout");
 
         // don't import tokens from the json file
         if (layout == "token") {
@@ -269,45 +261,44 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
         }
 
         // normal cards handling
-        QString name = getStringPropertyFromMap(card, "name");
-        QString text = getStringPropertyFromMap(card, "text");
-        QString faceName = getStringPropertyFromMap(card, "faceName");
+        name = getStringPropertyFromMap(card, "name");
+        text = getStringPropertyFromMap(card, "text");
+        faceName = getStringPropertyFromMap(card, "faceName");
         if (faceName.isEmpty()) {
             faceName = name;
         }
 
         // card properties
-        QVariantHash properties;
-        for (auto i = cardProperties.cbegin(), end = cardProperties.cend(); i != end; ++i) {
-            QString mtgjsonProperty = i.key();
-            QString xmlPropertyName = i.value();
+        properties.clear();
+        QMapIterator it(cardProperties);
+        while (it.hasNext()) {
+            it.next();
+            QString mtgjsonProperty = it.key();
+            QString xmlPropertyName = it.value();
             QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty);
             if (!propertyValue.isEmpty())
                 properties.insert(xmlPropertyName, propertyValue);
         }
 
         // per-set properties
-        PrintingInfo printingInfo = PrintingInfo(currentSet);
-        for (auto i = setInfoProperties.cbegin(), end = setInfoProperties.cend(); i != end; ++i) {
-            QString mtgjsonProperty = i.key();
-            QString xmlPropertyName = i.value();
+        printingInfo = PrintingInfo(currentSet);
+        QMapIterator it2(setInfoProperties);
+        while (it2.hasNext()) {
+            it2.next();
+            QString mtgjsonProperty = it2.key();
+            QString xmlPropertyName = it2.value();
             QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty);
             if (!propertyValue.isEmpty())
                 printingInfo.setProperty(xmlPropertyName, propertyValue);
         }
 
-        // handle flavorNames specially due to double-faced cards
-        QString faceFlavorName = getStringPropertyFromMap(card, "faceFlavorName");
-        QString flavorName = !faceFlavorName.isEmpty() ? faceFlavorName : getStringPropertyFromMap(card, "flavorName");
-        if (!flavorName.isEmpty()) {
-            printingInfo.setProperty("flavorName", flavorName);
-        }
-
         // Identifiers
-        for (auto i = identifierProperties.cbegin(), end = identifierProperties.cend(); i != end; ++i) {
-            QString mtgjsonProperty = i.key();
-            QString xmlPropertyName = i.value();
-            QString propertyValue = getStringPropertyFromMap(card.value("identifiers").toMap(), mtgjsonProperty);
+        QMapIterator it3(identifierProperties);
+        while (it3.hasNext()) {
+            it3.next();
+            auto mtgjsonProperty = it3.key();
+            auto xmlPropertyName = it3.value();
+            auto propertyValue = getStringPropertyFromMap(card.value("identifiers").toMap(), mtgjsonProperty);
             if (!propertyValue.isEmpty()) {
                 printingInfo.setProperty(xmlPropertyName, propertyValue);
             }
@@ -326,13 +317,13 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
         allNameProps.append(faceName);
 
         // special handling properties
-        QString colors = card.value("colors").toStringList().join("");
+        colors = card.value("colors").toStringList().join("");
         if (!colors.isEmpty()) {
             properties.insert("colors", colors);
         }
 
         // special handling properties
-        QString colorIdentity = card.value("colorIdentity").toStringList().join("");
+        colorIdentity = card.value("colorIdentity").toStringList().join("");
         if (!colorIdentity.isEmpty()) {
             properties.insert("coloridentity", colorIdentity);
         }
@@ -355,23 +346,25 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
         }
 
         auto legalities = card.value("legalities").toMap();
-        for (auto i = legalities.cbegin(), end = legalities.cend(); i != end; ++i) {
-            properties.insert(QString("format-%1").arg(i.key()), i.value().toString().toLower());
+        for (const QString &fmtName : legalities.keys()) {
+            properties.insert(QString("format-%1").arg(fmtName), legalities.value(fmtName).toString().toLower());
         }
 
         // 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);
             }
         } else {
             // relations
-            QList<CardRelation *> relatedCards;
+            relatedCards.clear();
 
             // add other face for split cards as card relation
             if (!getStringPropertyFromMap(card, "side").isEmpty()) {
@@ -386,12 +379,12 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
                     static const QRegularExpression meldNameRegex{"then meld them into ([^\\.]*)"};
                     QString additionalName = meldNameRegex.match(text).captured(1);
                     if (!additionalName.isNull()) {
-                        relatedCards.append(new CardRelation(additionalName, CardRelationType::TransformInto));
+                        relatedCards.append(new CardRelation(additionalName, CardRelation::TransformInto));
                     }
                 } else {
                     for (const QString &additionalName : name.split(" // ")) {
                         if (additionalName != faceName) {
-                            relatedCards.append(new CardRelation(additionalName, CardRelationType::TransformInto));
+                            relatedCards.append(new CardRelation(additionalName, CardRelation::TransformInto));
                         }
                     }
                 }
@@ -406,7 +399,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
                     auto spbk = givenRelated.value("spellbook").toStringList();
                     for (const QString &spbkName : spbk) {
                         relatedCards.append(
-                            new CardRelation(spbkName, CardRelationType::DoesNotAttach, false, false, 1, true));
+                            new CardRelation(spbkName, CardRelation::DoesNotAttach, false, false, 1, true));
                     }
                 }
             }
@@ -419,15 +412,17 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
     // split cards handling
     static const QString splitCardPropSeparator = QString(" // ");
     static const QString splitCardTextSeparator = QString("\n\n---\n\n");
-    static const QList<CardRelation *> noRelatedCards = {};
+    for (const QString &nameSplit : splitCards.keys()) {
+        // get all parts for this specific card
+        QList<SplitCardPart> splitCardParts = splitCards.value(nameSplit).first;
+        name = splitCards.value(nameSplit).second;
 
-    QList<QPair<QList<SplitCardPart>, QString>> partsAndNames = splitCards.values();
-    for (auto [splitCardParts, name] : partsAndNames) {
-        QString text;
-        QVariantHash properties;
-        PrintingInfo printingInfo;
+        text.clear();
+        properties.clear();
+        relatedCards.clear();
 
         for (const SplitCardPart &tmp : splitCardParts) {
+            QString splitName = tmp.getName();
             if (!text.isEmpty()) {
                 text.append(splitCardTextSeparator);
             }
@@ -438,10 +433,9 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
                 printingInfo = tmp.getPrintingInfo();
             } else {
                 const QVariantHash &tmpProps = tmp.getProperties();
-                for (auto i = tmpProps.cbegin(), end = tmpProps.cend(); i != end; ++i) {
-                    QString prop = i.key();
+                for (const QString &prop : tmpProps.keys()) {
                     QString originalPropertyValue = properties.value(prop).toString();
-                    QString thisCardPropertyValue = i.value().toString();
+                    QString thisCardPropertyValue = tmpProps.value(prop).toString();
                     if (!thisCardPropertyValue.isEmpty() && originalPropertyValue != thisCardPropertyValue) {
                         if (originalPropertyValue.isEmpty()) { // don't create //es if one field is empty
                             properties.insert(prop, thisCardPropertyValue);
@@ -457,93 +451,24 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
                 }
             }
         }
-        CardInfoPtr newCard = addCard(name, text, isToken, properties, noRelatedCards, printingInfo);
+        CardInfoPtr newCard = addCard(name, text, isToken, properties, relatedCards, printingInfo);
         numCards++;
     }
 
     return numCards;
 }
 
-FormatRulesNameMap OracleImporter::createDefaultMagicFormats()
-{
-    // Predefined common exceptions
-    CardCondition superTypeIsBasic;
-    superTypeIsBasic.field = "type";
-    superTypeIsBasic.matchType = "contains";
-    superTypeIsBasic.value = "Basic Land";
-
-    ExceptionRule basicLands;
-    basicLands.conditions.append(superTypeIsBasic);
-
-    CardCondition anyNumberAllowed;
-    anyNumberAllowed.field = "text";
-    anyNumberAllowed.matchType = "contains";
-    anyNumberAllowed.value = "A deck can have any number of";
-
-    ExceptionRule mayContainAnyNumber;
-    mayContainAnyNumber.conditions.append(anyNumberAllowed);
-
-    // Map to store default rules
-    FormatRulesNameMap defaultFormatRulesNameMap;
-
-    // ----------------- Helper lambda to create format -----------------
-    auto makeFormat = [&](const QString &name, int minDeck = 60, int maxDeck = -1, int maxSideboardSize = 15,
-                          const QList<AllowedCount> &allowedCounts = kConstructedCounts) -> FormatRulesPtr {
-        FormatRulesPtr f(new FormatRules);
-        f->formatName = name;
-        f->allowedCounts = allowedCounts;
-        f->minDeckSize = minDeck;
-        f->maxDeckSize = maxDeck;
-        f->maxSideboardSize = maxSideboardSize;
-        f->exceptions.append(basicLands);
-        f->exceptions.append(mayContainAnyNumber);
-        defaultFormatRulesNameMap.insert(name.toLower(), f);
-        return f;
-    };
-
-    // ----------------- Standard formats -----------------
-    makeFormat("Standard");
-    makeFormat("Modern");
-    makeFormat("Legacy");
-    makeFormat("Pioneer");
-    makeFormat("Historic");
-    makeFormat("Timeless");
-    makeFormat("Future");
-    makeFormat("OldSchool");
-    makeFormat("Premodern");
-    makeFormat("Pauper");
-    makeFormat("Penny");
-
-    // ----------------- Singleton formats -----------------
-    makeFormat("Commander", 100, 100, 15, kSingletonCounts);
-    makeFormat("Duel", 100, 100, 15, kSingletonCounts);
-    makeFormat("Brawl", 60, 60, 15, kSingletonCounts);
-    makeFormat("StandardBrawl", 60, 60, 15, kSingletonCounts);
-    makeFormat("Oathbreaker", 60, 60, 15, kSingletonCounts);
-    makeFormat("PauperCommander", 100, 100, 15, kSingletonCounts);
-    makeFormat("Predh", 100, 100, 15, kSingletonCounts);
-
-    // ----------------- Restricted formats -----------------
-    makeFormat("Vintage", 60, -1, 15, {{4, "legal"}, {1, "restricted"}, {0, "banned"}});
-
-    return defaultFormatRulesNameMap;
-}
-
 int OracleImporter::startImport()
 {
-    static ICardSetPriorityController *noOpController = new NoopCardSetPriorityController();
-
+    int setCards = 0, setIndex = 0;
     // add an empty set for tokens
-    CardSetPtr tokenSet =
-        CardSet::newInstance(noOpController, CardSet::TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens");
+    CardSetPtr tokenSet = CardSet::newInstance(CardSet::TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens");
     sets.insert(CardSet::TOKENS_SETNAME, tokenSet);
 
-    int setIndex = 0;
-
     for (const SetToDownload &curSetToParse : allSets) {
-        CardSetPtr newSet = CardSet::newInstance(noOpController, curSetToParse.getShortName(),
-                                                 curSetToParse.getLongName(), curSetToParse.getSetType(),
-                                                 curSetToParse.getReleaseDate(), curSetToParse.getPriority());
+        CardSetPtr newSet =
+            CardSet::newInstance(curSetToParse.getShortName(), curSetToParse.getLongName(), curSetToParse.getSetType(),
+                                 curSetToParse.getReleaseDate(), curSetToParse.getPriority());
         if (!sets.contains(newSet->getShortName()))
             sets.insert(newSet->getShortName(), newSet);
 
@@ -554,7 +479,7 @@ int OracleImporter::startImport()
         emit setIndexChanged(numCardsInSet, setIndex, curSetToParse.getLongName());
     }
 
-    emit setIndexChanged(0, setIndex, QString());
+    emit setIndexChanged(setCards, setIndex, QString());
 
     // total number of sets
     return setIndex;
@@ -562,9 +487,8 @@ int OracleImporter::startImport()
 
 bool OracleImporter::saveToFile(const QString &fileName, const QString &sourceUrl, const QString &sourceVersion)
 {
-    CockatriceXml4Parser parser(new NoopCardPreferenceProvider(), new NoopCardSetPriorityController());
-
-    return parser.saveToFile(createDefaultMagicFormats(), sets, cards, fileName, sourceUrl, sourceVersion);
+    CockatriceXml4Parser parser;
+    return parser.saveToFile(sets, cards, fileName, sourceUrl, sourceVersion);
 }
 
 void OracleImporter::clear()
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index 5bf352594..5f40af9ba 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -4,7 +4,7 @@
 #include <QMap>
 #include <QRegularExpression>
 #include <QVariant>
-#include <libcockatrice/card/card_info.h>
+#include <card/card_info.h>
 #include <utility>
 
 // many users prefer not to see these sets with non english arts
@@ -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},
@@ -155,7 +154,6 @@ public:
     int startImport();
     bool saveToFile(const QString &fileName, const QString &sourceUrl, const QString &sourceVersion);
     int importCardsFromSet(const CardSetPtr &currentSet, const QList<QVariant> &cardsList);
-    FormatRulesNameMap createDefaultMagicFormats();
     const CardNameMap &getCardList() const
     {
         return cards;
diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp
index 2edb9e561..0fdd4b8f1 100644
--- a/oracle/src/oraclewizard.cpp
+++ b/oracle/src/oraclewizard.cpp
@@ -1,38 +1,63 @@
 #include "oraclewizard.h"
 
-#include "client/settings/cache_settings.h"
 #include "main.h"
 #include "oracleimporter.h"
-#include "pages.h"
-#include "pagetemplates.h"
+#include "settings/cache_settings.h"
+#include "version_string.h"
 
+#include <QAbstractButton>
+#include <QBuffer>
 #include <QCheckBox>
+#include <QComboBox>
+#include <QDir>
 #include <QFileDialog>
 #include <QGridLayout>
+#include <QLabel>
 #include <QLineEdit>
+#include <QMessageBox>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QProgressBar>
 #include <QPushButton>
+#include <QRadioButton>
 #include <QScrollBar>
+#include <QStandardPaths>
+#include <QTextEdit>
 #include <QtConcurrent>
 #include <QtGui>
 
+#ifdef HAS_LZMA
+#include "lzma/decompress.h"
+#endif
+
+#ifdef HAS_ZLIB
+#include "zip/unzip.h"
+#endif
+
+#define ZIP_SIGNATURE "PK"
+// Xz stream header: 0xFD + "7zXZ"
+#define XZ_SIGNATURE "\xFD\x37\x7A\x58\x5A"
+#define MTGJSON_V4_URL_COMPONENT "mtgjson.com/files/"
+#define ALLSETS_URL_FALLBACK "https://www.mtgjson.com/api/v5/AllPrintings.json"
+#define MTGJSON_VERSION_URL "https://www.mtgjson.com/api/v5/Meta.json"
+
+#ifdef HAS_LZMA
+#define ALLSETS_URL "https://www.mtgjson.com/api/v5/AllPrintings.json.xz"
+#elif defined(HAS_ZLIB)
+#define ALLSETS_URL "https://www.mtgjson.com/api/v5/AllPrintings.json.zip"
+#else
+#define ALLSETS_URL "https://www.mtgjson.com/api/v5/AllPrintings.json"
+#endif
+
+#define TOKENS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Token/master/tokens.xml"
+#define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"
+
 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);
-
-    // We moved the oracle-specific settings from global.ini to a separate oracle.ini after 2.10
-    if (!QFile::exists(oracleSettingsFile)) {
-        migrateOracleSettings();
-    }
-
+    settings = new QSettings(SettingsCache::instance().getSettingsPath() + "global.ini", QSettings::IniFormat, this);
     connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &OracleWizard::updateLanguage);
 
     importer = new OracleImporter(this);
@@ -61,26 +86,6 @@ OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
     retranslateUi();
 }
 
-/**
- * Migrates the oracle-specific settings from global.ini to oracle.ini
- */
-void OracleWizard::migrateOracleSettings()
-{
-    QString filePath = SettingsCache::instance().getSettingsPath() + "global.ini";
-    auto globalSettings = QSettings(filePath, QSettings::IniFormat, this);
-
-    auto tryMigrateValue = [this, &globalSettings](const QString &name) {
-        QVariant variant = globalSettings.value(name);
-        if (variant.isValid()) {
-            settings->setValue(name, variant.toString());
-        }
-    };
-
-    tryMigrateValue("allsetsurl");
-    tryMigrateValue("tokensurl");
-    tryMigrateValue("spoilersurl");
-}
-
 void OracleWizard::updateLanguage()
 {
     qApp->removeTranslator(translator);
@@ -137,3 +142,667 @@ bool OracleWizard::saveTokensToFile(const QString &fileName)
     file.close();
     return true;
 }
+
+IntroPage::IntroPage(QWidget *parent) : OracleWizardPage(parent)
+{
+    label = new QLabel(this);
+    label->setWordWrap(true);
+
+    languageLabel = new QLabel(this);
+    versionLabel = new QLabel(this);
+    languageBox = new QComboBox(this);
+
+    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);
+    }
+
+    connect(languageBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &IntroPage::languageBoxChanged);
+
+    auto *layout = new QGridLayout(this);
+    layout->addWidget(label, 0, 0, 1, 2);
+    layout->addWidget(languageLabel, 1, 0);
+    layout->addWidget(languageBox, 1, 1);
+    layout->addWidget(versionLabel, 2, 0, 1, 2);
+
+    setLayout(layout);
+}
+
+void IntroPage::initializePage()
+{
+    if (wizard()->backgroundMode) {
+        emit readyToContinue();
+    }
+}
+
+QStringList IntroPage::findQmFiles()
+{
+    QDir dir(translationPath);
+    QStringList fileNames = dir.entryList(QStringList(translationPrefix + "_*.qm"), QDir::Files, QDir::Name);
+    fileNames.replaceInStrings(QRegularExpression(translationPrefix + "_(.*)\\.qm"), "\\1");
+    return fileNames;
+}
+
+QString IntroPage::languageName(const QString &lang)
+{
+    QTranslator qTranslator;
+
+    QString appNameHint = translationPrefix + "_" + lang;
+    bool appTranslationLoaded = qTranslator.load(appNameHint, translationPath);
+    if (!appTranslationLoaded) {
+        qDebug() << "Unable to load" << translationPrefix << "translation" << appNameHint << "at" << translationPath;
+    }
+
+    return qTranslator.translate("i18n", DEFAULT_LANG_NAME);
+}
+
+void IntroPage::languageBoxChanged(int index)
+{
+    SettingsCache::instance().setLang(languageBox->itemData(index).toString());
+}
+
+void IntroPage::retranslateUi()
+{
+    setTitle(tr("Introduction"));
+    label->setText(tr("This wizard will import the list of sets, cards, and tokens "
+                      "that will be used by Cockatrice."));
+    languageLabel->setText(tr("Interface language:"));
+    versionLabel->setText(tr("Version:") + QString(" %1").arg(VERSION_STRING));
+}
+
+void OutroPage::retranslateUi()
+{
+    setTitle(tr("Finished"));
+    setSubTitle(tr("The wizard has finished.") + "<br>" +
+                tr("You can now start using Cockatrice with the newly updated cards.") + "<br><br>" +
+                tr("If the card databases don't reload automatically, restart the Cockatrice client."));
+}
+
+void OutroPage::initializePage()
+{
+    if (wizard()->backgroundMode) {
+        wizard()->accept();
+        exit(0);
+    }
+}
+
+LoadSetsPage::LoadSetsPage(QWidget *parent) : OracleWizardPage(parent)
+{
+    urlRadioButton = new QRadioButton(this);
+    fileRadioButton = new QRadioButton(this);
+
+    urlLineEdit = new QLineEdit(this);
+    fileLineEdit = new QLineEdit(this);
+
+    progressLabel = new QLabel(this);
+    progressBar = new QProgressBar(this);
+
+    urlRadioButton->setChecked(true);
+
+    urlButton = new QPushButton(this);
+    connect(urlButton, &QPushButton::clicked, this, &LoadSetsPage::actRestoreDefaultUrl);
+
+    fileButton = new QPushButton(this);
+    connect(fileButton, &QPushButton::clicked, this, &LoadSetsPage::actLoadSetsFile);
+
+    auto *layout = new QGridLayout(this);
+    layout->addWidget(urlRadioButton, 0, 0);
+    layout->addWidget(urlLineEdit, 0, 1);
+    layout->addWidget(urlButton, 1, 1, Qt::AlignRight);
+    layout->addWidget(fileRadioButton, 2, 0);
+    layout->addWidget(fileLineEdit, 2, 1);
+    layout->addWidget(fileButton, 3, 1, Qt::AlignRight);
+    layout->addWidget(progressLabel, 4, 0);
+    layout->addWidget(progressBar, 4, 1);
+
+    connect(&watcher, &QFutureWatcher<bool>::finished, this, &LoadSetsPage::importFinished);
+
+    setLayout(layout);
+}
+
+void LoadSetsPage::initializePage()
+{
+    urlLineEdit->setText(wizard()->settings->value("allsetsurl", ALLSETS_URL).toString());
+
+    progressLabel->hide();
+    progressBar->hide();
+
+    if (wizard()->backgroundMode) {
+        if (isEnabled()) {
+            validatePage();
+        }
+    }
+}
+
+void LoadSetsPage::retranslateUi()
+{
+    setTitle(tr("Source selection"));
+    setSubTitle(tr("Please specify a compatible source for the list of sets and cards. "
+                   "You can specify a URL address that will be downloaded or "
+                   "use an existing file from your computer."));
+
+    urlRadioButton->setText(tr("Download URL:"));
+    fileRadioButton->setText(tr("Local file:"));
+    urlButton->setText(tr("Restore default URL"));
+    fileButton->setText(tr("Choose file..."));
+}
+
+void LoadSetsPage::actRestoreDefaultUrl()
+{
+    urlLineEdit->setText(ALLSETS_URL);
+}
+
+void LoadSetsPage::actLoadSetsFile()
+{
+    QFileDialog dialog(this, tr("Load sets file"));
+    dialog.setFileMode(QFileDialog::ExistingFile);
+
+    QString extensions = "*.json *.xml";
+#ifdef HAS_ZLIB
+    extensions += " *.zip";
+#endif
+#ifdef HAS_LZMA
+    extensions += " *.xz";
+#endif
+    dialog.setNameFilter(tr("Sets file (%1)").arg(extensions));
+
+    if (!fileLineEdit->text().isEmpty() && QFile::exists(fileLineEdit->text())) {
+        dialog.selectFile(fileLineEdit->text());
+    }
+
+    if (!dialog.exec()) {
+        return;
+    }
+
+    fileLineEdit->setText(dialog.selectedFiles().at(0));
+}
+
+bool LoadSetsPage::validatePage()
+{
+    // once the import is finished, we call next(); skip validation
+    if (wizard()->downloadedPlainXml || wizard()->importer->getSets().count() > 0) {
+        return true;
+    }
+
+    // else, try to import sets
+    if (urlRadioButton->isChecked()) {
+        // If a user attempts to download from V4, redirect them to V5
+        if (urlLineEdit->text().contains(MTGJSON_V4_URL_COMPONENT)) {
+            actRestoreDefaultUrl();
+        }
+
+        const auto url = QUrl::fromUserInput(urlLineEdit->text());
+
+        if (!url.isValid()) {
+            QMessageBox::critical(this, tr("Error"), tr("The provided URL is not valid."));
+            return false;
+        }
+
+        progressLabel->setText(tr("Downloading (0MB)"));
+        // show an infinite progressbar
+        progressBar->setMaximum(0);
+        progressBar->setMinimum(0);
+        progressBar->setValue(0);
+        progressLabel->show();
+        progressBar->show();
+
+        wizard()->disableButtons();
+        setEnabled(false);
+
+        downloadSetsFile(url);
+    } else if (fileRadioButton->isChecked()) {
+        QFile setsFile(fileLineEdit->text());
+        if (!setsFile.exists()) {
+            QMessageBox::critical(this, tr("Error"), tr("Please choose a file."));
+            return false;
+        }
+
+        if (!setsFile.open(QIODevice::ReadOnly)) {
+            QMessageBox::critical(nullptr, tr("Error"), tr("Cannot open file '%1'.").arg(fileLineEdit->text()));
+            return false;
+        }
+
+        wizard()->disableButtons();
+        setEnabled(false);
+
+        wizard()->setCardSourceUrl(setsFile.fileName());
+        wizard()->setCardSourceVersion("unknown");
+
+        readSetsFromByteArray(setsFile.readAll());
+    }
+
+    return false;
+}
+
+void LoadSetsPage::downloadSetsFile(const QUrl &url)
+{
+    wizard()->setCardSourceVersion("unknown");
+
+    const auto urlString = url.toString();
+    if (urlString == ALLSETS_URL || urlString == ALLSETS_URL_FALLBACK) {
+        const auto versionUrl = QUrl::fromUserInput(MTGJSON_VERSION_URL);
+        auto *versionReply = wizard()->nam->get(QNetworkRequest(versionUrl));
+        connect(versionReply, &QNetworkReply::finished, [this, versionReply]() {
+            if (versionReply->error() == QNetworkReply::NoError) {
+                auto jsonData = versionReply->readAll();
+                QJsonParseError jsonError{};
+                auto jsonResponse = QJsonDocument::fromJson(jsonData, &jsonError);
+
+                if (jsonError.error == QJsonParseError::NoError) {
+                    const auto jsonMap = jsonResponse.toVariant().toMap();
+
+                    auto versionString = jsonMap.value("meta").toMap().value("version").toString();
+                    if (versionString.isEmpty()) {
+                        versionString = "unknown";
+                    }
+                    wizard()->setCardSourceVersion(versionString);
+                }
+            }
+
+            versionReply->deleteLater();
+        });
+    }
+
+    wizard()->setCardSourceUrl(url.toString());
+
+    auto *reply = wizard()->nam->get(QNetworkRequest(url));
+
+    connect(reply, &QNetworkReply::finished, this, &LoadSetsPage::actDownloadFinishedSetsFile);
+    connect(reply, &QNetworkReply::downloadProgress, this, &LoadSetsPage::actDownloadProgressSetsFile);
+}
+
+void LoadSetsPage::actDownloadProgressSetsFile(qint64 received, qint64 total)
+{
+    if (total > 0) {
+        progressBar->setMaximum(static_cast<int>(total));
+        progressBar->setValue(static_cast<int>(received));
+    }
+    progressLabel->setText(tr("Downloading (%1MB)").arg((int)received / (1024 * 1024)));
+}
+
+void LoadSetsPage::actDownloadFinishedSetsFile()
+{
+    // check for a reply
+    auto *reply = dynamic_cast<QNetworkReply *>(sender());
+    auto errorCode = reply->error();
+    if (errorCode != QNetworkReply::NoError) {
+        QMessageBox::critical(this, tr("Error"), tr("Network error: %1.").arg(reply->errorString()));
+
+        wizard()->enableButtons();
+        setEnabled(true);
+
+        reply->deleteLater();
+        return;
+    }
+
+    auto statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    if (statusCode == 301 || statusCode == 302) {
+        const auto redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
+        qDebug() << "following redirect url:" << redirectUrl.toString();
+        downloadSetsFile(redirectUrl);
+        reply->deleteLater();
+        return;
+    }
+
+    progressLabel->hide();
+    progressBar->hide();
+
+    // save AllPrintings.json url, but only if the user customized it and download was successful
+    if (urlLineEdit->text() != QString(ALLSETS_URL)) {
+        wizard()->settings->setValue("allsetsurl", urlLineEdit->text());
+    } else {
+        wizard()->settings->remove("allsetsurl");
+    }
+
+    readSetsFromByteArray(reply->readAll());
+    reply->deleteLater();
+}
+
+void LoadSetsPage::readSetsFromByteArray(QByteArray _data)
+{
+    // show an infinite progressbar
+    progressBar->setMaximum(0);
+    progressBar->setMinimum(0);
+    progressBar->setValue(0);
+    progressLabel->setText(tr("Parsing file"));
+    progressLabel->show();
+    progressBar->show();
+
+    wizard()->downloadedPlainXml = false;
+    wizard()->xmlData.clear();
+    readSetsFromByteArrayRef(_data);
+}
+
+void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &_data)
+{
+    // unzip the file if needed
+    if (_data.startsWith(XZ_SIGNATURE)) {
+#ifdef HAS_LZMA
+        // zipped file
+        auto *inBuffer = new QBuffer(&_data);
+        auto newData = QByteArray();
+        auto *outBuffer = new QBuffer(&newData);
+        inBuffer->open(QBuffer::ReadOnly);
+        outBuffer->open(QBuffer::WriteOnly);
+        XzDecompressor xz;
+        if (!xz.decompress(inBuffer, outBuffer)) {
+            zipDownloadFailed(tr("Xz extraction failed."));
+            return;
+        }
+        _data.clear();
+        readSetsFromByteArrayRef(newData);
+        return;
+#else
+        zipDownloadFailed(tr("Sorry, this version of Oracle does not support xz compressed files."));
+
+        wizard()->enableButtons();
+        setEnabled(true);
+        progressLabel->hide();
+        progressBar->hide();
+        return;
+#endif
+    } else if (_data.startsWith(ZIP_SIGNATURE)) {
+#ifdef HAS_ZLIB
+        // zipped file
+        auto *inBuffer = new QBuffer(&_data);
+        auto newData = QByteArray();
+        auto *outBuffer = new QBuffer(&newData);
+        QString fileName;
+        UnZip::ErrorCode ec;
+        UnZip uz;
+
+        ec = uz.openArchive(inBuffer);
+        if (ec != UnZip::Ok) {
+            zipDownloadFailed(tr("Failed to open Zip archive: %1.").arg(uz.formatError(ec)));
+            return;
+        }
+
+        if (uz.fileList().size() != 1) {
+            zipDownloadFailed(tr("Zip extraction failed: the Zip archive doesn't contain exactly one file."));
+            return;
+        }
+        fileName = uz.fileList().at(0);
+
+        outBuffer->open(QBuffer::ReadWrite);
+        ec = uz.extractFile(fileName, outBuffer);
+        if (ec != UnZip::Ok) {
+            zipDownloadFailed(tr("Zip extraction failed: %1.").arg(uz.formatError(ec)));
+            uz.closeArchive();
+            return;
+        }
+        _data.clear();
+        readSetsFromByteArrayRef(newData);
+        return;
+#else
+        zipDownloadFailed(tr("Sorry, this version of Oracle does not support zipped files."));
+
+        wizard()->enableButtons();
+        setEnabled(true);
+        progressLabel->hide();
+        progressBar->hide();
+        return;
+#endif
+    } else if (_data.startsWith("{")) {
+        // Start the computation.
+        jsonData = std::move(_data);
+        future = QtConcurrent::run([this] { return wizard()->importer->readSetsFromByteArray(std::move(jsonData)); });
+        watcher.setFuture(future);
+    } else if (_data.startsWith("<")) {
+        // save xml file and don't do any processing
+        wizard()->downloadedPlainXml = true;
+        wizard()->xmlData = std::move(_data);
+        importFinished();
+    } else {
+        wizard()->enableButtons();
+        setEnabled(true);
+        progressLabel->hide();
+        progressBar->hide();
+        QMessageBox::critical(this, tr("Error"), tr("Failed to interpret downloaded data."));
+    }
+}
+
+void LoadSetsPage::zipDownloadFailed(const QString &message)
+{
+    wizard()->enableButtons();
+    setEnabled(true);
+    progressLabel->hide();
+    progressBar->hide();
+
+    QMessageBox::StandardButton reply;
+    reply = static_cast<QMessageBox::StandardButton>(QMessageBox::question(
+        this, tr("Error"), message + "<br>" + tr("Do you want to download the uncompressed file instead?"),
+        QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes));
+
+    if (reply == QMessageBox::Yes) {
+        urlRadioButton->setChecked(true);
+        urlLineEdit->setText(ALLSETS_URL_FALLBACK);
+
+        wizard()->next();
+    }
+}
+
+void LoadSetsPage::importFinished()
+{
+    wizard()->enableButtons();
+    setEnabled(true);
+    progressLabel->hide();
+    progressBar->hide();
+
+    if (wizard()->downloadedPlainXml || watcher.future().result()) {
+        wizard()->next();
+    } else {
+        QMessageBox::critical(this, tr("Error"),
+                              tr("The file was retrieved successfully, but it does not contain any sets data."));
+    }
+}
+
+SaveSetsPage::SaveSetsPage(QWidget *parent) : OracleWizardPage(parent)
+{
+    pathLabel = new QLabel(this);
+    saveLabel = new QLabel(this);
+
+    defaultPathCheckBox = new QCheckBox(this);
+
+    messageLog = new QTextEdit(this);
+    messageLog->setReadOnly(true);
+
+    auto *layout = new QGridLayout(this);
+    layout->addWidget(messageLog, 0, 0);
+    layout->addWidget(saveLabel, 1, 0);
+    layout->addWidget(pathLabel, 2, 0);
+    layout->addWidget(defaultPathCheckBox, 3, 0);
+
+    setLayout(layout);
+}
+
+void SaveSetsPage::cleanupPage()
+{
+    wizard()->importer->clear();
+    disconnect(wizard()->importer, &OracleImporter::setIndexChanged, nullptr, nullptr);
+}
+
+void SaveSetsPage::initializePage()
+{
+    messageLog->clear();
+
+    retranslateUi();
+    if (wizard()->downloadedPlainXml) {
+        messageLog->hide();
+        return;
+    }
+    messageLog->show();
+    connect(wizard()->importer, &OracleImporter::setIndexChanged, this, &SaveSetsPage::updateTotalProgress);
+
+    if (!wizard()->importer->startImport()) {
+        QMessageBox::critical(this, tr("Error"), tr("No set has been imported."));
+    }
+
+    if (wizard()->backgroundMode) {
+        emit readyToContinue();
+    }
+}
+
+void SaveSetsPage::retranslateUi()
+{
+    setTitle(tr("Sets imported"));
+    if (wizard()->downloadedPlainXml) {
+        setSubTitle(tr("A cockatrice database file of %1 MB has been downloaded.")
+                        .arg(qRound(wizard()->xmlData.size() / 1000000.0)));
+    } else {
+        setSubTitle(tr("The following sets have been found:"));
+    }
+
+    saveLabel->setText(tr("Press \"Save\" to store the imported cards in the Cockatrice database."));
+    pathLabel->setText(tr("The card database will be saved at the following location:") + "<br>" +
+                       SettingsCache::instance().getCardDatabasePath());
+    defaultPathCheckBox->setText(tr("Save to a custom path (not recommended)"));
+
+    setButtonText(QWizard::NextButton, tr("&Save"));
+}
+
+void SaveSetsPage::updateTotalProgress(int cardsImported, int /* setIndex */, const QString &setName)
+{
+    if (setName.isEmpty()) {
+        messageLog->append("<b>" + tr("Import finished: %1 cards.").arg(wizard()->importer->getCardList().size()) +
+                           "</b>");
+    } else {
+        messageLog->append(tr("%1: %2 cards imported").arg(setName).arg(cardsImported));
+    }
+
+    messageLog->verticalScrollBar()->setValue(messageLog->verticalScrollBar()->maximum());
+}
+
+bool SaveSetsPage::validatePage()
+{
+    QString defaultPath = SettingsCache::instance().getCardDatabasePath();
+    QString windowName = tr("Save card database");
+    QString fileType = tr("XML; card database (*.xml)");
+
+    QString fileName;
+    if (defaultPathCheckBox->isChecked()) {
+        fileName = QFileDialog::getSaveFileName(this, windowName, defaultPath, fileType);
+    } else {
+        fileName = defaultPath;
+    }
+
+    if (fileName.isEmpty()) {
+        return false;
+    }
+
+    QFileInfo fi(fileName);
+    QDir fileDir(fi.path());
+    if (!fileDir.exists() && !fileDir.mkpath(fileDir.absolutePath())) {
+        return false;
+    }
+
+    if (wizard()->downloadedPlainXml) {
+        QFile file(fileName);
+        if (!file.open(QIODevice::WriteOnly)) {
+            qDebug() << "File write (w) failed for" << fileName;
+            return false;
+        }
+        if (file.write(wizard()->xmlData) < 1) {
+            qDebug() << "File write (w) failed for" << fileName;
+            return false;
+        }
+        wizard()->xmlData.clear();
+    } else if (!wizard()->importer->saveToFile(fileName, wizard()->getCardSourceUrl(),
+                                               wizard()->getCardSourceVersion())) {
+        QMessageBox::critical(this, tr("Error"), tr("The file could not be saved to %1").arg(fileName));
+        return false;
+    }
+
+    return true;
+}
+
+void LoadTokensPage::initializePage()
+{
+    SimpleDownloadFilePage::initializePage();
+
+    if (wizard()->backgroundMode) {
+        emit readyToContinue();
+    }
+}
+
+QString LoadTokensPage::getDefaultUrl()
+{
+    return TOKENS_URL;
+}
+
+QString LoadTokensPage::getCustomUrlSettingsKey()
+{
+    return "tokensurl";
+}
+
+QString LoadTokensPage::getDefaultSavePath()
+{
+    return SettingsCache::instance().getTokenDatabasePath();
+}
+
+QString LoadTokensPage::getWindowTitle()
+{
+    return tr("Save token database");
+}
+
+QString LoadTokensPage::getFileType()
+{
+    return tr("XML; token database (*.xml)");
+}
+
+void LoadTokensPage::retranslateUi()
+{
+    setTitle(tr("Tokens import"));
+    setSubTitle(tr("Please specify a compatible source for token data."));
+
+    urlLabel->setText(tr("Download URL:"));
+    urlButton->setText(tr("Restore default URL"));
+    pathLabel->setText(tr("The token database will be saved at the following location:") + "<br>" +
+                       SettingsCache::instance().getTokenDatabasePath());
+    defaultPathCheckBox->setText(tr("Save to a custom path (not recommended)"));
+}
+
+QString LoadSpoilersPage::getDefaultUrl()
+{
+    return SPOILERS_URL;
+}
+
+QString LoadSpoilersPage::getCustomUrlSettingsKey()
+{
+    return "spoilersurl";
+}
+
+QString LoadSpoilersPage::getDefaultSavePath()
+{
+    return SettingsCache::instance().getTokenDatabasePath();
+}
+
+QString LoadSpoilersPage::getWindowTitle()
+{
+    return tr("Save spoiler database");
+}
+
+QString LoadSpoilersPage::getFileType()
+{
+    return tr("XML; spoiler database (*.xml)");
+}
+
+void LoadSpoilersPage::retranslateUi()
+{
+    setTitle(tr("Spoilers import"));
+    setSubTitle(tr("Please specify a compatible source for spoiler data."));
+
+    urlLabel->setText(tr("Download URL:"));
+    urlButton->setText(tr("Restore default URL"));
+    pathLabel->setText(tr("The spoiler database will be saved at the following location:") + "<br>" +
+                       SettingsCache::instance().getSpoilerCardDatabasePath());
+    defaultPathCheckBox->setText(tr("Save to a custom path (not recommended)"));
+}
diff --git a/oracle/src/oraclewizard.h b/oracle/src/oraclewizard.h
index 78427175c..2733bf1ad 100644
--- a/oracle/src/oraclewizard.h
+++ b/oracle/src/oraclewizard.h
@@ -1,6 +1,9 @@
 #ifndef ORACLEWIZARD_H
 #define ORACLEWIZARD_H
 
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QTimer>
 #include <QWizard>
 #include <utility>
 
@@ -17,6 +20,8 @@ class QVBoxLayout;
 class OracleImporter;
 class QSettings;
 
+#include "pagetemplates.h"
+
 class OracleWizard : public QWizard
 {
     Q_OBJECT
@@ -75,10 +80,133 @@ private:
     QString cardSourceUrl;
     QString cardSourceVersion;
 
-    void migrateOracleSettings();
-
 protected:
     void changeEvent(QEvent *event) override;
 };
 
+class IntroPage : public OracleWizardPage
+{
+    Q_OBJECT
+public:
+    explicit IntroPage(QWidget *parent = nullptr);
+    void retranslateUi() override;
+
+private:
+    QStringList findQmFiles();
+    QString languageName(const QString &lang);
+
+private:
+    QLabel *label, *languageLabel, *versionLabel;
+    QComboBox *languageBox;
+
+private slots:
+    void languageBoxChanged(int index);
+
+protected slots:
+    void initializePage() override;
+};
+
+class OutroPage : public OracleWizardPage
+{
+    Q_OBJECT
+public:
+    explicit OutroPage(QWidget * = nullptr)
+    {
+    }
+    void retranslateUi() override;
+
+protected:
+    void initializePage() override;
+};
+
+class LoadSetsPage : public OracleWizardPage
+{
+    Q_OBJECT
+public:
+    explicit LoadSetsPage(QWidget *parent = nullptr);
+    void retranslateUi() override;
+
+protected:
+    void initializePage() override;
+    bool validatePage() override;
+    void readSetsFromByteArray(QByteArray _data);
+    void readSetsFromByteArrayRef(QByteArray &_data);
+    void downloadSetsFile(const QUrl &url);
+
+private:
+    QRadioButton *urlRadioButton;
+    QRadioButton *fileRadioButton;
+    QLineEdit *urlLineEdit;
+    QLineEdit *fileLineEdit;
+    QPushButton *urlButton;
+    QPushButton *fileButton;
+    QLabel *progressLabel;
+    QProgressBar *progressBar;
+
+    QFutureWatcher<bool> watcher;
+    QFuture<bool> future;
+    QByteArray jsonData;
+
+private slots:
+    void actLoadSetsFile();
+    void actRestoreDefaultUrl();
+    void actDownloadProgressSetsFile(qint64 received, qint64 total);
+    void actDownloadFinishedSetsFile();
+    void importFinished();
+    void zipDownloadFailed(const QString &message);
+};
+
+class SaveSetsPage : public OracleWizardPage
+{
+    Q_OBJECT
+public:
+    explicit SaveSetsPage(QWidget *parent = nullptr);
+    void retranslateUi() override;
+
+private:
+    QTextEdit *messageLog;
+    QCheckBox *defaultPathCheckBox;
+    QLabel *pathLabel;
+    QLabel *saveLabel;
+
+protected:
+    void initializePage() override;
+    void cleanupPage() override;
+    bool validatePage() override;
+
+private slots:
+    void updateTotalProgress(int cardsImported, int setIndex, const QString &setName);
+};
+
+class LoadSpoilersPage : public SimpleDownloadFilePage
+{
+    Q_OBJECT
+public:
+    explicit LoadSpoilersPage(QWidget * = nullptr){};
+    void retranslateUi() override;
+
+protected:
+    QString getDefaultUrl() override;
+    QString getCustomUrlSettingsKey() override;
+    QString getDefaultSavePath() override;
+    QString getWindowTitle() override;
+    QString getFileType() override;
+};
+
+class LoadTokensPage : public SimpleDownloadFilePage
+{
+    Q_OBJECT
+public:
+    explicit LoadTokensPage(QWidget * = nullptr){};
+    void retranslateUi() override;
+
+protected:
+    QString getDefaultUrl() override;
+    QString getCustomUrlSettingsKey() override;
+    QString getDefaultSavePath() override;
+    QString getWindowTitle() override;
+    QString getFileType() override;
+    void initializePage() override;
+};
+
 #endif
diff --git a/oracle/src/pages.cpp b/oracle/src/pages.cpp
deleted file mode 100644
index 7629a291b..000000000
--- a/oracle/src/pages.cpp
+++ /dev/null
@@ -1,742 +0,0 @@
-#include "pages.h"
-
-#include "client/settings/cache_settings.h"
-#include "main.h"
-#include "oracleimporter.h"
-#include "oraclewizard.h"
-#include "pages.h"
-#include "pagetemplates.h"
-#include "version_string.h"
-
-#include <QAbstractButton>
-#include <QBuffer>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QDir>
-#include <QFileDialog>
-#include <QGridLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QMessageBox>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QProgressBar>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QScrollBar>
-#include <QStandardPaths>
-#include <QTextEdit>
-#include <QtConcurrent>
-#include <QtGui>
-
-#ifdef HAS_LZMA
-#include "lzma/decompress.h"
-#endif
-
-#ifdef HAS_ZLIB
-#include "zip/unzip.h"
-#endif
-
-#define ZIP_SIGNATURE "PK"
-// Xz stream header: 0xFD + "7zXZ"
-#define XZ_SIGNATURE "\xFD\x37\x7A\x58\x5A"
-#define MTGJSON_V4_URL_COMPONENT "mtgjson.com/files/"
-#define ALLSETS_URL_FALLBACK "https://www.mtgjson.com/api/v5/AllPrintings.json"
-#define MTGJSON_VERSION_URL "https://www.mtgjson.com/api/v5/Meta.json"
-
-#ifdef HAS_LZMA
-#define ALLSETS_URL "https://www.mtgjson.com/api/v5/AllPrintings.json.xz"
-#elif defined(HAS_ZLIB)
-#define ALLSETS_URL "https://www.mtgjson.com/api/v5/AllPrintings.json.zip"
-#else
-#define ALLSETS_URL "https://www.mtgjson.com/api/v5/AllPrintings.json"
-#endif
-
-#define TOKENS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Token/master/tokens.xml"
-#define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"
-
-IntroPage::IntroPage(QWidget *parent) : OracleWizardPage(parent)
-{
-    label = new QLabel(this);
-    label->setWordWrap(true);
-
-    languageLabel = new QLabel(this);
-    versionLabel = new QLabel(this);
-    languageBox = new QComboBox(this);
-
-    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);
-    }
-
-    connect(languageBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &IntroPage::languageBoxChanged);
-
-    auto *layout = new QGridLayout(this);
-    layout->addWidget(label, 0, 0, 1, 2);
-    layout->addWidget(languageLabel, 1, 0);
-    layout->addWidget(languageBox, 1, 1);
-    layout->addWidget(versionLabel, 2, 0, 1, 2);
-
-    setLayout(layout);
-}
-
-void IntroPage::initializePage()
-{
-    if (wizard()->backgroundMode) {
-        emit readyToContinue();
-    }
-}
-
-QStringList IntroPage::findQmFiles()
-{
-    QDir dir(translationPath);
-    QStringList fileNames = dir.entryList(QStringList(translationPrefix + "_*.qm"), QDir::Files, QDir::Name);
-    fileNames.replaceInStrings(QRegularExpression(translationPrefix + "_(.*)\\.qm"), "\\1");
-    return fileNames;
-}
-
-QString IntroPage::languageName(const QString &lang)
-{
-    QTranslator qTranslator;
-
-    QString appNameHint = translationPrefix + "_" + lang;
-    bool appTranslationLoaded = qTranslator.load(appNameHint, translationPath);
-    if (!appTranslationLoaded) {
-        qDebug() << "Unable to load" << translationPrefix << "translation" << appNameHint << "at" << translationPath;
-    }
-
-    return qTranslator.translate("i18n", DEFAULT_LANG_NAME);
-}
-
-void IntroPage::languageBoxChanged(int index)
-{
-    SettingsCache::instance().setLang(languageBox->itemData(index).toString());
-}
-
-void IntroPage::retranslateUi()
-{
-    setTitle(tr("Introduction"));
-    label->setText(tr("This wizard will import the list of sets, cards, and tokens "
-                      "that will be used by Cockatrice."));
-    languageLabel->setText(tr("Interface language:"));
-    versionLabel->setText(tr("Version:") + QString(" %1").arg(VERSION_STRING));
-}
-
-void OutroPage::retranslateUi()
-{
-    setTitle(tr("Finished"));
-    setSubTitle(tr("The wizard has finished.") + "<br>" +
-                tr("You can now start using Cockatrice with the newly updated cards.") + "<br><br>" +
-                tr("If the card databases don't reload automatically, restart the Cockatrice client."));
-}
-
-void OutroPage::initializePage()
-{
-    if (wizard()->backgroundMode) {
-        wizard()->accept();
-        exit(0);
-    }
-}
-
-LoadSetsPage::LoadSetsPage(QWidget *parent) : OracleWizardPage(parent)
-{
-    urlRadioButton = new QRadioButton(this);
-    fileRadioButton = new QRadioButton(this);
-
-    urlLineEdit = new QLineEdit(this);
-    fileLineEdit = new QLineEdit(this);
-
-    progressLabel = new QLabel(this);
-    progressBar = new QProgressBar(this);
-
-    urlRadioButton->setChecked(true);
-
-    urlButton = new QPushButton(this);
-    connect(urlButton, &QPushButton::clicked, this, &LoadSetsPage::actRestoreDefaultUrl);
-
-    fileButton = new QPushButton(this);
-    connect(fileButton, &QPushButton::clicked, this, &LoadSetsPage::actLoadSetsFile);
-
-    auto *layout = new QGridLayout(this);
-    layout->addWidget(urlRadioButton, 0, 0);
-    layout->addWidget(urlLineEdit, 0, 1);
-    layout->addWidget(urlButton, 1, 1, Qt::AlignRight);
-    layout->addWidget(fileRadioButton, 2, 0);
-    layout->addWidget(fileLineEdit, 2, 1);
-    layout->addWidget(fileButton, 3, 1, Qt::AlignRight);
-    layout->addWidget(progressLabel, 4, 0);
-    layout->addWidget(progressBar, 4, 1);
-
-    connect(&watcher, &QFutureWatcher<bool>::finished, this, &LoadSetsPage::importFinished);
-
-    setLayout(layout);
-}
-
-void LoadSetsPage::initializePage()
-{
-    urlLineEdit->setText(wizard()->settings->value("allsetsurl", ALLSETS_URL).toString());
-
-    progressLabel->hide();
-    progressBar->hide();
-
-    if (wizard()->backgroundMode) {
-        if (isEnabled()) {
-            validatePage();
-        }
-    }
-}
-
-void LoadSetsPage::retranslateUi()
-{
-    setTitle(tr("Source selection"));
-    setSubTitle(tr("Please specify a compatible source for the list of sets and cards. "
-                   "You can specify a URL address that will be downloaded or "
-                   "use an existing file from your computer."));
-
-    urlRadioButton->setText(tr("Download URL:"));
-    fileRadioButton->setText(tr("Local file:"));
-    urlButton->setText(tr("Restore default URL"));
-    fileButton->setText(tr("Choose file..."));
-}
-
-void LoadSetsPage::actRestoreDefaultUrl()
-{
-    urlLineEdit->setText(ALLSETS_URL);
-}
-
-void LoadSetsPage::actLoadSetsFile()
-{
-    QFileDialog dialog(this, tr("Load sets file"));
-    dialog.setFileMode(QFileDialog::ExistingFile);
-
-    QString extensions = "*.json *.xml";
-#ifdef HAS_ZLIB
-    extensions += " *.zip";
-#endif
-#ifdef HAS_LZMA
-    extensions += " *.xz";
-#endif
-    dialog.setNameFilter(tr("Sets file (%1)").arg(extensions));
-
-    if (!fileLineEdit->text().isEmpty() && QFile::exists(fileLineEdit->text())) {
-        dialog.selectFile(fileLineEdit->text());
-    }
-
-    if (!dialog.exec()) {
-        return;
-    }
-
-    fileLineEdit->setText(dialog.selectedFiles().at(0));
-}
-
-bool LoadSetsPage::validatePage()
-{
-    // once the import is finished, we call next(); skip validation
-    if (wizard()->downloadedPlainXml || wizard()->importer->getSets().count() > 0) {
-        return true;
-    }
-
-    // else, try to import sets
-    if (urlRadioButton->isChecked()) {
-        // If a user attempts to download from V4, redirect them to V5
-        if (urlLineEdit->text().contains(MTGJSON_V4_URL_COMPONENT)) {
-            actRestoreDefaultUrl();
-        }
-
-        const auto url = QUrl::fromUserInput(urlLineEdit->text());
-
-        if (!url.isValid()) {
-            QMessageBox::critical(this, tr("Error"), tr("The provided URL is not valid."));
-            return false;
-        }
-
-        progressLabel->setText(tr("Downloading (0MB)"));
-        // show an infinite progressbar
-        progressBar->setMaximum(0);
-        progressBar->setMinimum(0);
-        progressBar->setValue(0);
-        progressLabel->show();
-        progressBar->show();
-
-        wizard()->disableButtons();
-        setEnabled(false);
-
-        downloadSetsFile(url);
-    } else if (fileRadioButton->isChecked()) {
-        QFile setsFile(fileLineEdit->text());
-        if (!setsFile.exists()) {
-            QMessageBox::critical(this, tr("Error"), tr("Please choose a file."));
-            return false;
-        }
-
-        if (!setsFile.open(QIODevice::ReadOnly)) {
-            QMessageBox::critical(nullptr, tr("Error"), tr("Cannot open file '%1'.").arg(fileLineEdit->text()));
-            return false;
-        }
-
-        wizard()->disableButtons();
-        setEnabled(false);
-
-        wizard()->setCardSourceUrl(setsFile.fileName());
-        wizard()->setCardSourceVersion("unknown");
-
-        readSetsFromByteArray(setsFile.readAll());
-    }
-
-    return false;
-}
-
-void LoadSetsPage::downloadSetsFile(const QUrl &url)
-{
-    wizard()->setCardSourceVersion("unknown");
-
-    const auto urlString = url.toString();
-    if (urlString == ALLSETS_URL || urlString == ALLSETS_URL_FALLBACK) {
-        const auto versionUrl = QUrl::fromUserInput(MTGJSON_VERSION_URL);
-        QNetworkRequest request = QNetworkRequest(versionUrl);
-        request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-        auto *versionReply = wizard()->nam->get(request);
-        connect(versionReply, &QNetworkReply::finished, [this, versionReply]() {
-            if (versionReply->error() == QNetworkReply::NoError) {
-                auto data = versionReply->readAll();
-                QJsonParseError jsonError{};
-                auto jsonResponse = QJsonDocument::fromJson(data, &jsonError);
-
-                if (jsonError.error == QJsonParseError::NoError) {
-                    const auto jsonMap = jsonResponse.toVariant().toMap();
-
-                    auto versionString = jsonMap.value("meta").toMap().value("version").toString();
-                    if (versionString.isEmpty()) {
-                        versionString = "unknown";
-                    }
-                    wizard()->setCardSourceVersion(versionString);
-                }
-            }
-
-            versionReply->deleteLater();
-        });
-    }
-
-    wizard()->setCardSourceUrl(url.toString());
-
-    QNetworkRequest request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    auto *reply = wizard()->nam->get(request);
-
-    connect(reply, &QNetworkReply::finished, this, &LoadSetsPage::actDownloadFinishedSetsFile);
-    connect(reply, &QNetworkReply::downloadProgress, this, &LoadSetsPage::actDownloadProgressSetsFile);
-}
-
-void LoadSetsPage::actDownloadProgressSetsFile(qint64 received, qint64 total)
-{
-    if (total > 0) {
-        progressBar->setMaximum(static_cast<int>(total));
-        progressBar->setValue(static_cast<int>(received));
-    }
-    progressLabel->setText(tr("Downloading (%1MB)").arg((int)received / (1024 * 1024)));
-}
-
-void LoadSetsPage::actDownloadFinishedSetsFile()
-{
-    // check for a reply
-    auto *reply = dynamic_cast<QNetworkReply *>(sender());
-    auto errorCode = reply->error();
-    if (errorCode != QNetworkReply::NoError) {
-        QMessageBox::critical(this, tr("Error"), tr("Network error: %1.").arg(reply->errorString()));
-
-        wizard()->enableButtons();
-        setEnabled(true);
-
-        reply->deleteLater();
-        return;
-    }
-
-    auto statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    if (statusCode == 301 || statusCode == 302) {
-        const auto redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
-        qDebug() << "following redirect url:" << redirectUrl.toString();
-        downloadSetsFile(redirectUrl);
-        reply->deleteLater();
-        return;
-    }
-
-    progressLabel->hide();
-    progressBar->hide();
-
-    // save AllPrintings.json url, but only if the user customized it and download was successful
-    if (urlLineEdit->text() != QString(ALLSETS_URL)) {
-        wizard()->settings->setValue("allsetsurl", urlLineEdit->text());
-    } else {
-        wizard()->settings->remove("allsetsurl");
-    }
-
-    readSetsFromByteArray(reply->readAll());
-    reply->deleteLater();
-}
-
-void LoadSetsPage::readSetsFromByteArray(QByteArray _data)
-{
-    // show an infinite progressbar
-    progressBar->setMaximum(0);
-    progressBar->setMinimum(0);
-    progressBar->setValue(0);
-    progressLabel->setText(tr("Parsing file"));
-    progressLabel->show();
-    progressBar->show();
-
-    wizard()->downloadedPlainXml = false;
-    wizard()->xmlData.clear();
-    readSetsFromByteArrayRef(_data);
-}
-
-void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &_data)
-{
-    // unzip the file if needed
-    if (_data.startsWith(XZ_SIGNATURE)) {
-#ifdef HAS_LZMA
-        // zipped file
-        auto *inBuffer = new QBuffer(&_data);
-        auto newData = QByteArray();
-        auto *outBuffer = new QBuffer(&newData);
-        inBuffer->open(QBuffer::ReadOnly);
-        outBuffer->open(QBuffer::WriteOnly);
-        XzDecompressor xz;
-        if (!xz.decompress(inBuffer, outBuffer)) {
-            zipDownloadFailed(tr("Xz extraction failed."));
-            return;
-        }
-        _data.clear();
-        readSetsFromByteArrayRef(newData);
-        return;
-#else
-        zipDownloadFailed(tr("Sorry, this version of Oracle does not support xz compressed files."));
-
-        wizard()->enableButtons();
-        setEnabled(true);
-        progressLabel->hide();
-        progressBar->hide();
-        return;
-#endif
-    } else if (_data.startsWith(ZIP_SIGNATURE)) {
-#ifdef HAS_ZLIB
-        // zipped file
-        auto *inBuffer = new QBuffer(&_data);
-        auto newData = QByteArray();
-        auto *outBuffer = new QBuffer(&newData);
-        QString fileName;
-        UnZip::ErrorCode ec;
-        UnZip uz;
-
-        ec = uz.openArchive(inBuffer);
-        if (ec != UnZip::Ok) {
-            zipDownloadFailed(tr("Failed to open Zip archive: %1.").arg(uz.formatError(ec)));
-            return;
-        }
-
-        if (uz.fileList().size() != 1) {
-            zipDownloadFailed(tr("Zip extraction failed: the Zip archive doesn't contain exactly one file."));
-            return;
-        }
-        fileName = uz.fileList().at(0);
-
-        outBuffer->open(QBuffer::ReadWrite);
-        ec = uz.extractFile(fileName, outBuffer);
-        if (ec != UnZip::Ok) {
-            zipDownloadFailed(tr("Zip extraction failed: %1.").arg(uz.formatError(ec)));
-            uz.closeArchive();
-            return;
-        }
-        _data.clear();
-        readSetsFromByteArrayRef(newData);
-        return;
-#else
-        zipDownloadFailed(tr("Sorry, this version of Oracle does not support zipped files."));
-
-        wizard()->enableButtons();
-        setEnabled(true);
-        progressLabel->hide();
-        progressBar->hide();
-        return;
-#endif
-    } else if (_data.startsWith("{")) {
-        // Start the computation.
-        jsonData = std::move(_data);
-        future = QtConcurrent::run([this] { return wizard()->importer->readSetsFromByteArray(std::move(jsonData)); });
-        watcher.setFuture(future);
-    } else if (_data.startsWith("<")) {
-        // save xml file and don't do any processing
-        wizard()->downloadedPlainXml = true;
-        wizard()->xmlData = std::move(_data);
-        importFinished();
-    } else {
-        wizard()->enableButtons();
-        setEnabled(true);
-        progressLabel->hide();
-        progressBar->hide();
-        QMessageBox::critical(this, tr("Error"), tr("Failed to interpret downloaded data."));
-    }
-}
-
-void LoadSetsPage::zipDownloadFailed(const QString &message)
-{
-    wizard()->enableButtons();
-    setEnabled(true);
-    progressLabel->hide();
-    progressBar->hide();
-
-    QMessageBox::StandardButton reply;
-    reply = static_cast<QMessageBox::StandardButton>(QMessageBox::question(
-        this, tr("Error"), message + "<br>" + tr("Do you want to download the uncompressed file instead?"),
-        QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes));
-
-    if (reply == QMessageBox::Yes) {
-        urlRadioButton->setChecked(true);
-        urlLineEdit->setText(ALLSETS_URL_FALLBACK);
-
-        wizard()->next();
-    }
-}
-
-void LoadSetsPage::importFinished()
-{
-    wizard()->enableButtons();
-    setEnabled(true);
-    progressLabel->hide();
-    progressBar->hide();
-
-    if (wizard()->downloadedPlainXml || watcher.future().result()) {
-        wizard()->next();
-    } else {
-        QMessageBox::critical(this, tr("Error"),
-                              tr("The file was retrieved successfully, but it does not contain any sets data."));
-    }
-}
-
-SaveSetsPage::SaveSetsPage(QWidget *parent) : OracleWizardPage(parent)
-{
-    pathLabel = new QLabel(this);
-    saveLabel = new QLabel(this);
-
-    defaultPathCheckBox = new QCheckBox(this);
-
-    messageLog = new QTextEdit(this);
-    messageLog->setReadOnly(true);
-
-    auto *layout = new QGridLayout(this);
-    layout->addWidget(messageLog, 0, 0);
-    layout->addWidget(saveLabel, 1, 0);
-    layout->addWidget(pathLabel, 2, 0);
-    layout->addWidget(defaultPathCheckBox, 3, 0);
-
-    setLayout(layout);
-}
-
-void SaveSetsPage::cleanupPage()
-{
-    wizard()->importer->clear();
-    disconnect(wizard()->importer, &OracleImporter::setIndexChanged, nullptr, nullptr);
-}
-
-void SaveSetsPage::initializePage()
-{
-    messageLog->clear();
-
-    retranslateUi();
-    if (wizard()->downloadedPlainXml) {
-        messageLog->hide();
-    } else {
-        messageLog->show();
-        connect(wizard()->importer, &OracleImporter::setIndexChanged, this, &SaveSetsPage::updateTotalProgress);
-
-        int setsImported = wizard()->importer->startImport();
-
-        if (setsImported == 0) {
-            QMessageBox::critical(this, tr("Error"), tr("No set has been imported."));
-        }
-    }
-
-    if (wizard()->backgroundMode) {
-        emit readyToContinue();
-    }
-}
-
-void SaveSetsPage::retranslateUi()
-{
-    setTitle(tr("Sets imported"));
-    if (wizard()->downloadedPlainXml) {
-        setSubTitle(tr("A cockatrice database file of %1 MB has been downloaded.")
-                        .arg(qRound(wizard()->xmlData.size() / 1000000.0)));
-    } else {
-        setSubTitle(tr("The following sets have been found:"));
-    }
-
-    saveLabel->setText(tr("Press \"Save\" to store the imported cards in the Cockatrice database."));
-    pathLabel->setText(tr("The card database will be saved at the following location:") + "<br>" +
-                       SettingsCache::instance().getCardDatabasePath());
-    defaultPathCheckBox->setText(tr("Save to a custom path (not recommended)"));
-
-    setButtonText(QWizard::NextButton, tr("&Save"));
-}
-
-void SaveSetsPage::updateTotalProgress(int cardsImported, int /* setIndex */, const QString &setName)
-{
-    if (setName.isEmpty()) {
-        messageLog->append("<b>" + tr("Import finished: %1 cards.").arg(wizard()->importer->getCardList().size()) +
-                           "</b>");
-    } else {
-        messageLog->append(tr("%1: %2 cards imported").arg(setName).arg(cardsImported));
-    }
-
-    messageLog->verticalScrollBar()->setValue(messageLog->verticalScrollBar()->maximum());
-}
-
-bool SaveSetsPage::validatePage()
-{
-    QString defaultPath = SettingsCache::instance().getCardDatabasePath();
-    QString windowName = tr("Save card database");
-    QString fileType = tr("XML; card database (*.xml)");
-
-    QString fileName;
-    if (defaultPathCheckBox->isChecked()) {
-        fileName = QFileDialog::getSaveFileName(this, windowName, defaultPath, fileType);
-    } else {
-        fileName = defaultPath;
-    }
-
-    if (fileName.isEmpty()) {
-        return false;
-    }
-
-    QFileInfo fi(fileName);
-    QDir fileDir(fi.path());
-    if (!fileDir.exists() && !fileDir.mkpath(fileDir.absolutePath())) {
-        return false;
-    }
-
-    if (wizard()->downloadedPlainXml) {
-        QFile file(fileName);
-        if (!file.open(QIODevice::WriteOnly)) {
-            qDebug() << "File write (w) failed for" << fileName;
-            return false;
-        }
-        if (file.write(wizard()->xmlData) < 1) {
-            qDebug() << "File write (w) failed for" << fileName;
-            return false;
-        }
-        wizard()->xmlData.clear();
-    } else if (!wizard()->importer->saveToFile(fileName, wizard()->getCardSourceUrl(),
-                                               wizard()->getCardSourceVersion())) {
-        QMessageBox::critical(this, tr("Error"), tr("The file could not be saved to %1").arg(fileName));
-        return false;
-    }
-
-    return true;
-}
-
-void LoadTokensPage::initializePage()
-{
-    SimpleDownloadFilePage::initializePage();
-
-    if (wizard()->backgroundMode) {
-        emit readyToContinue();
-    }
-}
-
-QString LoadTokensPage::getDefaultUrl()
-{
-    return TOKENS_URL;
-}
-
-QString LoadTokensPage::getCustomUrlSettingsKey()
-{
-    return "tokensurl";
-}
-
-QString LoadTokensPage::getDefaultSavePath()
-{
-    return SettingsCache::instance().getTokenDatabasePath();
-}
-
-QString LoadTokensPage::getWindowTitle()
-{
-    return tr("Save token database");
-}
-
-QString LoadTokensPage::getFileType()
-{
-    return tr("XML; token database (*.xml)");
-}
-
-QString LoadTokensPage::getFilePromptName()
-{
-    return tr("tokens");
-}
-
-void LoadTokensPage::retranslateUi()
-{
-    setTitle(tr("Tokens import"));
-    setSubTitle(tr("Please specify a compatible source for token data."));
-
-    urlRadioButton->setText(tr("Download URL:"));
-    fileRadioButton->setText(tr("Local file:"));
-    urlButton->setText(tr("Restore default URL"));
-    fileButton->setText(tr("Choose file..."));
-
-    pathLabel->setText(tr("The token database will be saved at the following location:") + "<br>" +
-                       SettingsCache::instance().getTokenDatabasePath());
-    defaultPathCheckBox->setText(tr("Save to a custom path (not recommended)"));
-}
-
-QString LoadSpoilersPage::getDefaultUrl()
-{
-    return SPOILERS_URL;
-}
-
-QString LoadSpoilersPage::getCustomUrlSettingsKey()
-{
-    return "spoilersurl";
-}
-
-QString LoadSpoilersPage::getDefaultSavePath()
-{
-    return SettingsCache::instance().getTokenDatabasePath();
-}
-
-QString LoadSpoilersPage::getWindowTitle()
-{
-    return tr("Save spoiler database");
-}
-
-QString LoadSpoilersPage::getFileType()
-{
-    return tr("XML; spoiler database (*.xml)");
-}
-
-QString LoadSpoilersPage::getFilePromptName()
-{
-    return tr("spoiler");
-}
-
-void LoadSpoilersPage::retranslateUi()
-{
-    setTitle(tr("Spoilers import"));
-    setSubTitle(tr("Please specify a compatible source for spoiler data."));
-
-    urlRadioButton->setText(tr("Download URL:"));
-    fileRadioButton->setText(tr("Local file:"));
-    urlButton->setText(tr("Restore default URL"));
-    fileButton->setText(tr("Choose file..."));
-
-    pathLabel->setText(tr("The spoiler database will be saved at the following location:") + "<br>" +
-                       SettingsCache::instance().getSpoilerCardDatabasePath());
-    defaultPathCheckBox->setText(tr("Save to a custom path (not recommended)"));
-}
\ No newline at end of file
diff --git a/oracle/src/pages.h b/oracle/src/pages.h
deleted file mode 100644
index 066cc2e1b..000000000
--- a/oracle/src/pages.h
+++ /dev/null
@@ -1,156 +0,0 @@
-#ifndef COCKATRICE_PAGES_H
-#define COCKATRICE_PAGES_H
-
-#include "pagetemplates.h"
-
-#include <QFuture>
-#include <QFutureWatcher>
-#include <QTimer>
-#include <QWizard>
-#include <utility>
-
-class QCheckBox;
-class QGroupBox;
-class QComboBox;
-class QLabel;
-class QLineEdit;
-class QRadioButton;
-class QProgressBar;
-class QNetworkAccessManager;
-class QTextEdit;
-class QVBoxLayout;
-class OracleImporter;
-class QSettings;
-
-class IntroPage : public OracleWizardPage
-{
-    Q_OBJECT
-public:
-    explicit IntroPage(QWidget *parent = nullptr);
-    void retranslateUi() override;
-
-private:
-    QStringList findQmFiles();
-    QString languageName(const QString &lang);
-
-private:
-    QLabel *label, *languageLabel, *versionLabel;
-    QComboBox *languageBox;
-
-private slots:
-    void languageBoxChanged(int index);
-
-protected slots:
-    void initializePage() override;
-};
-
-class OutroPage : public OracleWizardPage
-{
-    Q_OBJECT
-public:
-    explicit OutroPage(QWidget * = nullptr)
-    {
-    }
-    void retranslateUi() override;
-
-protected:
-    void initializePage() override;
-};
-
-class LoadSetsPage : public OracleWizardPage
-{
-    Q_OBJECT
-public:
-    explicit LoadSetsPage(QWidget *parent = nullptr);
-    void retranslateUi() override;
-
-protected:
-    void initializePage() override;
-    bool validatePage() override;
-    void readSetsFromByteArray(QByteArray _data);
-    void readSetsFromByteArrayRef(QByteArray &_data);
-    void downloadSetsFile(const QUrl &url);
-
-private:
-    QRadioButton *urlRadioButton;
-    QRadioButton *fileRadioButton;
-    QLineEdit *urlLineEdit;
-    QLineEdit *fileLineEdit;
-    QPushButton *urlButton;
-    QPushButton *fileButton;
-    QLabel *progressLabel;
-    QProgressBar *progressBar;
-
-    QFutureWatcher<bool> watcher;
-    QFuture<bool> future;
-    QByteArray jsonData;
-
-private slots:
-    void actLoadSetsFile();
-    void actRestoreDefaultUrl();
-    void actDownloadProgressSetsFile(qint64 received, qint64 total);
-    void actDownloadFinishedSetsFile();
-    void importFinished();
-    void zipDownloadFailed(const QString &message);
-};
-
-class SaveSetsPage : public OracleWizardPage
-{
-    Q_OBJECT
-public:
-    explicit SaveSetsPage(QWidget *parent = nullptr);
-    void retranslateUi() override;
-
-private:
-    QTextEdit *messageLog;
-    QCheckBox *defaultPathCheckBox;
-    QLabel *pathLabel;
-    QLabel *saveLabel;
-
-protected:
-    void initializePage() override;
-    void cleanupPage() override;
-    bool validatePage() override;
-
-private slots:
-    void updateTotalProgress(int cardsImported, int setIndex, const QString &setName);
-};
-
-class LoadSpoilersPage : public SimpleDownloadFilePage
-{
-    Q_OBJECT
-public:
-    explicit LoadSpoilersPage(QWidget * = nullptr)
-    {
-    }
-    void retranslateUi() override;
-
-protected:
-    QString getDefaultUrl() override;
-    QString getCustomUrlSettingsKey() override;
-    QString getDefaultSavePath() override;
-    QString getWindowTitle() override;
-    QString getFileType() override;
-    QString getFilePromptName() override;
-};
-
-class LoadTokensPage : public SimpleDownloadFilePage
-{
-    Q_OBJECT
-public:
-    explicit LoadTokensPage(QWidget * = nullptr)
-    {
-    }
-    void retranslateUi() override;
-
-protected:
-    QString getDefaultUrl() override;
-    QString getCustomUrlSettingsKey() override;
-    QString getDefaultSavePath() override;
-    QString getWindowTitle() override;
-    QString getFileType() override;
-    QString getFilePromptName() override;
-    void initializePage() override;
-};
-
-#endif // COCKATRICE_PAGES_H
diff --git a/oracle/src/pagetemplates.cpp b/oracle/src/pagetemplates.cpp
index 4a27fef30..d9ce3300f 100644
--- a/oracle/src/pagetemplates.cpp
+++ b/oracle/src/pagetemplates.cpp
@@ -12,43 +12,32 @@
 #include <QNetworkReply>
 #include <QProgressBar>
 #include <QPushButton>
-#include <QRadioButton>
 #include <QtGui>
 
 SimpleDownloadFilePage::SimpleDownloadFilePage(QWidget *parent) : OracleWizardPage(parent)
 {
-    urlRadioButton = new QRadioButton(this);
-    fileRadioButton = new QRadioButton(this);
-
+    urlLabel = new QLabel(this);
     urlLineEdit = new QLineEdit(this);
-    fileLineEdit = new QLineEdit(this);
 
     progressLabel = new QLabel(this);
     progressBar = new QProgressBar(this);
 
-    urlRadioButton->setChecked(true);
-
     urlButton = new QPushButton(this);
     connect(urlButton, &QPushButton::clicked, this, &SimpleDownloadFilePage::actRestoreDefaultUrl);
 
-    fileButton = new QPushButton(this);
-    connect(fileButton, &QPushButton::clicked, this, &SimpleDownloadFilePage::actLoadCardFile);
-
     defaultPathCheckBox = new QCheckBox(this);
+
     pathLabel = new QLabel(this);
     pathLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
 
     auto *layout = new QGridLayout(this);
-    layout->addWidget(urlRadioButton, 0, 0);
+    layout->addWidget(urlLabel, 0, 0);
     layout->addWidget(urlLineEdit, 0, 1);
     layout->addWidget(urlButton, 1, 1, Qt::AlignRight);
-    layout->addWidget(fileRadioButton, 2, 0);
-    layout->addWidget(fileLineEdit, 2, 1);
-    layout->addWidget(fileButton, 3, 1, Qt::AlignRight);
-    layout->addWidget(pathLabel, 4, 0, 1, 2);
-    layout->addWidget(defaultPathCheckBox, 5, 0, 1, 2);
-    layout->addWidget(progressLabel, 6, 0);
-    layout->addWidget(progressBar, 6, 1);
+    layout->addWidget(pathLabel, 2, 0, 1, 2);
+    layout->addWidget(defaultPathCheckBox, 3, 0, 1, 2);
+    layout->addWidget(progressLabel, 4, 0);
+    layout->addWidget(progressBar, 4, 1);
 
     setLayout(layout);
 }
@@ -67,31 +56,6 @@ void SimpleDownloadFilePage::actRestoreDefaultUrl()
     urlLineEdit->setText(getDefaultUrl());
 }
 
-void SimpleDownloadFilePage::actLoadCardFile()
-{
-    QFileDialog dialog(this, tr("Load %1 file").arg(getFilePromptName()));
-    dialog.setFileMode(QFileDialog::ExistingFile);
-
-    QString extensions = "*.json *.xml";
-#ifdef HAS_ZLIB
-    extensions += " *.zip";
-#endif
-#ifdef HAS_LZMA
-    extensions += " *.xz";
-#endif
-    dialog.setNameFilter(tr("%1 file (%1)").arg(getFilePromptName(), extensions));
-
-    if (!fileLineEdit->text().isEmpty() && QFile::exists(fileLineEdit->text())) {
-        dialog.selectFile(fileLineEdit->text());
-    }
-
-    if (!dialog.exec()) {
-        return;
-    }
-
-    fileLineEdit->setText(dialog.selectedFiles().at(0));
-}
-
 bool SimpleDownloadFilePage::validatePage()
 {
     // if data has already been downloaded, pass directly to the "save" step
@@ -104,41 +68,22 @@ bool SimpleDownloadFilePage::validatePage()
         }
     }
 
-    // else, try to import sets
-    if (urlRadioButton->isChecked()) {
-        QUrl url = QUrl::fromUserInput(urlLineEdit->text());
-        if (!url.isValid()) {
-            QMessageBox::critical(this, tr("Error"), tr("The provided URL is not valid: ") + url.toString());
-            return false;
-        }
-
-        progressLabel->setText(tr("Downloading (0MB)"));
-        // show an infinite progressbar
-        progressBar->setMaximum(0);
-        progressBar->setMinimum(0);
-        progressBar->setValue(0);
-        progressLabel->show();
-        progressBar->show();
-
-        wizard()->disableButtons();
-        downloadFile(url);
-
-    } else if (fileRadioButton->isChecked()) {
-        QFile cardFile(fileLineEdit->text());
-        if (!cardFile.exists()) {
-            QMessageBox::critical(this, tr("Error"), tr("Please choose a file."));
-            return false;
-        }
-
-        if (!cardFile.open(QIODevice::ReadOnly)) {
-            QMessageBox::critical(nullptr, tr("Error"), tr("Cannot open file '%1'.").arg(fileLineEdit->text()));
-            return false;
-        }
-
-        downloadData = cardFile.readAll();
-        wizard()->next();
+    QUrl url = QUrl::fromUserInput(urlLineEdit->text());
+    if (!url.isValid()) {
+        QMessageBox::critical(this, tr("Error"), tr("The provided URL is not valid: ") + url.toString());
+        return false;
     }
 
+    progressLabel->setText(tr("Downloading (0MB)"));
+    // show an infinite progressbar
+    progressBar->setMaximum(0);
+    progressBar->setMinimum(0);
+    progressBar->setValue(0);
+    progressLabel->show();
+    progressBar->show();
+
+    wizard()->disableButtons();
+    downloadFile(url);
     return false;
 }
 
diff --git a/oracle/src/pagetemplates.h b/oracle/src/pagetemplates.h
index 79dcdd632..874652d17 100644
--- a/oracle/src/pagetemplates.h
+++ b/oracle/src/pagetemplates.h
@@ -3,8 +3,6 @@
 
 #include <QWizardPage>
 
-class QFile;
-class QRadioButton;
 class OracleWizard;
 class QCheckBox;
 class QLabel;
@@ -15,9 +13,7 @@ class OracleWizardPage : public QWizardPage
 {
     Q_OBJECT
 public:
-    explicit OracleWizardPage(QWidget *parent = nullptr) : QWizardPage(parent)
-    {
-    }
+    explicit OracleWizardPage(QWidget *parent = nullptr) : QWizardPage(parent){};
     virtual void retranslateUi() = 0;
 
 signals:
@@ -45,19 +41,15 @@ protected:
     virtual QString getDefaultSavePath() = 0;
     virtual QString getWindowTitle() = 0;
     virtual QString getFileType() = 0;
-    virtual QString getFilePromptName() = 0;
     bool saveToFile();
     bool internalSaveToFile(const QString &fileName);
 
 protected:
     QByteArray downloadData;
-    QRadioButton *urlRadioButton;
-    QRadioButton *fileRadioButton;
-    QLineEdit *urlLineEdit;
-    QLineEdit *fileLineEdit;
-    QPushButton *urlButton;
-    QPushButton *fileButton;
+    QLabel *urlLabel;
     QLabel *pathLabel;
+    QLineEdit *urlLineEdit;
+    QPushButton *urlButton;
     QLabel *progressLabel;
     QProgressBar *progressBar;
     QCheckBox *defaultPathCheckBox;
@@ -66,7 +58,6 @@ signals:
     void parsedDataReady();
 private slots:
     void actRestoreDefaultUrl();
-    void actLoadCardFile();
     void actDownloadProgress(qint64 received, qint64 total);
     void actDownloadFinished();
 };
diff --git a/oracle/src/zip/unzip.cpp b/oracle/src/zip/unzip.cpp
index 8e52ece18..1e5910051 100755
--- a/oracle/src/zip/unzip.cpp
+++ b/oracle/src/zip/unzip.cpp
@@ -245,6 +245,7 @@ UnZip::ErrorCode UnzipPrivate::openArchive(QIODevice* dev)
  \internal Parses a local header record and makes some consistency check
  with the information stored in the Central Directory record for this entry
  that has been previously parsed.
+ \todo Optional consistency check (as a ExtractionOptions flag)
 
  local file header signature     4 bytes  (0x04034b50)
  version needed to extract       2 bytes
@@ -261,7 +262,6 @@ UnZip::ErrorCode UnzipPrivate::openArchive(QIODevice* dev)
  file name (variable size)
  extra field (variable size)
 */
-//! \todo Optional consistency check (as a ExtractionOptions flag)
 UnZip::ErrorCode UnzipPrivate::parseLocalHeaderRecord(const QString& path, const ZipEntryP& entry)
 {
     Q_ASSERT(device);
diff --git a/oracle/translations/oracle_de.ts b/oracle/translations/oracle_de.ts
index df12f40f4..cce06388a 100644
--- a/oracle/translations/oracle_de.ts
+++ b/oracle/translations/oracle_de.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Einführung</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>Dieser Assistent wird eine Liste aller Editionen, Karten und Spielsteine importieren, die von Cockatrice genutzt werden.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>Interfacesprache:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Version:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Quellenauswahl</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>Bitte geben Sie eine kompatible Quelle für die Liste der Editionen und Karten an. Sie können eine URL-Adresse zum Herunterladen angeben oder eine existierende Datei von Ihrem Computer verwenden.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Lokale Datei:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Standard-URL wiederherstellen</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Datei auswählen...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Editionsdatei wird geladen</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation>Sets Datei (%1)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>Die eingegebene URL ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Herunterladen (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
-        <translation>Bitte wähle eine Datei aus.</translation>
+        <translation>Bitte wählen Sie eine Datei.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Datei &apos;%1&apos; kann nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Herunterladen (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Netzwerkfehler: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Datei wird verarbeitet</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>Fehler beim Extrahieren der xz Datei.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Es tut uns Leid, diese Version von Oracle unterstützt keine xz komprimierten Dateien.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Fehler beim Öffnen des Zip Archivs: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Fehler beim Extrahieren: Das Zip Archiv enthält mehr als eine Datei.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Fehler beim Extrahieren: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Es tut uns Leid, diese Version von Oracle unterstützt keine Zip Archive.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Interpretation der heruntergeladenen Daten fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Möchten Sie stattdessen die unkomprimierte Datei herunterladen?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Die Datei wurde erfolgreich abgerufen, sie enthält aber keine Editionsdaten.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>Speichere Spoilerdatenbank</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; Spoilerdatenbank (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation>Spoiler</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>Spoilerimport</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Bitte geben Sie eine kompatible Quelle für Spoilerdaten an.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation>Lokale Datei:</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Standard-URL wiederherstellen</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation>Datei auswählen...</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>Die Spoilerdatenbank wird in folgendem Pfad gespeichert:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Speichere in benutzerdefiniertem Pfad (nicht empfohlen)</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>Speichere Spielsteindatenbank</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; Spielsteindatenbank (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation>Spielsteine</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>Spielsteinimport</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Bitte geben Sie eine kompatible Quelle für Spielsteindaten an.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation>Lokale Datei:</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Standard-URL wiederherstellen</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation>Datei auswählen...</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>Die Spielsteindatenbank wird in folgendem Pfad gespeichert:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Speichere in benutzerdefiniertem Pfad (nicht empfohlen)</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Platzhalter Edition mit Spielsteinen</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Oracle Importer</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>Der Wizard ist fertig.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Sie können nun Cockatrice mit den aktuellen Karten verwenden.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Falls die Datenbanken nicht automatisch neu geladen werden, starten Sie bitte Cockatrice neu.</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Es wurden keine Editionen importiert.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Editionen wurden importiert</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Eine Cockatrice-Datenbankdatei der Größe %1 MB wurde heruntergeladen.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>Die folgenden Sets wurden gefunden:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Drücken Sie &quot;Speichern&quot;, um die importierten Karten in der Datenbank zu speichern.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>Die Kartendatenbank wird in folgendem Pfad gespeichert:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Speichere in benutzerdefiniertem Pfad (nicht empfohlen)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importieren abgeschlossen: %1 Karten.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 Karten importiert.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Kartendatenbank speichern</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; Kartendatenbank (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>Die Datei konnte nicht gespeichert werden:
 %1 </translation>
@@ -390,56 +360,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation>Lade %1 Datei</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation>%1 Datei (%1)</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation>Die bereitgestellte URL ist nicht gültig:</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>Herunterladen (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation>Bitte wähle eine Datei aus.</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation>Datei &apos;%1&apos; kann nicht geöffnet werden.</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>Herunterladen (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>Netzwerkfehler: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>Die Datei konnte nicht in %1 gespeichert werden</translation>
     </message>
@@ -588,7 +536,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Deutsch (German)</translation>
     </message>
diff --git a/oracle/translations/oracle_el.ts b/oracle/translations/oracle_el.ts
index 7934997cf..03941de8d 100644
--- a/oracle/translations/oracle_el.ts
+++ b/oracle/translations/oracle_el.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Εισαγωγή</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>Αυτός ο αυτόματος οδηγός θα εισάγει τη λίστα των σετ, καρτών και δειγμάτων (tokens) που θα χρησιμοποιηθούν από το Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Έκδοση:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Επιλογή πηγής</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>URL λήψης:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Τοπικό αρχείο:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Επαναφορά προκαθορισμένης διεύθυνσης URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Επιλέξτε αρχείο...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Φόρτωση αρχείων</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>Η παρεχόμενη διεύθυνση URL δεν είναι έγκυρη.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Λήψη (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Παρακαλώ διαλέξτε έναν αρχείο.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Δεν είναι δυνατό να ανοίξει το αρχείο &apos;% 1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Λήψη (% 1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Σφάλμα δικτύου: % 1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Ανάλυση αρχείου</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Αποτυχία ανοίγματος αρχείου Zip:% 1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Η εξαγωγή zip απέτυχε: το αρχείο Zip δεν περιέχει ακριβώς ένα αρχείο.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Η εξαγωγή zip απέτυχε: % 1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Λυπούμαστε, αυτή η έκδοση του Oracle δεν υποστηρίζει αρχεία τύπου zipped.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Το αρχείο ανακτήθηκε με επιτυχία, αλλά δεν περιέχει σύνολα δεδομένων.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>URL λήψης:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Επαναφορά προκαθορισμένης διεύθυνσης URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Εικονικό σετ που περιέχει tokens</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Εισαγωγέας Oracle</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation type="unfinished"/>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Δεν έχει εισαχθεί κανένα σετ.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Εισαγόμενα σετς</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Η εισαγωγή ολοκληρώθηκε: % 1 κάρτες.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 κάρτες εισήχθησαν</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Αποθήκευση κάρτας βάσης δεδομένων</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; κάρτα βάσης δεδομένων (* .xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>Δεν ήταν δυνατή η αποθήκευση του αρχείου στο %1</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -448,87 +396,87 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1175"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>Η λειτουργία ZIP ολοκληρώθηκε με επιτυχία.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1176"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>Δεν ήταν δυνατή η προετοιμασία ή η φόρτωση της βιβλιοθήκης zlib.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1177"/>
         <source>zlib library error.</source>
-        <translation> Σφάλμα βιβλιοθήκης zlib.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1178"/>
         <source>Unable to create or open file.</source>
-        <translation>Δεν είναι δυνατή η δημιουργία ή το άνοιγμα αρχείου.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1179"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
-        <translation>Μερικώς κατεστραμμένο αρχείο. Κάποια αρχεία ενδέχεται να εξαχθούν.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1180"/>
         <source>Corrupted archive.</source>
-        <translation>Κατεστραμμένο αρχείο.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1181"/>
         <source>Wrong password.</source>
-        <translation>Λάθος κωδικός.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1182"/>
         <source>No archive has been created yet.</source>
-        <translation>Δεν έχει δημιουργηθεί κανένα αρχείο ακόμα.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1183"/>
         <source>File or directory does not exist.</source>
-        <translation>Το αρχείο ή ο κατάλογος δεν υπάρχει.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1184"/>
         <source>File read error.</source>
-        <translation>Σφάλμα ανάγνωσης αρχείου.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1185"/>
         <source>File write error.</source>
-        <translation>Σφάλμα εγγραφής αρχείου.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1186"/>
         <source>File seek error.</source>
-        <translation>Σφάλμα αναζήτησης αρχείου.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1187"/>
         <source>Unable to create a directory.</source>
-        <translation>Δεν είναι δυνατή η δημιουργία ενός καταλόγου.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1188"/>
         <source>Invalid device.</source>
-        <translation>Μη έγκυρη συσκευή.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1189"/>
         <source>Invalid or incompatible zip archive.</source>
-        <translation>Μη έγκυρο ή ασυμβίβαστο zip αρχείο.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1190"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
-        <translation>Αντιφατικές κεφαλίδες. Το αρχείο μπορεί να είναι κατεστραμμένο.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1194"/>
         <source>Unknown error.</source>
-        <translation>Άγνωστο σφάλμα.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -536,58 +484,58 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1604"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>Η λειτουργία ZIP ολοκληρώθηκε με επιτυχία.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1605"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>Δεν ήταν δυνατή η προετοιμασία ή η φόρτωση της βιβλιοθήκης zlib.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1606"/>
         <source>zlib library error.</source>
-        <translation>Σφάλμα βιβλιοθήκης zlib.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1607"/>
         <source>Unable to create or open file.</source>
-        <translation>Δεν είναι δυνατή η δημιουργία ή το άνοιγμα αρχείου.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1608"/>
         <source>No archive has been created yet.</source>
-        <translation>Δεν έχει δημιουργηθεί αρχείο ακόμα.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1609"/>
         <source>File or directory does not exist.</source>
-        <translation>Το αρχείο ή ο κατάλογος δεν υπάρχει.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1610"/>
         <source>File read error.</source>
-        <translation>Σφάλμα ανάγνωσης αρχείου.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1611"/>
         <source>File write error.</source>
-        <translation>Σφάλμα εγγραφής αρχείου.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1612"/>
         <source>File seek error.</source>
-        <translation>Σφάλμα αναζήτησης αρχείου.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1616"/>
         <source>Unknown error.</source>
-        <translation>Άγνωστο σφάλμα.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Ελληνικά (Greek)</translation>
     </message>
diff --git a/oracle/translations/oracle_en@pirate.ts b/oracle/translations/oracle_en@pirate.ts
index 13a57750b..42b3d1273 100644
--- a/oracle/translations/oracle_en@pirate.ts
+++ b/oracle/translations/oracle_en@pirate.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/oraclewizard.cpp" line="200"/>
         <source>Introduction</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <location filename="src/oraclewizard.cpp" line="201"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="203"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/oraclewizard.cpp" line="204"/>
         <source>Version:</source>
         <translation type="unfinished"/>
     </message>
@@ -25,134 +25,133 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/oraclewizard.cpp" line="259"/>
         <source>Source selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <location filename="src/oraclewizard.cpp" line="260"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/oraclewizard.cpp" line="264"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/oraclewizard.cpp" line="265"/>
         <source>Local file:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/oraclewizard.cpp" line="266"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/oraclewizard.cpp" line="267"/>
         <source>Choose file...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/oraclewizard.cpp" line="277"/>
         <source>Load sets file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
-        <source>Sets file (%1)</source>
-        <oldsource>Sets JSON file (%1)</oldsource>
+        <location filename="src/oraclewizard.cpp" line="287"/>
+        <source>Sets JSON file (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <location filename="src/oraclewizard.cpp" line="317"/>
+        <location filename="src/oraclewizard.cpp" line="336"/>
+        <location filename="src/oraclewizard.cpp" line="341"/>
+        <location filename="src/oraclewizard.cpp" line="409"/>
+        <location filename="src/oraclewizard.cpp" line="540"/>
+        <location filename="src/oraclewizard.cpp" line="553"/>
+        <location filename="src/oraclewizard.cpp" line="574"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="317"/>
         <source>The provided URL is not valid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/oraclewizard.cpp" line="321"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="336"/>
         <source>Please choose a file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="341"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/oraclewizard.cpp" line="400"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="409"/>
         <source>Network error: %1.</source>
         <translation>Cap&apos;n? Thar be a problem wi&apos; t&apos; smoke signals: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/oraclewizard.cpp" line="447"/>
         <source>Parsing file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="469"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/oraclewizard.cpp" line="496"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/oraclewizard.cpp" line="501"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/oraclewizard.cpp" line="509"/>
         <source>Zip extraction failed: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/oraclewizard.cpp" line="517"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="540"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="553"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/oraclewizard.cpp" line="575"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation type="unfinished"/>
     </message>
@@ -160,42 +159,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/oraclewizard.cpp" line="749"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/oraclewizard.cpp" line="754"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/oraclewizard.cpp" line="759"/>
         <source>Spoilers import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/oraclewizard.cpp" line="760"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/oraclewizard.cpp" line="762"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -203,42 +202,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/oraclewizard.cpp" line="712"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/oraclewizard.cpp" line="717"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/oraclewizard.cpp" line="722"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/oraclewizard.cpp" line="723"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/oraclewizard.cpp" line="725"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/oraclewizard.cpp" line="726"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/oraclewizard.cpp" line="727"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/oraclewizard.cpp" line="729"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -246,7 +245,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="492"/>
         <source>Dummy set containing tokens</source>
         <translation type="unfinished"/>
     </message>
@@ -254,7 +253,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="106"/>
+        <location filename="src/oraclewizard.cpp" line="98"/>
         <source>Oracle Importer</source>
         <translation type="unfinished"/>
     </message>
@@ -262,22 +261,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/oraclewizard.cpp" line="209"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/oraclewizard.cpp" line="210"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/oraclewizard.cpp" line="211"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/oraclewizard.cpp" line="212"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation type="unfinished"/>
     </message>
@@ -285,73 +284,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/oraclewizard.cpp" line="618"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>Error</source>
         <translation>Cap&apos;n? Thar be a problem</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="618"/>
         <source>No set has been imported.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/oraclewizard.cpp" line="624"/>
         <source>Sets imported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/oraclewizard.cpp" line="626"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/oraclewizard.cpp" line="629"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/oraclewizard.cpp" line="632"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/oraclewizard.cpp" line="633"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/oraclewizard.cpp" line="635"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/oraclewizard.cpp" line="637"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/oraclewizard.cpp" line="643"/>
         <source>Import finished: %1 cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>%1: %2 cards imported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="655"/>
         <source>Save card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>XML; card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -367,7 +366,7 @@
     </message>
     <message>
         <location filename="src/pagetemplates.cpp" line="73"/>
-        <source>The provided URL is not valid: </source>
+        <source>The provided URL is not valid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -406,7 +405,7 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1177"/>
         <source>zlib library error.</source>
-        <translation>Cap&apos;n? Thar be a problem wi&apos; t&apos; zlib library.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1178"/>
@@ -476,7 +475,7 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1194"/>
         <source>Unknown error.</source>
-        <translation>Cap&apos;n? Thar be a unknown problem wi&apos; t&apos; ship.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -494,7 +493,7 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1606"/>
         <source>zlib library error.</source>
-        <translation>Cap&apos;n? Thar be a problem wi&apos; t&apos; zlib library.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1607"/>
@@ -529,7 +528,7 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1616"/>
         <source>Unknown error.</source>
-        <translation>Cap&apos;n? Thar be a unknown problem wi&apos; t&apos; ship.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -543,14 +542,9 @@
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="62"/>
+        <location filename="src/main.cpp" line="60"/>
         <source>Only run in spoiler mode</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/main.cpp" line="63"/>
-        <source>Run in no-confirm background mode</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/oracle/translations/oracle_en_US.ts b/oracle/translations/oracle_en_US.ts
index 4b664bf57..bdaafafa0 100644
--- a/oracle/translations/oracle_en_US.ts
+++ b/oracle/translations/oracle_en_US.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Introduction</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>Interface language:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Version:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Source selection</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Local file:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Restore default URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Choose file...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Load sets file</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
-        <translation>Sets file (%1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>The provided URL is not valid.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Downloading (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Please choose a file.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Cannot open file &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Downloading (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Network error: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Parsing file</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>Xz extraction failed.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Sorry, this version of Oracle does not support xz compressed files.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Failed to open Zip archive: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Zip extraction failed: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Sorry, this version of Oracle does not support zipped files.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Failed to interpret downloaded data.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Do you want to download the uncompressed file instead?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>The file was retrieved successfully, but it does not contain any sets data.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>Save spoiler database</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; spoiler database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation>spoiler</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>Spoilers import</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Please specify a compatible source for spoiler data.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation>Local file:</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Restore default URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation>Choose file...</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>The spoiler database will be saved at the following location:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Save to a custom path (not recommended)</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>Save token database</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; token database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation>tokens</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>Tokens import</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Please specify a compatible source for token data.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation>Local file:</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Restore default URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation>Choose file...</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>The token database will be saved at the following location:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Save to a custom path (not recommended)</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Dummy set containing tokens</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Oracle Importer</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>Finished</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>The wizard has finished.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>You can now start using Cockatrice with the newly updated cards.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>No set has been imported.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Sets imported</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>A cockatrice database file of %1 MB has been downloaded.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>The following sets have been found:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>The card database will be saved at the following location:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Save to a custom path (not recommended)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>&amp;Save</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Import finished: %1 cards.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 cards imported</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Save card database</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; card database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>The file could not be saved to %1</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation>Load %1 file</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation>%1 file (%1)</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
-        <translation>The provided URL is not valid: </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>Downloading (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation>Please choose a file.</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation>Cannot open file &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>Downloading (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>Network error: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>The file could not be saved to %1</translation>
     </message>
@@ -587,7 +535,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>English</translation>
     </message>
@@ -602,7 +550,7 @@
     <message>
         <location filename="src/main.cpp" line="63"/>
         <source>Run in no-confirm background mode</source>
-        <translation>Run in no-confirm background mode</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/oracle/translations/oracle_es.ts b/oracle/translations/oracle_es.ts
index eeb9f71bd..f97075a93 100644
--- a/oracle/translations/oracle_es.ts
+++ b/oracle/translations/oracle_es.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Introducción</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>Este instalador importará la lista de ediciones, cartas y fichas que va a usar Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>Idioma de la interfaz:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Versión:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Seleccionar origen</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>Por favor especifica un origen compatible para la lista de sets y cartas. Puedes especificar la URL de donde descargarla o usar un archivo existente de tu ordenador.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>URL de descarga:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Archivo local:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Restablecer URL predeterminada</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Elegir archivo...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Cargar archivo de ediciones</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>La URL suministrada no es válida.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Descargando (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Por favor elija un archivo.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>No se puede abrir el archivo &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Descargando (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Error de red: %1</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Procesando archivo</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>Extracción de Xz fallida</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Lo sentimos, esta versión de Oracle no soporta archivos comprimidos xz</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Error al abrir el archivo Zip: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Fallo al extraer el contenido: el Zip contiene más de un archivo.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Error al extraer el contenido del Zip: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Lo sentimos, esta versión de Oracle no soporta archivos comprimidos.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>No se pudieron interpretar los datos descargados.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>¿Prefieres descargar el archivo sin comprimir?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>El archivo fue cargado correctamente pero no contiene datos sobre ningún set.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>Guardar la base de datos de spoilers</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; base de datos de spoilers (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>Importar spoilers</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Por favor elija un origen compatible para los datos de los spoilers.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>URL de descarga:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Restaurar URL por defecto</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>La base de datos de los spoilers será guardada en la siguiente ubicación:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Guardar en una ruta personalizada (no recomendado)</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>Guardar base de datos de fichas</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; base de datos de fichas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>Importar tokens</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Por favor elija un origen compatible para los datos de las fichas.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>URL de descarga:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Restablecer URL predeterminada</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>La base de datos de las fichas será guardada en la siguiente ubicación:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Guardar en una ruta personalizada (no recomendado)</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Set dedicado para tokens</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Importador de Oracle</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>Completado</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>El asistente ha terminado.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Ahora puedes usar Cockatrice con las cartas actualizadas.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Si las bases de datos de cartas no se recargan automáticamente, reinicia el cliente de Cockatrice.</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Ningún set ha sido importado.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Sets importados</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Se ha descargado un archivo de base de datos cockatrice de %1 MB.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>Las siguientes ediciones han sido encontradas:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Pulsa &quot;Guardar&quot; para guardar las cartas importadas en la base de datos de Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>La base de datos de cartas ha sido guardada en la siguiente ubicación:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Guardar en una ruta personalizada (no recomendado)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>&amp;Guardar</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importación terminada: %1 cartas.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 cartas importadas</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Guardar base de datos de cartas</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; base de datos de cartas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>El archivo no ha podido ser guardado en %1</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
-        <translation>La URL proporcionada no es válida:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>Descargando (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>Descargando (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>Error de red: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>El archivo no ha podido ser guardado en %1</translation>
     </message>
@@ -536,58 +484,58 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1604"/>
         <source>ZIP operation completed successfully.</source>
-        <translation> La operación ZIP se completó con éxito.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1605"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>Fallo al iniciar o cargar la librería zlib.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1606"/>
         <source>zlib library error.</source>
-        <translation>Error en la librería zlib.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1607"/>
         <source>Unable to create or open file.</source>
-        <translation>No es posible crear o abrir el archivo.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1608"/>
         <source>No archive has been created yet.</source>
-        <translation>No se ha creado ningún archivo todavía.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1609"/>
         <source>File or directory does not exist.</source>
-        <translation>El archivo o directorio no existe.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1610"/>
         <source>File read error.</source>
-        <translation>Error al leer el archivo.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1611"/>
         <source>File write error.</source>
-        <translation>Error al escribir en archivo.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1612"/>
         <source>File seek error.</source>
-        <translation>Error al buscar en el archivo.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1616"/>
         <source>Unknown error.</source>
-        <translation>Error desconocido.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Español (Spanish)</translation>
     </message>
diff --git a/oracle/translations/oracle_et.ts b/oracle/translations/oracle_et.ts
index 9f2c560cd..a03cc4da8 100644
--- a/oracle/translations/oracle_et.ts
+++ b/oracle/translations/oracle_et.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Sissejuhatus</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>See võlur impordib Cockatrice’is kasutatava nimekirja komplektidest, kaartidest ja märgistustest.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Versioon:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Allika valik</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>Palun täpsusta ühilduv allikas komplektide ja kaartide nimekirja jaoks. Võid täpsustada URL-i aadressi, mis laaditakse alla või kasutada olemasolevat faili oma arvutist.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>Allalaadimise URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Fail arvutis:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Taasta tavaURL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Valige fail....</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Lae komplektide kaust</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>Antud URl pole kehtiv.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Allalaadimine (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Palun valige fail.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Ei suudeta avada &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Allalaadimine (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Võrgu viga: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Faili hankimine</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>Xzi lahtipakkimine nurjus.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Vabandame, aga antud Oracle’i versioon ei toeta xz kokkupakitud faile.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Zip-arhiivi avamine ebaõnnestus: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Zip-i lahtipakkimine ebaõnnestus: Zip-arhiiv sisaldab rohkem faile kui üks.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Zipi lahtipakkimine ebaõnnestus: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Vabandame, aga antud Oracle versioon ei toeta kokkupakitud faile.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Soovid alla laadida hoopis pakkimata faili?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Fail on edukalt alla laetud, ent ei sisalda andmeid.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>Salvesta spoileri andmebaas</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; spoileri andmebaas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>Spoilerite import</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Täpsusta spoileri andmetega ühilduv allikas.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>Allalaadimise URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Taasta tavaURL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>Spoileri andmebaas salvestatakse järgmisesse asukohta:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvesta enda määratud asukohta (pole soovitatav)</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>Salvesta märgistuste andmebaas</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; märgistuste andmebaas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>Märgistuste importimine</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Täpsusta märgistuste andmetega ühilduv allikas.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>Allalaadimise URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Taasta tavaURL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>Märgistuste andmebaas salvestatakse järgmisesse asukohta:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvesta enda määratud asukohta (pole soovitatav)</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Nukk-komplekt mis sisaldab märgistusi</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Oracle sissetooja</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>Võlur on lõpetanud.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Nüüd saad Cockatrice’i kasutada uhiuute kaartidega.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Kui kaardi andmebaasid ei lae ise, taaskäivita Cockatrice’i klient.</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Komplekti pole sisse toodud.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Allalaetud komplektid</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>Leiti järgmised komplektid:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Vajuta „Salvesta“, et salvestada imporditud kaardid Cockatrice’i andmebaasi.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>Kaardi andmebaas salvestatakse järgmisesse asukohta:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvesta enda määratud asukohta (pole soovitatav)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvesta</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>%1 kaarti imporditi edukalt.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: imporditi %2 kaarti</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Salvesta kaartide andmebaas</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; kaartide andmebaas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>Faili salvestamine asukohta %1 ebaõnnestus</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>Allalaadimine (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>Allalaadimine (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>Võrgu viga: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>Faili salvestamine asukohta %1 nurjus</translation>
     </message>
@@ -448,87 +396,87 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1175"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>Zip-i tegevus oli edukas.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1176"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>Zlibi kogu ei suudetud ette valmistada või laadida.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1177"/>
         <source>zlib library error.</source>
-        <translation>zlibi kogu viga.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1178"/>
         <source>Unable to create or open file.</source>
-        <translation>Faili ei suudetud luua või avada.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1179"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
-        <translation>Osaliselt vigane arhiiv. Ainult osa faile võidakse lahti pakkida.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1180"/>
         <source>Corrupted archive.</source>
-        <translation>Kahjustunud arhiiv.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1181"/>
         <source>Wrong password.</source>
-        <translation>Vale parool.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1182"/>
         <source>No archive has been created yet.</source>
-        <translation>Loodud arhiivid puuduvad.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1183"/>
         <source>File or directory does not exist.</source>
-        <translation>Faili või asukohta pole olemas.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1184"/>
         <source>File read error.</source>
-        <translation>Faili lugemise viga.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1185"/>
         <source>File write error.</source>
-        <translation>Faili kirjutamise viga.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1186"/>
         <source>File seek error.</source>
-        <translation>Faili otsimise viga</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1187"/>
         <source>Unable to create a directory.</source>
-        <translation>Asukoha loomine ebaõnnestus.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1188"/>
         <source>Invalid device.</source>
-        <translation>Vigane seade.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1189"/>
         <source>Invalid or incompatible zip archive.</source>
-        <translation>Vigane või mittetoetatav zip-arhiiv.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1190"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
-        <translation>Ebajäriekindlad päised. Arhiiv võib olla rikutud.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1194"/>
         <source>Unknown error.</source>
-        <translation>Tundmatu viga.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -536,58 +484,58 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1604"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>Zip-tegevus on valmis.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1605"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>Zlib kogu ei suudetud ette valmistada või laadida.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1606"/>
         <source>zlib library error.</source>
-        <translation>zlibi kogu viga.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1607"/>
         <source>Unable to create or open file.</source>
-        <translation>Faili loomine või avamine ebaõnnestus.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1608"/>
         <source>No archive has been created yet.</source>
-        <translation>Loodud arhiivid puuduvad.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1609"/>
         <source>File or directory does not exist.</source>
-        <translation>Faili või asukohta pole olemas.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1610"/>
         <source>File read error.</source>
-        <translation>Faili lugemise viga.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1611"/>
         <source>File write error.</source>
-        <translation>Faili kirjutamise viga.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1612"/>
         <source>File seek error.</source>
-        <translation>Faili otsimise viga.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1616"/>
         <source>Unknown error.</source>
-        <translation>Tundmatu viga.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Eesti Keel (Estonian)</translation>
     </message>
diff --git a/oracle/translations/oracle_fi.ts b/oracle/translations/oracle_fi.ts
index c7657cf7a..093dec9ad 100644
--- a/oracle/translations/oracle_fi.ts
+++ b/oracle/translations/oracle_fi.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Johdanto</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>Tämä työkalu asentaa Cockatricessa käytettävät setit, kortit ja tokenit.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>Käyttöliittymän kieli:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Versio:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Lähteen määritys</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>Ole hyvä ja määritä lähde setti- ja korttilistalle. Voit määrittää ladattavan URL-osoitteen tai käyttää tietokoneellasi olevaa tiedostoa.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>Ladattavan tiedoston URL-osoite:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Paikallinen tiedosto:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Palauta oletus-URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Valitse tiedosto...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Ladatta ekspansiotiedosto</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>Määritetty URL on virheellinen.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Ladataan (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Valitse tiedosto.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Ei voida avata tiedostoa &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Ladataan (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Yhteysvirhe: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Jäsennellään tiedostoa</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>Xz purku epäonnistui.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Pahoittelut. Tämä versio Oraclesta ei tue xz-pakattuja tiedostoja.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Zip-tiedoston avaaminen epäonnistui: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Zip-tiedoston purkaminen epäonnistui: Zip-tiedosto ei sisällä tarkalleen yhtä tiedostoa.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Zip-tiedoston purkaminen epäonnistuie: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Pahoittelut. Tämä versio Oraclesta ei tue Zip-pakattuja tiedostoja.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Ladattujen tietojen tulkitseminen epäonnistui.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Haluatko sensijaan ladata pakkaamattoman tiedoston?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Tiedosto palautettiin onnistuneesti, mutta se ei sisällä yhdenkään ekspansion dataa.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>Tallenna spoileritietokanta</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; spoileritietokanta (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>Spoilerien lataus</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Ole hyvä ja osoita yhteensopiva spoileridatan lähde.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>Ladattavan tiedoston URL-osoite:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Palauta oletus-URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>Spoileritietokanta tallennetaan seuraavaan sijaintiin:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Tallenna mukautettuun sijaintiin (ei-suositeltu)</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>Tallenna tokenitietokanta</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; tokenitietokanta (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>Tokenien lataus</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Ole hyvä ja osoita yhteensopiva tokenidatan lähde.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>Ladattavan tiedoston URL-osoite:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Palauta oletus-URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>Tokenitietokanta tallennetaan seuraavaan sijaintiin:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Tallenna mukautettuun sijaintiin (ei-suositeltu)</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Tokeneja sisältävä mallisetti</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Oracle-lataaja</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>Asennusohjelma on valmis.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Voit nyt käyttää Cockatricea juuri päivitetyillä korteilla.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Jos korttitietokannat eivät päivity automaattisesti, käynnistä Cockatrice uudelleen.</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Yhtään settiä ei ladattu.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Ladatut ekspansiot</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Cockatrice tietokantatiedosto kooltaan %1 MB on ladattu.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>Seuraavat setit löydettiin:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Paina &quot;Tallenna&quot; varastoidaksesi ladatut kortit Cockatricen tietokantaan.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>Korttitietokanta tallennetaan seuraavaan sijaintiin:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Tallenna mukautettuun sijaintiin (ei-suositeltu)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>&amp;Tallenna</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Lataaminen valmis: %1 kortit.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 kortit ladattu</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Tallenna korttitietokanta</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; korttitietokanta (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>Tiedostoa ei voitu tallentaa osoitteeseen %1</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>Ladataan (0 MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>Ladataan (%1 MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>Yhteysvirhe: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>Tiedostoa ei voitu tallentaa osoitteeseen %1</translation>
     </message>
@@ -587,7 +535,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Suomi (Finnish)</translation>
     </message>
diff --git a/oracle/translations/oracle_fr.ts b/oracle/translations/oracle_fr.ts
index 47ab5d0fa..b2beca4a4 100644
--- a/oracle/translations/oracle_fr.ts
+++ b/oracle/translations/oracle_fr.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Introduction</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>Cet assistant va importer la liste des éditions, cartes et jetons qui seront utilisés par Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>Langage de l&apos;interface :</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Version :</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Choix du fichier source</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>Veuillez spécifier une source compatible pour la liste d&apos;éditions et de cartes. Vous pouvez spécifier une URL qui sera utilisée pour télécharger un fichier ou utiliser un fichier existant sur votre ordinateur.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>URL de téléchargement :</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Fichier local :</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Restaurer l&apos;URL par défaut</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Choisissez un fichier...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Charger une liste d&apos;éditions</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation>Choisir le fichier (%1)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>L&apos;URL fournie n&apos;est pas valable</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Téléchargement en cours (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Choisissez un fichier.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Impossible d&apos;ouvrir le fichier &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Téléchargement (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Erreur réseau : %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Traitement du fichier.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>L&apos;extraction du zip à échoué.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Désolé, cette version d&apos;Oracle ne supporte pas les fichiers zip.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Impossible d&apos;ouvrir l&apos;archive zip: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Extraction zip échouée: l&apos;archive zip contient plus qu&apos;un fichier.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>L&apos;extraction du zip a échoué : %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Désolé, cette version d&apos;Oracle ne supporte pas les fichiers zip.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Échec lors de l&apos;interprétation des données téléchargées.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Voulez-vous télécharger le fichier non compressé à la place ?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Le fichier a été trouvé, mais ne contient aucune éditions.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>Enregistrer la base de données des spoilers</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML ; base de données des spoilers (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation>spoiler</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>Importation des spoilers</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Veuillez spécifier une source compatible pour les spoilers.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>URL de téléchargement :</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation>Fichier local:</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Restaurer l&apos;URL par défaut</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation>Choisissez un fichier...</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>La base de données des spoilers sera enregistrée à l&apos;emplacement suivant :</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Sauvegarder à un emplacement personnalisé (non recommandé)</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>Enregistrer la base de données des jetons</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML ; base de données des jetons (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation>jetons</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>Importation des jetons</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Veuillez spécifier une source compatible pour les jetons.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>URL de téléchargement:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation>Ficher local:</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Restaurer l&apos;URL par défaut</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation>Choisissez un ficher...</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>La base de données des jetons sera enregistrée à l&apos;emplacement suivant :</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Sauvegarder à un emplacement personnalisé (non recommandé)</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Fausse édition contenant les jetons</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Importateur Oracle</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>Terminé</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>L&apos;assistant a terminé.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Vous pouvez maintenant commencer à utiliser Cockatrice avec les cartes mises à jour.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Si les bases de données de cartes ne rechargent pas automatiquement, redémarrez le client Cockatrice.</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Aucune édition n&apos;a été importé.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Éditions importées</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Un fichier de base de données Cockatrice de %1 MB a été téléchargé.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>Les éditions suivantes ont été trouvées :</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Cliquez sur « Enregistrer » pour enregistrer les cartes importées dans la base de données de Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>La base de données des cartes sera enregistrée à l&apos;emplacement suivant :</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Sauvegarder à un emplacement personnalisé (non recommandé)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Import terminé: %1 cartes.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 cartes ajoutées.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Sauvegarder la base de carte</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML ; base de données de cartes (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>Le fichier n&apos;a pu être sauvegarder au chemin &apos;%1&apos;</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation>Chargez le fichier %1</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation>fichier %1 (%1)</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation>L&apos;URL fournie n&apos;est pas valide :</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>Téléchargement (0 Mo)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation>Merci de choisir un fichier.</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation>Le fichier &apos;%1&apos; ne peut pas être ouvert.</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>Téléchargement (%1 Mo)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>Erreur réseau : %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>Le fichier n&apos;a pas pu être enregistré dans %1</translation>
     </message>
@@ -587,7 +535,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Français (French)</translation>
     </message>
diff --git a/oracle/translations/oracle_it.ts b/oracle/translations/oracle_it.ts
index 34bcb3cbc..192e8cc0e 100644
--- a/oracle/translations/oracle_it.ts
+++ b/oracle/translations/oracle_it.ts
@@ -2,23 +2,23 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Introduzione</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>Questo wizard importerà la lista di set, carte
 e pedine che verranno usate da Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>Lingua dell&apos;interfaccia:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Versione:</translation>
     </message>
@@ -26,134 +26,134 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Selezione sorgente</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>Specifica una sorgente compatibile per la lista dei set e delle carte. Puoi specificare un indirizzo URL da cui scaricare il file o selezionare un file già presente nel tuo computer.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>Indirizzo download:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>File nel pc:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Usa l&apos;indirizzo predefinito</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Scegli file...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Carica file dei set</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation>File dei set (%1)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>L&apos;indirizzo specificato non è valido.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Scaricamento (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Seleziona un file.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Impossibile aprire il file &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Scaricamento (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Errore di rete: %1</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Analisi dei file</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>Estrazione da file xz fallita.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Spiacente, ma questa versione di Oracle non supporta i file xz.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Impossibile aprire il file Zip: %1</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Estrazione file Zip fallita: lo Zip non contiene un solo file.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Estrazione file Zip fallita: %1</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Spiacente, ma questa versione di Oracle non supporta i file zip.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Impossibile interpretare i dati scaricati.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Vuoi provare a scaricare il file non compresso?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Il file è stato analizzato correttamente, ma non contiene i dati di nessun set.</translation>
     </message>
@@ -161,57 +161,42 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>Salva archivio spoiler</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; archivio spoiler (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation>spoiler</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>Importazione spoiler</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Specifica una sorgente compatibile per gli spoiler.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>Indirizzo download:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation>File nel pc:</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Usa l&apos;indirizzo predefinito</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation>Scegli file...</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>L&apos;archivio degli spoiler verrà salvato nel seguente percorso:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salva in un percorso diverso (sconsigliato)</translation>
     </message>
@@ -219,57 +204,42 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>Salva archivio pedine</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; archivio pedine (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation>pedine</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>Importazione pedine</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Specifica una sorgente compatibile per le pedine.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>Indirizzo download:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation>File nel pc:</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Usa l&apos;indirizzo predefinito</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation>Scegli file...</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>L&apos;archivio delle pedine verrà salvato nel seguente percorso:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salva in un percorso diverso (sconsigliato)</translation>
     </message>
@@ -277,7 +247,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="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Set finto contenente i token</translation>
     </message>
@@ -285,7 +255,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="106"/>
         <source>Oracle Importer</source>
         <translation>Oracle Importer</translation>
     </message>
@@ -293,22 +263,22 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>Finito</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>Il wizard è completato.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Adesso puoi iniziare ad usare Cockatrice con le nuove carte aggiornate.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Se il database delle carte non si ricarica in automatico, riavvia il programma Cockatrice.</translation>
     </message>
@@ -316,73 +286,73 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Nessun set importato.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Set importati</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>È stato scaricato un file database di Cockatrice di %1 MB.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>Sono stati trovati i seguenti set:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Premi &quot;Salva&quot; per salvare le carte importate nel database di Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>L&apos;archivio delle carte verrà salvato nel seguente percorso:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salva in un percorso diverso (sconsigliato)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>&amp;Salva</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importazione conclusa: %1 carte.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 carte importate</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Salva archivio carte</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; archivio carte (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>Impossibile salvare il file su %1</translation>
     </message>
@@ -390,56 +360,34 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation>Carica %1 file</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation>%1 file (%1)</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation>L&apos;indirizzo fornito non è valido:</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>Scaricamento (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation>Seleziona un file.</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation>Impossibile aprire il file &apos;%1&apos;.</translation>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>Scaricamento (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>Errore di rete: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>Impossibile salvare il file su %1</translation>
     </message>
@@ -588,7 +536,7 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Italiano (Italian)</translation>
     </message>
diff --git a/oracle/translations/oracle_ja.ts b/oracle/translations/oracle_ja.ts
index 8319f37a2..1900188e8 100644
--- a/oracle/translations/oracle_ja.ts
+++ b/oracle/translations/oracle_ja.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>はじめに</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>このウィザードでは、Cockatriceで使用されるカードやトークン、セットのリストをインポートします。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>インターフェース言語:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>バージョン:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>ソース選択</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>セットとカードのリストの互換性のあるソースを指定してください。ダウンロードするURLアドレスを指定するか、コンピューターから既存のファイルを使用できます。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>ダウンロードURL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>ローカルファイル:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>デフォルトのURLを復元</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>ファイルを選択...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>カードセットファイルを開く</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>指定されたURLは無効です。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>ダウンロード中 (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>ファイルを選択してください。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>&apos;%1&apos;を開けませんでした。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>ダウンロード中 (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>ネットワークエラー: %1。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>ファイルの解析</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>Xz展開に失敗。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>このバージョンのOracleはxz圧縮ファイルをサポートしていません。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>ZIPアーカイブの展開に失敗: %1。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>ZIP展開に失敗:Zipアーカイブに含まれるファイルが1つだけではありません。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>ZIP展開に失敗: %1。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>申し訳ありませんが現バージョンのOracleはzip形式のファイルをサポートしていません。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>代わりに非圧縮ファイルをダウンロードしますか？</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>ファイルは正常に取得されましたが、カードセットのデータが含まれていませんでした。</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>スポイラーデータベースを保存</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; スポイラーデータベース (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>スポイラーインポート</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>互換性のあるスポイラーデータのソースを指定してください。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>ダウンロードURL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>デフォルトのURLを復元</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>スポイラーデータベースは、以下の場所に保存されます:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>別のパスに保存（非推奨）</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>トークンデータベースを保存</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; トークンデータベース (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>トークンのインポート</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>トークンデータのソースを選択してください。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>ダウンロードURL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>デフォルトのURLを復元</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>トークンデータベースは以下の場所に保存されます。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>別のパスに保存（非推奨）</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>ダミーセットを含むトークン</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Oracle Importer - オラクル・インポーター</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>完了しました！</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>ウィザードが完了しました。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Cockatriceで新しく更新されたカードを使うことが出来ます。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>カードデータベースが自動的に再読込されない場合は、Cockatriceを再起動して下さい。</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>セットはインポートされませんでした。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>カードセットインポート</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>次のセットが見つかりました:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>”保存”をクリックするとインポートしたカードをCockatriceデータベースに保存します。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>カードデータベースは以下の場所に保存されます:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>別のパスに保存（非推奨）</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>%1枚のカードがインポートされました。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2枚のカードがインポートされました。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>カードデータベースを保存</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; card database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>%1に保存できませんでした。</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>ダウンロード中 (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>ダウンロード中 (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>ネットワークエラー: %1。</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>%1に保存できませんでした。</translation>
     </message>
@@ -448,87 +396,87 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1175"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>正常に完了しました。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1176"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>初期化またはzlibライブラリのロードに失敗しました。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1177"/>
         <source>zlib library error.</source>
-        <translation>zlibライブラリエラー。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1178"/>
         <source>Unable to create or open file.</source>
-        <translation>ファイルが作成または開けませんでした。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1179"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
-        <translation>アーカイブが部分的に破損しています。いくつかのファイルが抽出されることがあります。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1180"/>
         <source>Corrupted archive.</source>
-        <translation>破損したアーカイブ。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1181"/>
         <source>Wrong password.</source>
-        <translation>パスワードが間違っています。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1182"/>
         <source>No archive has been created yet.</source>
-        <translation>アーカイブは作成されませんでした。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1183"/>
         <source>File or directory does not exist.</source>
-        <translation>ファイルまたはフォルダが存在しません。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1184"/>
         <source>File read error.</source>
-        <translation>ファイル読み込みエラー。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1185"/>
         <source>File write error.</source>
-        <translation>ファイル書き込みエラー。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1186"/>
         <source>File seek error.</source>
-        <translation>シーク エラー。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1187"/>
         <source>Unable to create a directory.</source>
-        <translation>フォルダが作成できませんでした。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1188"/>
         <source>Invalid device.</source>
-        <translation>無効なデバイス。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1189"/>
         <source>Invalid or incompatible zip archive.</source>
-        <translation>無効なまたは互換性のないzipアーカイブ。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1190"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
-        <translation>一貫性のないヘッダー。アーカイブが壊れている可能性があります。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1194"/>
         <source>Unknown error.</source>
-        <translation>不明なエラー。</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -536,58 +484,58 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1604"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>正常に完了しました。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1605"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>初期化またはzlibライブラリのロードに失敗しました。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1606"/>
         <source>zlib library error.</source>
-        <translation>zlibライブラリエラー。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1607"/>
         <source>Unable to create or open file.</source>
-        <translation>ファイルが作成または開けませんでした。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1608"/>
         <source>No archive has been created yet.</source>
-        <translation>アーカイブは作成されませんでした。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1609"/>
         <source>File or directory does not exist.</source>
-        <translation>ファイルまたはフォルダが存在しません。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1610"/>
         <source>File read error.</source>
-        <translation>ファイル読み込みエラー。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1611"/>
         <source>File write error.</source>
-        <translation>ファイル書き込みエラー。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1612"/>
         <source>File seek error.</source>
-        <translation>シーク エラー。</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1616"/>
         <source>Unknown error.</source>
-        <translation>不明なエラー。</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>日本語 (Japanese)</translation>
     </message>
diff --git a/oracle/translations/oracle_ko.ts b/oracle/translations/oracle_ko.ts
index c5c24583f..215eaa19e 100644
--- a/oracle/translations/oracle_ko.ts
+++ b/oracle/translations/oracle_ko.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>개요</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation type="unfinished"/>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>확장판 목록 파일 주소 입력</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>다운로드 주소:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>파일 위치:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>기본 주소로 복원</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>파일 선택...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>확장판 목록 파일 불러오기</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>잘못된 주소를 입력하셨습니다.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>다운로드 중 (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>확장판 목록 파일을 선택해 주세요.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>파일 &apos;%1&apos;을(를) 열 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>다운로드 중 (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>네트워크 오류 : %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>목록 파싱중</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>압축파일 열기 실패 : %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>압축 풀기 실패 : 압축 파일에 확장판 목록 파일 이외의 파일이 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>압축 풀기 실패 : %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>죄송합니다. 본 버전에서는 압축 파일을 지원하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>파일을 성공적으로 다운로드 하였으나 확장판 정보가 들어있지 않습니다.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>웹 주소:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>기본 주소로 복원</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>토큰 정보가 들어있는 더미 확장판</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>오라클</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation type="unfinished"/>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>아무 확장판도 불러오지 못했습니다.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>확장판 불러오기 완료</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>총 %1장의 카드 불러오기 완료</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1에서 %2장의 카드 불러옴</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>카드 데이터베이스 저장</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>카드 데이터베이스 XML 파일 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>파일을 %1에 저장 할 수 없습니다.</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -448,87 +396,87 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1175"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>압축파일 작업을 성공적으로 완료하였습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1176"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>zlib 라이브러리를 초기화하거나 불러올 수 없습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1177"/>
         <source>zlib library error.</source>
-        <translation>zlib 라이브러리 오류.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1178"/>
         <source>Unable to create or open file.</source>
-        <translation>파일을 만들거나 열 수 없습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1179"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
-        <translation>압축파일의 일부가 손상되었습니다. 몇몇 파일은 압축이 풀렸을 수도 있습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1180"/>
         <source>Corrupted archive.</source>
-        <translation>압축파일이 손상되었습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1181"/>
         <source>Wrong password.</source>
-        <translation>비밀번호가 틀렸습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1182"/>
         <source>No archive has been created yet.</source>
-        <translation>압축파일이 아직 생성되지 않았습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1183"/>
         <source>File or directory does not exist.</source>
-        <translation>파일이나 디렉토리가 존재하지 않습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1184"/>
         <source>File read error.</source>
-        <translation>파일 읽기 오류.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1185"/>
         <source>File write error.</source>
-        <translation>파일 쓰기 오류.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1186"/>
         <source>File seek error.</source>
-        <translation>파일 찾기 오류.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1187"/>
         <source>Unable to create a directory.</source>
-        <translation>디렉토리를 생성할 수 없었습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1188"/>
         <source>Invalid device.</source>
-        <translation>잘못된 장치입니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1189"/>
         <source>Invalid or incompatible zip archive.</source>
-        <translation>잘못되거나 지원하지 않는 압축파일입니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1190"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
-        <translation>헤더가 손상되었습니다. 압축 파일이 손상됐을 가능성이 있습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1194"/>
         <source>Unknown error.</source>
-        <translation>알 수 없는 오류.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -536,58 +484,58 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1604"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>압축파일 작업을 성공적으로 완료하였습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1605"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>zlib 라이브러리를 초기화하거나 불러올 수 없습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1606"/>
         <source>zlib library error.</source>
-        <translation>zlib 라이브러리 오류.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1607"/>
         <source>Unable to create or open file.</source>
-        <translation>파일을 만들거나 열 수 없습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1608"/>
         <source>No archive has been created yet.</source>
-        <translation>압축파일이 아직 생성되지 않았습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1609"/>
         <source>File or directory does not exist.</source>
-        <translation>파일이나 디렉토리가 존재하지 않습니다.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1610"/>
         <source>File read error.</source>
-        <translation>파일 읽기 오류.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1611"/>
         <source>File write error.</source>
-        <translation>파일 쓰기 오류.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1612"/>
         <source>File seek error.</source>
-        <translation>파일 찾기 오류.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1616"/>
         <source>Unknown error.</source>
-        <translation>알 수 없는 오류.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>한국어 (Korean)</translation>
     </message>
diff --git a/oracle/translations/oracle_nb.ts b/oracle/translations/oracle_nb.ts
index b40868cc1..856cffdbf 100644
--- a/oracle/translations/oracle_nb.ts
+++ b/oracle/translations/oracle_nb.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Introduksjon</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation type="unfinished"/>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Kilde valg</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>Nedlastings URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Lokal fil</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Gjenopprett standard URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Velg fil...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Last set fil...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>URL du anga er ikke gyldig.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Laster ned (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Vennligst velg en fil</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Kunne ikke åpme &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Laster ned (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Nettverks feil: %1</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Tolker fil.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Kunne ikke åpne Zip Arkiv: %1</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Zip ekstraksjon feilet: Zip arkivet inneholder ikke nøyaktig en fil</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Zip ekstraksjon feilet: %1</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Beklager, denne versjonen av Oracle støtter ikke Zip filer.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Filen ble hentet riktig, men den inneholder ikke noe set data</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>Nedlastings URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Gjenopprett standard URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Dummy sett som inneholder tokens</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Oracle importerer</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation type="unfinished"/>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Ingen set har blitt importert.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Set importert</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importering fullført: %1 kort.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 kort importert.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Lagre kort database.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; kort database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>Filen kunne ikke lagres til %1</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -448,87 +396,87 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1175"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>Zip operasjonen fullført.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1176"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>Kunne ikke initialisere eller laste zlib mappen.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1177"/>
         <source>zlib library error.</source>
-        <translation>Feil med zlib mappen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1178"/>
         <source>Unable to create or open file.</source>
-        <translation>Kunne ikke lage eller åpne fil.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1179"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
-        <translation>Delvis korrupt arkiv. Noen filer kunne ikke bli ekstraktert.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1180"/>
         <source>Corrupted archive.</source>
-        <translation>Korrupt arkiv.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1181"/>
         <source>Wrong password.</source>
-        <translation>Feil passord</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1182"/>
         <source>No archive has been created yet.</source>
-        <translation>Det har ikke blitt laget noe arkiv enda.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1183"/>
         <source>File or directory does not exist.</source>
-        <translation>Fil eller katalog eksisterer ikke.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1184"/>
         <source>File read error.</source>
-        <translation>Kunne ikke lese filen.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1185"/>
         <source>File write error.</source>
-        <translation>Kunne ikke skrive fil.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1186"/>
         <source>File seek error.</source>
-        <translation>Kunne ikke finne filen.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1187"/>
         <source>Unable to create a directory.</source>
-        <translation>Kunne ikke lage katalog.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1188"/>
         <source>Invalid device.</source>
-        <translation>Ugyldig apparat.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1189"/>
         <source>Invalid or incompatible zip archive.</source>
-        <translation>Ugyldig eller inkompatibelt zip akriv.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1190"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
-        <translation>Ukonsistente overskrifter. Arkivet kan være korrupt.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1194"/>
         <source>Unknown error.</source>
-        <translation>Ukjent feil.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -536,58 +484,58 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1604"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>Zip operasjonen fullført.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1605"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>Kunne ikke initialisere eller laste zlib biblioteket. </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1606"/>
         <source>zlib library error.</source>
-        <translation>Feil med zlib mappen </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1607"/>
         <source>Unable to create or open file.</source>
-        <translation>Kunne ikke lage eller åpne fil. </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1608"/>
         <source>No archive has been created yet.</source>
-        <translation>Det har ikke blitt laget noe arkiv enda. </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1609"/>
         <source>File or directory does not exist.</source>
-        <translation>Fil eller katalog eksisterer ikke. </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1610"/>
         <source>File read error.</source>
-        <translation>Kunne ikke lese filen. </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1611"/>
         <source>File write error.</source>
-        <translation>Kunne ikke skrive fil. </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1612"/>
         <source>File seek error.</source>
-        <translation>Kunne ikke finne filen. </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1616"/>
         <source>Unknown error.</source>
-        <translation>Ukjent feil. </translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Norsk Bokmål (Norwegian Bokmål)</translation>
     </message>
diff --git a/oracle/translations/oracle_nl.ts b/oracle/translations/oracle_nl.ts
index ed9a5fae9..606a3f324 100644
--- a/oracle/translations/oracle_nl.ts
+++ b/oracle/translations/oracle_nl.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Introductie</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>Deze wizard importeert de lijst met sets, kaarten en tokens die door Cockatrice zullen worden gebruikt.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>Interface taal:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Versie:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Bron selectie</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>Gelieve een compatibele bron te vermelden voor de lijst van sets en kaarten. U kunt een URL-adres opgeven dat wordt gedownload of een bestaand bestand van uw computer gebruiken.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Lokaal bestand</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Herstel standaard URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Bestand kiezen...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Bestand laden</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
-        <translation>Sets bestand (%1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>De ingevoerde URL is niet geldig.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Downloaden (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Gelieve een bestand te kiezen.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Bestand &apos;%1&apos; kan niet geopend worden.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Downloaden (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Netwerk fout: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Parsen van bestand</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>Xz extractie mislukt.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Sorry, deze versie van Oracle ondersteunt geen xz gecomprimeerde bestanden.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Zip archief kan niet geopend worden: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Uitpakken van Zip niet gelukt: het archief moet precies één bestand bevatten.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Uitpakken van Zip niet gelukt: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Sorry, deze versie van Oracle ondersteunt geen gecomprimeerde bestanden.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Lezen van gedownloade data mislukt.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Wilt u het ongecomprimeerde bestand downloaden?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Het bestand is succesvol binnengehaald, maar bevat geen set data.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>Opslaan spoiler database</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; spoiler database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>Spoilers import</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Gelieve een compatibele bron voor spoilergegevens te specificeren.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Herstel standaard URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>De spoiler database wordt op de volgende locatie opgeslagen:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Opslaan naar een aangepaste locatie (niet aanbevolen)</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>token database opslaan</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; token database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>Tokens import</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Gelieve een compatibele bron voor tokengegevens op te geven.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Herstel standaard URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>De token database wordt op de volgende locatie opgeslagen:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Opslaan naar een aangepaste locatie (niet aanbevolen)</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Token voorbeeldset</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Oracle importer</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>Klaar</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>De wizard is klaar.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>U kunt nu beginnen met het gebruik van Cockatrice met de nieuw bijgewerkte kaarten.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Als de kaartendatabases niet automatisch herladen, start dan de Cockatrice client opnieuw op.</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Er zijn geen sets geïmporteerd.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Sets geïmporteerd</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Een cockatrice database bestand van %1 MB is gedownload.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>De volgende sets zijn gevonden:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Druk op &quot;Opslaan&quot; om de geïmporteerde kaarten op te slaan in de Cockatrice database.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>De kaartendatabase wordt op de volgende locatie opgeslagen:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Opslaan naar een aangepaste locatie (niet aanbevolen)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>&amp;Opslaan</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Import klaar: %1 kaarten.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 kaarten geïmporteerd</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Kaartendatabase opslaan</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; kaart database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>Het bestand kon niet worden opgeslagen in %1</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
-        <translation>De ingevoerde URL is niet geldig:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>Downloaden (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>Downloaden (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>Netwerk fout: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>Het bestand kon niet worden opgeslagen naar %1</translation>
     </message>
@@ -587,7 +535,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Nederlands (Dutch)</translation>
     </message>
@@ -602,7 +550,7 @@
     <message>
         <location filename="src/main.cpp" line="63"/>
         <source>Run in no-confirm background mode</source>
-        <translation>Uitvoeren in achtergrondmodus zonder bevestiging</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/oracle/translations/oracle_pl.ts b/oracle/translations/oracle_pl.ts
index d5d632f70..6ccdfdd47 100644
--- a/oracle/translations/oracle_pl.ts
+++ b/oracle/translations/oracle_pl.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Wprowadzenie</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>Ten kreator zaimportuje listę dodatków, kart oraz tokenów które zostaną użyte przez Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>Język interfejsu:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Wersja:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Wybór źródła</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>Proszę podać źródło listy edycji i kart. Można podać adres URL, z którego zostanie pobrana, lub istniejący plik na komputerze.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>Pobierz URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Plik lokalny:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Przywróć domyślny URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Wybierz plik…</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Wczytaj listę dodatków</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>Podano nieprawidłowy URL.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Pobieranie (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Proszę wybrać plik.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Nie można otworzyć pliku &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Pobieranie (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Błąd sieci: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Analizowanie pliku</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>Rozpakowanie XZ nie udało się.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Przepraszamy, ta wersja Oracle nie obsługuje plików spakowanych w archiwum xz.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Otwieranie archiwum Zip zakończone niepowodzeniem: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Rozpakowanie pliku Zip nieudane: archiwum nie zawiera dokładnie jednego pliku.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Rozpakowanie Zip nieudane: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Przepraszamy, ta wersja Oracle nie obsługuje plików spakowanych w archiwum Zip.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Interpretacja pobranych danych nie udała się.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Czy chcesz zamiast tego pobrać plik nieskompresowany?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Plik został pobrany z powodzeniem, ale nie zawiera informacji o dodatkach.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>Zapisz bazę danych spoilerów.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; baza danych spoilerów (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>Import spoilerów</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Proszę wybrać kompatybilne źródło danych ze spoilerami.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>URL pobierania: </translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Przywróć domyślny URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>Baza danych spoilerów zostanie zapisana w tym miejscu:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Zapisz do niestandardowej ścieżki (niezalecane)</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>Zapisz bazę danych tokenów.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; baza danych tokenów (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>Import tokenów</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Proszę wybrać kompatybilne źródło danych z tokenami.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>Pobierz odnośnik:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Przywróć domyślny URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>Baza danych tokenów zostanie zapisana w tym miejscu:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Zapisz do niestandardowej ścieżki (niezalecane)</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Dodatek-atrapa, zawierający tokeny.</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Oracle – kreator importu</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>Zakończone</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>Kreator zakończył swoją pracę.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Możesz teraz korzystać z Cockatrice z nowo zaktualizowanymi kartami.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Jeżeli bazy kart nie przeładują się automatycznie, zrestartuj klienta Cockatrice.</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Nie zaimportowano żadnego dodatku.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Zaimportowane dodatki</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Baza danych Cockatrice mająca %1 MB została pobrana.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>Następujące dodatki zostały znalezione:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Kliknij &quot;Zapisz&quot; aby zapisać zaimportowane karty w bazie danych Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>Baza danych kart zostanie zapisana w tym miejscu:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Zapisz do niestandardowej ścieżki (niezalecane)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Import zakończony: %1 kart.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: zaimportowano %2 kart</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Zapisz bazę kart</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML, baza kart (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>Plik nie mógł zostać zapisany do %1</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>Pobieranie (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>Pobieranie (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>Błąd sieci: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>Plik nie mógł zostać zapisany do %1</translation>
     </message>
@@ -587,7 +535,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Polski (Polish)</translation>
     </message>
diff --git a/oracle/translations/oracle_pt.ts b/oracle/translations/oracle_pt.ts
index c578a0365..3f3422a8f 100644
--- a/oracle/translations/oracle_pt.ts
+++ b/oracle/translations/oracle_pt.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Introdução</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation type="unfinished"/>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Selecção da fonte</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>URL de download:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Ficheiro local:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>URL para repor definições de origem</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Escolher ficheiro...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Carregar ficheiro das edições</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>O URL fornecido não é válido.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>A efectuar download (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Por favor escolha um ficheiro.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Impossível abrir ficheiro &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>A efectuar download (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Erro da rede: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Ficheiro de análise</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Abrir archivo zip falhou: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Extracção do ZIP falhada: o arquivo ZIP não contem exactamente um ficheiro.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Extração do Zip falhada: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Pedimos desculpa, mas esta versão do Oracle não suporta ficheiros zipados.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>O ficheiro foi recuperado com sucesso, mas não contem nenhum dado sobre expansões.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>URL de download:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>URL para repor definições de origem</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Set básico contendo fichas</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Importar Oracle</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation type="unfinished"/>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Nenhuma expansão foi importada.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Edições importadas</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importação terminada: %1 cartas.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1. %2 cartas importadas</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Guardar base de dados das cartas</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; Base de dados de cartas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>O ficheiro não pode ser gravado em %1</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -448,87 +396,87 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1175"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>Operação ZIP completa com sucesso.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1176"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>Falha na inicialização ou carregamento da biblioteca zlib</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1177"/>
         <source>zlib library error.</source>
-        <translation>Erro da biblioteca zlib</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1178"/>
         <source>Unable to create or open file.</source>
-        <translation>Incapaz de criar ou abrir ficheiro</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1179"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
-        <translation>Arquivo parcialmente corrompido. Alguns ficheiros possivelmente serão extraídos.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1180"/>
         <source>Corrupted archive.</source>
-        <translation>Archivo corrompido.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1181"/>
         <source>Wrong password.</source>
-        <translation>Senha incorrecta.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1182"/>
         <source>No archive has been created yet.</source>
-        <translation>Ainda não foi criado nenhum arquivo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1183"/>
         <source>File or directory does not exist.</source>
-        <translation>O ficheiro ou directório não existe.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1184"/>
         <source>File read error.</source>
-        <translation>Erro na leitura do ficheiro.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1185"/>
         <source>File write error.</source>
-        <translation>erro na escrita do ficheiro.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1186"/>
         <source>File seek error.</source>
-        <translation>Erro na procura do ficheiro.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1187"/>
         <source>Unable to create a directory.</source>
-        <translation>Incapaz de criar directório.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1188"/>
         <source>Invalid device.</source>
-        <translation>Dispositivo inválido.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1189"/>
         <source>Invalid or incompatible zip archive.</source>
-        <translation>Arquivo ZIP inválido ou incompatível</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1190"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
-        <translation>Cabeçalhos inconsistentes. O arquivo pode estar corrompido,</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1194"/>
         <source>Unknown error.</source>
-        <translation>Erro desconhecido.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -536,58 +484,58 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1604"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>Operação ZIP completa com sucesso.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1605"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>Falha na inicialização ou carregamento da biblioteca zlib</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1606"/>
         <source>zlib library error.</source>
-        <translation>Erro da biblioteca zlib</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1607"/>
         <source>Unable to create or open file.</source>
-        <translation>Incapaz de criar ou abrir ficheiro</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1608"/>
         <source>No archive has been created yet.</source>
-        <translation>Ainda não foi criado nenhum arquivo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1609"/>
         <source>File or directory does not exist.</source>
-        <translation>O ficheiro ou directório não existe.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1610"/>
         <source>File read error.</source>
-        <translation>Erro na leitura do ficheiro.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1611"/>
         <source>File write error.</source>
-        <translation>erro na escrita do ficheiro.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1612"/>
         <source>File seek error.</source>
-        <translation>Erro na procura do ficheiro.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1616"/>
         <source>Unknown error.</source>
-        <translation>Erro desconhecido.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Português (Portuguese)</translation>
     </message>
diff --git a/oracle/translations/oracle_pt_BR.ts b/oracle/translations/oracle_pt_BR.ts
index 96a6382ec..566f018c9 100644
--- a/oracle/translations/oracle_pt_BR.ts
+++ b/oracle/translations/oracle_pt_BR.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Introdução</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>Esse recurso irá importar a lista de coleções, cartas e fichas que serão utilizadas pelo Cokatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>Idioma da interface:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Versão:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Selecione a origem</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>Por  favor especifique uma fonte compatível de expansões e cartas. Você pode especificar um endereço URL que será baixado ou usar um arquivo existente no seu computador.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>Endereço para download:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Arquivo local:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Restaurar URL padrão</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Escolha o arquivo...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Carregar arquivos de expansão</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation>Arquivo de expansões (%1)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>A URL escolhida não é valida</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Baixando (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Por favor, escolha um arquivo;</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Não pode abrir arquivo &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Baixando (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Erro na conexão com a internet: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Analisando arquivo</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>Extração de arquivo .xz falhou</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Desculpe, esta versão do Oracle não suporta arquivos comprimidos no formato .xz</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Falhou em abrir o arquivo Zip: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>A extração do arquivo ZIP falhou: o arquivo ZIP não contém exatamente um arquivo.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Extração do arquivo Zip falhou: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Desculpe, esta versão do Oracle não suporta arquivos compactados.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Falha ao interpretar dados baixados</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Gostaria de baixar os arquivos descomprimidos, em vez disso?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>O arquivo foi recebido com sucesso, mas não contém qualquer informação de expansão.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>Salvar base de dados de spoiler</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; base de dados de spoilers (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>Importar spoilers</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Por favor, selecione uma fonte compatível para os dados de spoilers.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>Endereço para download:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Restaurar URL padrão</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>A base de dados de spoilers será salva no seguinte diretório:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvar em diretório customizado (não recomendado)</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>Salvar base de dados de tokens</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; base de dados de token (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>Importar tokens</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Por favor especifique uma fonte compatível para os dados de tokens.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>Endereço para download:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Restaurar URL padrão</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>A base de dados de tokens será salva no seguinte diretório:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvar em diretório customizado (não recomendado)</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Esta expansão contém fichas.</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Importador Oracle</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>Finalizado</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>O recurso terminou.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Agora você pode começar a usar o Cockatrice com as novas cartas atualizadas.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Se a base de dados das cartas não for atualizada automaticamente, reinicie o cliente do Cockatrice.</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>O set não foi importado.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Expansões importadas</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Um arquivo de %1 MB de banco de dados do cockatrice foi baixado.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>As seguintes expansões foram encontradas:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Aperte &quot;Salvar&quot; para guardar as cartas importadas na base de dados do Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>A base de dados de cartas será salva no seguinte diretório:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvar em diretório customizado (não recomendado)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvar</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importação finalizada: %1 cartas.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 cartas importadas</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Carta salva no banco de dados</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; banco de dados de cartas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>O arquivo não pode ser salvo para %1</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>Baixando (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>Baixando (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>Erro de rede: %1</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>O arquivo não pode ser salvo em %1</translation>
     </message>
@@ -587,7 +535,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Português do Brasil (Brazilian Portuguese)</translation>
     </message>
diff --git a/oracle/translations/oracle_ru.ts b/oracle/translations/oracle_ru.ts
index e2ff5b5a0..5eae49b17 100644
--- a/oracle/translations/oracle_ru.ts
+++ b/oracle/translations/oracle_ru.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Введение</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>Эта программа импортирует перечень выпусков, карт и фишек, которые будут использоваться в Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
-        <translation>Язык интерфейса:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Версия</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Выбор источника</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
-        <translation>Пожалуйста, укажите источник для перечня сетов и карт. Вы можете использовать ссылку или уже существующий локальный файл.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>Ссылка на скачивание:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Локальный файл:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Восстановить ссылку по умолчанию</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Выбрать файл..</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Загрузить файл сетов</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
-        <translation>Файл (%1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>Предоставленная ссылка некорректна.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Загрузка (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Пожалуйста, выберите файл.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Не удалось открыть файл &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Загрузка (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Ошибка сети: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Ожидание файла</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
-        <translation>Ошибка распаковки архива</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
-        <translation>Данная версия Oracle не поддерживает архивы xz</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Не удалось загрузить zip-архив: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Ошибка распаковки: zip-архив содержит больше одного файла.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Ошибка распаковки zip-архива: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Данная версия Oracle не поддерживает zip-архивы.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
-        <translation>Ошибка в обработке загруженных данных</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
-        <translation>Хотите вместо этого загрузить новую несжатую копию?</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Файл успешно получен, но в нем не содержится данных о сетах.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
-        <translation>Сохранить базу карт</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="721"/>
-        <source>XML; spoiler database (*.xml)</source>
-        <translation>XML; база карт (*.xml)</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
+        <source>XML; spoiler database (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
-        <translation>Импорт карт</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
-        <translation>Укажите совместимый ресурс для импорта базы карт</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>Ссылка на скачивание:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Восстановить ссылку по умолчанию</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
+        <location filename="src/oraclewizard.cpp" line="805"/>
+        <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="739"/>
-        <source>The spoiler database will be saved at the following location:</source>
-        <translation>База карт будет сохранена в следующей директории:</translation>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>Ссылка на скачивание:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>Восстановить ссылку по умолчанию</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>Пример сета с фишками</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Импортер Oracle</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation type="unfinished"/>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>Не было импортировано ни одного сета.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>Импортировано сетов</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>Импорт завершен: %1 карт.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 карт импортировано</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>Сохранить базу карт</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>База карт (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>Не удалось сохранить файл в %1</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -448,87 +396,87 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1175"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>Распаковка успешно завершена.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1176"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>Не удалось загрузить библиотеку .zlib.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1177"/>
         <source>zlib library error.</source>
-        <translation>ошибка библиотеки .zlib</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1178"/>
         <source>Unable to create or open file.</source>
-        <translation>Не удалось создать или открыть файл.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1179"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
-        <translation>Архив частично поврежден. Некоторые файлы могут быть извлечены.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1180"/>
         <source>Corrupted archive.</source>
-        <translation>Архив поврежден.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1181"/>
         <source>Wrong password.</source>
-        <translation>Неверный пароль.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1182"/>
         <source>No archive has been created yet.</source>
-        <translation>Не было создано ни одного архива.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1183"/>
         <source>File or directory does not exist.</source>
-        <translation>Файл или директория не существуют.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1184"/>
         <source>File read error.</source>
-        <translation>Ошибка чтения файла.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1185"/>
         <source>File write error.</source>
-        <translation>Ошибка записи файла.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1186"/>
         <source>File seek error.</source>
-        <translation>Не удалось найти файл.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1187"/>
         <source>Unable to create a directory.</source>
-        <translation>Не удалось создать директорию.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1188"/>
         <source>Invalid device.</source>
-        <translation>Неверное устройство.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1189"/>
         <source>Invalid or incompatible zip archive.</source>
-        <translation>Неверный или несовместимый zip-архив.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1190"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
-        <translation>Несовместимые заголовки. Архив может быть поврежден.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1194"/>
         <source>Unknown error.</source>
-        <translation>Неизвестная ошибка.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -536,58 +484,58 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1604"/>
         <source>ZIP operation completed successfully.</source>
-        <translation>Распаковка успешно завершена.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1605"/>
         <source>Failed to initialize or load zlib library.</source>
-        <translation>Не удалось загрузить библиотеку .zlib.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1606"/>
         <source>zlib library error.</source>
-        <translation>ошибка библиотеки .zlib</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1607"/>
         <source>Unable to create or open file.</source>
-        <translation>Не удалось создать или открыть файл.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1608"/>
         <source>No archive has been created yet.</source>
-        <translation>Не было создано ни одного архива.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1609"/>
         <source>File or directory does not exist.</source>
-        <translation>Файл или директория не существуют.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1610"/>
         <source>File read error.</source>
-        <translation>Ошибка чтения файла.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1611"/>
         <source>File write error.</source>
-        <translation>Ошибка записи файла.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1612"/>
         <source>File seek error.</source>
-        <translation>Не удалось найти файл.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1616"/>
         <source>Unknown error.</source>
-        <translation>Неизвестная ошибка.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Русский (Russian)</translation>
     </message>
diff --git a/oracle/translations/oracle_sr.ts b/oracle/translations/oracle_sr.ts
index 04d48688a..8c2b576dd 100644
--- a/oracle/translations/oracle_sr.ts
+++ b/oracle/translations/oracle_sr.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Uvod</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation type="unfinished"/>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Odabir izvora</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>URL za preuzimanje:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Lokalni fajl:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Povrati uobičajeni URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Izaberite fajl...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>Dati URL nije važeći.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>Preuzimanje (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Molimo Vas izaberite fajl.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Nemoguće otvori fajl &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>Preuzimanje (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Mrežna greška: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Parsiranje fajla</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Neuspeh u otvaranju Zip arhive: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Izvinite, ova verzija Oracle-a ne podržava zip fajlove.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation type="unfinished"/>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>URL za preuzimanje:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation type="unfinished"/>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation type="unfinished"/>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation type="unfinished"/>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -478,7 +426,7 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1181"/>
         <source>Wrong password.</source>
-        <translation>Pogrešna lozinka.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1182"/>
@@ -493,17 +441,17 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1184"/>
         <source>File read error.</source>
-        <translation>Greška u čitanju fajla.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1185"/>
         <source>File write error.</source>
-        <translation>Greška u pisanju fajla.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1186"/>
         <source>File seek error.</source>
-        <translation>Greška u traženju fajla.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/unzip.cpp" line="1187"/>
@@ -528,7 +476,7 @@
     <message>
         <location filename="src/zip/unzip.cpp" line="1194"/>
         <source>Unknown error.</source>
-        <translation>Nepoznata greška.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -551,7 +499,7 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1607"/>
         <source>Unable to create or open file.</source>
-        <translation>Nemoguće napraviti ili otvoriti fajl.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1608"/>
@@ -566,28 +514,28 @@
     <message>
         <location filename="src/zip/zip.cpp" line="1610"/>
         <source>File read error.</source>
-        <translation>Greška u čitanju fajla.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1611"/>
         <source>File write error.</source>
-        <translation>Greška u pisanju fajla.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1612"/>
         <source>File seek error.</source>
-        <translation>Greška u traženju fajla.</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/zip/zip.cpp" line="1616"/>
         <source>Unknown error.</source>
-        <translation>Nepoznata greška.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Srpski (Serbian)</translation>
     </message>
diff --git a/oracle/translations/oracle_tr.ts b/oracle/translations/oracle_tr.ts
index 517f9248e..5b9dd2906 100644
--- a/oracle/translations/oracle_tr.ts
+++ b/oracle/translations/oracle_tr.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>Açıklama</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>Bu sihirbaz Cockatrice tarafından kullanılacak setlerin, kartların ve tokenlerin listesini içe aktaracaktır.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>Arayüz dili:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>Sürüm:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>Kaynak seçimi</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>Lütfen set ve kart listesi için uyumlu bir kaynak belirtin. İndirilecek bir URL adresi belirtebilir veya bilgisayarınızdaki mevcut bir dosyayı kullanabilirsiniz.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>İndirme Bağlantısı:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>Yerel dosya:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>Varsayılan URL&apos;yi geri yükle</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>Dosya seç...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>Set dosyasını yükle</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>Paylaşılan bağlantı geçerli değil.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>İndiriliyor (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>Lütfen dosya seçin.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Dosya açılamıyor &apos;1%&apos;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>İndiriliyor (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>Bağlantı hatası: %1</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>Dosya ayrıştırılıyor</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>Xz çıkarma işlemi başarısız oldu.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Maalesef, Oracle&apos;ın bu sürümü xz sıkıştırılmış dosyaları desteklemiyor.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Zip dosyası açılamadı: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Zip çıkarma işlemi başarısız oldu: Zip arşivi tam olarak bir dosya içermiyor.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Zip çıkarma işlemi başarısız oldu: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Maalesef, Oracle&apos;ın bu sürümü zip dosyalarını desteklemiyor.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>İndirilen veriler işlenemedi.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Bunun yerine sıkıştırılmamış dosyayı indirmek ister misiniz?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Dosya başarıyla alındı, ancak herhangi bir set verisi içermiyor.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>Spoiler veritabanını kaydet</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; spoiler veritabanı (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>Spoilers içe aktar</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Lütfen spoiler verileri için uyumlu bir kaynak belirtin.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>İndirme Bağlantısı:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>Varsayılan bağlantıyı geri yükle</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation type="unfinished"/>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation type="unfinished"/>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation type="unfinished"/>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -587,7 +535,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>Türkçe (Turkish)</translation>
     </message>
diff --git a/oracle/translations/oracle_yue.ts b/oracle/translations/oracle_yue.ts
index 13a621b9e..dded76f34 100644
--- a/oracle/translations/oracle_yue.ts
+++ b/oracle/translations/oracle_yue.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>介绍</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>此嚮導將會導入Cockatrice中用到的系列，卡牌和衍生物列表。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>介面語言:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>版本：</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>選擇來源</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>請選擇合適的牌組和卡片清單來源。您可以輸入下載URL或使用電腦中已有的檔案。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>本地檔案：</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>恢復常用URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>選擇檔案...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>载入牌组檔案</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>所提供的url無效.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>下載中 (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>請選擇檔案</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>不能開啟檔案 &apos;%1</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>下載中 (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>網路出錯: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>分析檔案中</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>xz解壓縮失敗.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>很抱歉,現前Oracle版本不支援xc壓縮檔案</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>未能開啟壓縮文件: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>解壓縮失敗:這壓縮文件擁有超過一個檔案.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>解壓縮失敗: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>很抱歉,現前Oracle版本不支援壓縮檔案.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>不能分析下載資料.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>你是否想另再下載未經壓縮的檔案?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>雖然檔案成功取回, 但是檔案並未含有任何牌組資料.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>儲存預覽資料庫</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML ; 預覽資料庫(*.XML)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>導入預覽卡牌</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>請指定預覽資料合用來源.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>恢復常用URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>預覽資料庫將會儲藏於以下位置</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>儲存到自訂路徑(不建議)</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>儲存衍生物資料庫</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; 衍生物資料庫 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>導入衍生物</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>請指定衍生物資料合用來源.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>恢復常用URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>衍生物資料庫將會儲藏於以下位置:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>儲存到自訂路徑(不建議)</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>包含衍生物的虚拟牌組</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Oracle導入器</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>嚮導程序工作完成</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Cockatrice已載入更新了卡牌, 現在已經可以使用.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>如果卡牌資料庫尚未能自動更新,請把cockatrice用戶端重新開啟.</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>沒有牌組被導入。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>已導入牌組</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>有%1MB大小的Cockatrice資料庫檔案已被下載</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>已找到以下牌组：</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>要將導入卡牌保存於Cockatrice資料庫內請按&quot;儲藏&quot;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>卡牌資料庫將被儲藏於以下位置</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>儲存到自訂路徑(不建議)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>&amp;儲存</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>導入過程完成:成功導入%1張卡牌.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1:成功導入%2張卡牌.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>儲存卡牌資料庫</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; 卡牌資料庫 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>檔案未能儲藏於%1。</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>下載中(0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>下載中 (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>網路出錯: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>檔案未能儲藏於%1</translation>
     </message>
@@ -587,7 +535,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation type="unfinished"/>
     </message>
diff --git a/oracle/translations/oracle_zh-Hans.ts b/oracle/translations/oracle_zh-Hans.ts
index ff19ab463..1087225f3 100644
--- a/oracle/translations/oracle_zh-Hans.ts
+++ b/oracle/translations/oracle_zh-Hans.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="127"/>
+        <location filename="src/oraclewizard.cpp" line="215"/>
         <source>Introduction</source>
         <translation>介绍</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="128"/>
+        <location filename="src/oraclewizard.cpp" line="216"/>
         <source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
         <translation>此向导将会导入Cockatrice中用到的系列，卡牌和衍生物列表.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="130"/>
+        <location filename="src/oraclewizard.cpp" line="218"/>
         <source>Interface language:</source>
         <translation>界面语言:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="131"/>
+        <location filename="src/oraclewizard.cpp" line="219"/>
         <source>Version:</source>
         <translation>版本：</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="200"/>
+        <location filename="src/oraclewizard.cpp" line="288"/>
         <source>Source selection</source>
         <translation>选择来源</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="201"/>
+        <location filename="src/oraclewizard.cpp" line="289"/>
         <source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
         <translation>请选择合适的牌组和卡片清单来源。您可以输入下载URL或使用电脑中已有的档案。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="205"/>
+        <location filename="src/oraclewizard.cpp" line="293"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="206"/>
+        <location filename="src/oraclewizard.cpp" line="294"/>
         <source>Local file:</source>
         <translation>本地文件：</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="207"/>
+        <location filename="src/oraclewizard.cpp" line="295"/>
         <source>Restore default URL</source>
         <translation>恢复常用URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="208"/>
+        <location filename="src/oraclewizard.cpp" line="296"/>
         <source>Choose file...</source>
         <translation>选择档案...</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="218"/>
+        <location filename="src/oraclewizard.cpp" line="306"/>
         <source>Load sets file</source>
         <translation>载入牌组档案</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="228"/>
+        <location filename="src/oraclewizard.cpp" line="316"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
-        <location filename="src/pages.cpp" line="277"/>
-        <location filename="src/pages.cpp" line="282"/>
-        <location filename="src/pages.cpp" line="354"/>
-        <location filename="src/pages.cpp" line="485"/>
-        <location filename="src/pages.cpp" line="498"/>
-        <location filename="src/pages.cpp" line="519"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="603"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="258"/>
+        <location filename="src/oraclewizard.cpp" line="346"/>
         <source>The provided URL is not valid.</source>
         <translation>所提供的url无效.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="262"/>
+        <location filename="src/oraclewizard.cpp" line="350"/>
         <source>Downloading (0MB)</source>
         <translation>下载中(0MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="277"/>
+        <location filename="src/oraclewizard.cpp" line="365"/>
         <source>Please choose a file.</source>
         <translation>请选择档案.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="282"/>
+        <location filename="src/oraclewizard.cpp" line="370"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>不能开启档案 &apos;%1</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="345"/>
+        <location filename="src/oraclewizard.cpp" line="429"/>
         <source>Downloading (%1MB)</source>
         <translation>下载中(%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="354"/>
+        <location filename="src/oraclewizard.cpp" line="438"/>
         <source>Network error: %1.</source>
         <translation>网路出错: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="392"/>
+        <location filename="src/oraclewizard.cpp" line="476"/>
         <source>Parsing file</source>
         <translation>分析档案中</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="414"/>
+        <location filename="src/oraclewizard.cpp" line="498"/>
         <source>Xz extraction failed.</source>
         <translation>xz解压缩失败。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="421"/>
+        <location filename="src/oraclewizard.cpp" line="505"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>很抱歉,现前Oracle版本不支援xc压缩档案</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="441"/>
+        <location filename="src/oraclewizard.cpp" line="525"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>未能开启压缩文件: %1.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="446"/>
+        <location filename="src/oraclewizard.cpp" line="530"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>解压缩失败:这压缩文件拥有超过一个档案.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="454"/>
+        <location filename="src/oraclewizard.cpp" line="538"/>
         <source>Zip extraction failed: %1.</source>
         <translation>解压缩失败：%1。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="462"/>
+        <location filename="src/oraclewizard.cpp" line="546"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>很抱歉,现前Oracle版本不支援压缩档案.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="485"/>
+        <location filename="src/oraclewizard.cpp" line="569"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>不能分析下载资料.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="498"/>
+        <location filename="src/oraclewizard.cpp" line="582"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>你是否想另再下载未经压缩的档案?</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="520"/>
+        <location filename="src/oraclewizard.cpp" line="604"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>虽然档案成功取回, 但是档案并未含有任何牌组资料.</translation>
     </message>
@@ -160,57 +160,42 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/pages.cpp" line="716"/>
+        <location filename="src/oraclewizard.cpp" line="790"/>
         <source>Save spoiler database</source>
         <translation>储存预览资料库</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="721"/>
+        <location filename="src/oraclewizard.cpp" line="795"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML ; 预览资料库(*.XML)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="726"/>
-        <source>spoiler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="731"/>
+        <location filename="src/oraclewizard.cpp" line="800"/>
         <source>Spoilers import</source>
         <translation>导入预览卡牌</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="732"/>
+        <location filename="src/oraclewizard.cpp" line="801"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>请指定预览资料合用来源.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="734"/>
+        <location filename="src/oraclewizard.cpp" line="803"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="735"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="736"/>
+        <location filename="src/oraclewizard.cpp" line="804"/>
         <source>Restore default URL</source>
         <translation>恢复常用URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="737"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="739"/>
+        <location filename="src/oraclewizard.cpp" line="805"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>预览资料库将会储藏于以下位置:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="741"/>
+        <location filename="src/oraclewizard.cpp" line="807"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>保存到自定义路径(不推荐)</translation>
     </message>
@@ -218,57 +203,42 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/pages.cpp" line="671"/>
+        <location filename="src/oraclewizard.cpp" line="753"/>
         <source>Save token database</source>
         <translation>储存衍生物资料库</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="676"/>
+        <location filename="src/oraclewizard.cpp" line="758"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; 衍生物资料库 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="681"/>
-        <source>tokens</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="686"/>
+        <location filename="src/oraclewizard.cpp" line="763"/>
         <source>Tokens import</source>
         <translation>导入衍生物</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="687"/>
+        <location filename="src/oraclewizard.cpp" line="764"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>请指定衍生物资料合用来源.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="689"/>
+        <location filename="src/oraclewizard.cpp" line="766"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="690"/>
-        <source>Local file:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="691"/>
+        <location filename="src/oraclewizard.cpp" line="767"/>
         <source>Restore default URL</source>
         <translation>恢复常用URL</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="692"/>
-        <source>Choose file...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pages.cpp" line="694"/>
+        <location filename="src/oraclewizard.cpp" line="768"/>
         <source>The token database will be saved at the following location:</source>
         <translation>衍生物资料库将会储藏于以下位置:</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="696"/>
+        <location filename="src/oraclewizard.cpp" line="770"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>保存到自定义路径(不推荐)</translation>
     </message>
@@ -276,7 +246,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="540"/>
+        <location filename="src/oracleimporter.cpp" line="465"/>
         <source>Dummy set containing tokens</source>
         <translation>包含衍生物的虚拟牌组</translation>
     </message>
@@ -284,7 +254,7 @@
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="97"/>
+        <location filename="src/oraclewizard.cpp" line="106"/>
         <source>Oracle Importer</source>
         <translation>Oracle导入器</translation>
     </message>
@@ -292,22 +262,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/pages.cpp" line="136"/>
+        <location filename="src/oraclewizard.cpp" line="224"/>
         <source>Finished</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="137"/>
+        <location filename="src/oraclewizard.cpp" line="225"/>
         <source>The wizard has finished.</source>
         <translation>向导程式工作完成.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="138"/>
+        <location filename="src/oraclewizard.cpp" line="226"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Cockatrice已载入更新了卡牌, 现在已经可以使用.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="139"/>
+        <location filename="src/oraclewizard.cpp" line="227"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>如果卡牌资料库尚未能自动更新,请把cockatrice用户端重新开启.</translation>
     </message>
@@ -315,73 +285,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/oraclewizard.cpp" line="646"/>
         <source>No set has been imported.</source>
         <translation>没有牌组被导入。</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="574"/>
+        <location filename="src/oraclewizard.cpp" line="656"/>
         <source>Sets imported</source>
         <translation>已导入牌组</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="576"/>
+        <location filename="src/oraclewizard.cpp" line="658"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>有%1MB大小的Cockatrice资料库档案已被下载.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="579"/>
+        <location filename="src/oraclewizard.cpp" line="661"/>
         <source>The following sets have been found:</source>
         <translation>已找到以下牌组：</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="582"/>
+        <location filename="src/oraclewizard.cpp" line="664"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>要将导入卡牌保存于Cockatrice资料库内请按&quot;储藏&quot;.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="583"/>
+        <location filename="src/oraclewizard.cpp" line="665"/>
         <source>The card database will be saved at the following location:</source>
         <translation>卡牌资料库将被储藏于以下位置</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="585"/>
+        <location filename="src/oraclewizard.cpp" line="667"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>保存到自定义路径(不推荐)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="587"/>
+        <location filename="src/oraclewizard.cpp" line="669"/>
         <source>&amp;Save</source>
         <translation>&amp;储存</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="593"/>
+        <location filename="src/oraclewizard.cpp" line="675"/>
         <source>Import finished: %1 cards.</source>
         <translation>导入过程完成:成功导入%1张卡牌.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="596"/>
+        <location filename="src/oraclewizard.cpp" line="678"/>
         <source>%1: %2 cards imported</source>
         <translation>%1:成功导入%2张卡牌.</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="605"/>
+        <location filename="src/oraclewizard.cpp" line="687"/>
         <source>Save card database</source>
         <translation>储存卡牌资料库</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="606"/>
+        <location filename="src/oraclewizard.cpp" line="688"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; 卡牌资料库 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/pages.cpp" line="638"/>
+        <location filename="src/oraclewizard.cpp" line="720"/>
         <source>The file could not be saved to %1</source>
         <translation>档案未能储藏于%1。</translation>
     </message>
@@ -389,56 +359,34 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="72"/>
-        <source>Load %1 file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="82"/>
-        <source>%1 file (%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <location filename="src/pagetemplates.cpp" line="168"/>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="73"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="115"/>
+        <location filename="src/pagetemplates.cpp" line="77"/>
         <source>Downloading (0MB)</source>
         <translation>下载中(0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="129"/>
-        <source>Please choose a file.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="134"/>
-        <source>Cannot open file &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/pagetemplates.cpp" line="159"/>
+        <location filename="src/pagetemplates.cpp" line="104"/>
         <source>Downloading (%1MB)</source>
         <translation>下载中(%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="113"/>
         <source>Network error: %1.</source>
         <translation>网路出错: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="224"/>
+        <location filename="src/pagetemplates.cpp" line="169"/>
         <source>The file could not be saved to %1</source>
         <translation>档案未能储藏于%1</translation>
     </message>
@@ -587,7 +535,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="22"/>
+        <location filename="src/oraclewizard.cpp" line="58"/>
         <source>English</source>
         <translation>简体中文 (Chinese Simplified)</translation>
     </message>
diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt
index 6e4191beb..2b345362a 100644
--- a/servatrice/CMakeLists.txt
+++ b/servatrice/CMakeLists.txt
@@ -96,18 +96,19 @@ set(DESKTOPDIR
     CACHE STRING "desktop file destination"
 )
 
+# Include directories
+include_directories(../common)
+include_directories(${PROTOBUF_INCLUDE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../common)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 # Build servatrice binary and link it
 add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESOURCES_RCC} ${servatrice_SOURCES})
 
 if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD")
-  target_link_libraries(
-    servatrice libcockatrice_deck_list libcockatrice_network_server_remote Threads::Threads ${SERVATRICE_QT_MODULES}
-    ${LIBEXECINFO_LIBRARY}
-  )
+  target_link_libraries(servatrice cockatrice_common Threads::Threads ${SERVATRICE_QT_MODULES} ${LIBEXECINFO_LIBRARY})
 else()
-  target_link_libraries(
-    servatrice libcockatrice_deck_list libcockatrice_network_server_remote Threads::Threads ${SERVATRICE_QT_MODULES}
-  )
+  target_link_libraries(servatrice cockatrice_common Threads::Threads ${SERVATRICE_QT_MODULES})
 endif()
 
 # install rules
diff --git a/servatrice/check_schema_version.sh b/servatrice/check_schema_version.sh
index c4aadf356..ed8772349 100755
--- a/servatrice/check_schema_version.sh
+++ b/servatrice/check_schema_version.sh
@@ -6,7 +6,6 @@ version_line="$(grep 'INSERT INTO cockatrice_schema_version' servatrice/servatri
 version_line="${version_line#*VALUES(}"
 declare -i schema_ver="${version_line%%)*}"
 
-# shellcheck disable=2012
 latest_migration="$(ls -1 servatrice/migrations/ | tail -n1)"
 xtoysql="${latest_migration#servatrice_}"
 xtoy="${xtoysql%.sql}"
@@ -24,7 +23,7 @@ if ((schema_ver != new_ver)); then
 fi
 
 expected_sql="^UPDATE cockatrice_schema_version SET version=${new_ver} WHERE version=${old_ver};$"
-if ! grep -q "$expected_sql" "servatrice/migrations/$latest_migration"; then
+if ! grep -q "$expected_sql" servatrice/migrations/$latest_migration; then
     echo "$latest_migration does not contain expected sql: $expected_sql"
     exit 1
 fi
diff --git a/servatrice/scripts/mk_pypb.sh b/servatrice/scripts/mk_pypb.sh
new file mode 100755
index 000000000..e11d237d2
--- /dev/null
+++ b/servatrice/scripts/mk_pypb.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+SRC_DIR=../../common/pb/
+DST_DIR=./pypb
+
+rm -rf "$DST_DIR"
+mkdir -p "$DST_DIR"
+protoc -I=$SRC_DIR --python_out=$DST_DIR $SRC_DIR/*.proto
+touch "$DST_DIR/__init__.py"
+
diff --git a/servatrice/src/email_parser.cpp b/servatrice/src/email_parser.cpp
index d8c30d852..ebb9cece3 100644
--- a/servatrice/src/email_parser.cpp
+++ b/servatrice/src/email_parser.cpp
@@ -25,7 +25,7 @@ QPair<QString, QString> EmailParser::parseEmailAddress(const QString &dirtyEmail
 
     // Trim out dots and pluses from Google/Gmail domains
     if (capturedEmailAddressDomain.toLower() == "gmail.com") {
-        // Remove all content after the first plus sign (as unnecessary with gmail)
+        // Remove all content after first plus sign (as unnecessary with gmail)
         // https://gmail.googleblog.com/2008/03/2-hidden-ways-to-get-more-from-your.html
         const auto firstPlusSign = capturedEmailUser.indexOf("+");
         if (firstPlusSign != -1) {
@@ -36,13 +36,6 @@ QPair<QString, QString> EmailParser::parseEmailAddress(const QString &dirtyEmail
         // https://gmail.googleblog.com/2008/03/2-hidden-ways-to-get-more-from-your.html
         capturedEmailUser.replace(".", "");
     }
-    // Trim out minuses from Yahoo domains
-    else if (capturedEmailAddressDomain.toLower() == "yahoo.com") {
-        const auto firstMinusSign = capturedEmailUser.indexOf("-");
-        if (firstMinusSign != -1) {
-            capturedEmailUser = capturedEmailUser.left(firstMinusSign);
-        }
-    }
 
     return {capturedEmailUser, capturedEmailAddressDomain};
 }
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index 692a0fdba..0c13bcd0f 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -1,28 +1,25 @@
 #include "isl_interface.h"
 
+#include "debug_pb_message.h"
+#include "get_pb_extension.h"
 #include "main.h"
+#include "pb/event_game_joined.pb.h"
+#include "pb/event_join_room.pb.h"
+#include "pb/event_leave_room.pb.h"
+#include "pb/event_list_games.pb.h"
+#include "pb/event_remove_messages.pb.h"
+#include "pb/event_room_say.pb.h"
+#include "pb/event_server_complete_list.pb.h"
+#include "pb/event_user_joined.pb.h"
+#include "pb/event_user_left.pb.h"
+#include "pb/event_user_message.pb.h"
+#include "pb/isl_message.pb.h"
+#include "server/server_protocolhandler.h"
+#include "server/server_room.h"
 #include "server_logger.h"
 
-#include <QLoggingCategory>
 #include <QSslSocket>
 #include <google/protobuf/descriptor.h>
-#include <libcockatrice/protocol/debug_pb_message.h>
-#include <libcockatrice/protocol/get_pb_extension.h>
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
-#include <libcockatrice/protocol/pb/event_join_room.pb.h>
-#include <libcockatrice/protocol/pb/event_leave_room.pb.h>
-#include <libcockatrice/protocol/pb/event_list_games.pb.h>
-#include <libcockatrice/protocol/pb/event_remove_messages.pb.h>
-#include <libcockatrice/protocol/pb/event_room_say.pb.h>
-#include <libcockatrice/protocol/pb/event_server_complete_list.pb.h>
-#include <libcockatrice/protocol/pb/event_user_joined.pb.h>
-#include <libcockatrice/protocol/pb/event_user_left.pb.h>
-#include <libcockatrice/protocol/pb/event_user_message.pb.h>
-#include <libcockatrice/protocol/pb/isl_message.pb.h>
-#include <server_protocolhandler.h>
-#include <server_room.h>
-
-inline Q_LOGGING_CATEGORY(IslInterfaceLog, "isl_interface");
 
 void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privateKey)
 {
@@ -115,12 +112,15 @@ void IslInterface::initServer()
 
     socket->startServerEncryption();
     if (!socket->waitForEncrypted(5000)) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
         QList<QSslError> sslErrors(socket->sslHandshakeErrors());
-        if (sslErrors.isEmpty()) {
-            qCDebug(IslInterfaceLog) << "SSL handshake timeout, terminating connection";
-        } else {
-            qCWarning(IslInterfaceLog) << "SSL errors:" << sslErrors;
-        }
+#else
+        QList<QSslError> sslErrors(socket->sslErrors());
+#endif
+        if (sslErrors.isEmpty())
+            qDebug() << "[ISL] SSL handshake timeout, terminating connection";
+        else
+            qDebug() << "[ISL] SSL errors:" << sslErrors;
         deleteLater();
         return;
     }
@@ -161,7 +161,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);
@@ -184,28 +184,31 @@ 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)) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
         QList<QSslError> sslErrors(socket->sslHandshakeErrors());
-        if (sslErrors.isEmpty()) {
-            qCDebug(IslInterfaceLog) << "SSL handshake timeout, terminating connection";
-        } else {
-            qCWarning(IslInterfaceLog) << "SSL errors:" << sslErrors;
-        }
+#else
+        QList<QSslError> sslErrors(socket->sslErrors());
+#endif
+        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;
     }
@@ -247,21 +250,17 @@ void IslInterface::readClient()
             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);
@@ -279,10 +278,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);
@@ -380,7 +376,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);
@@ -394,8 +390,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;
             }
 
@@ -443,7 +438,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/isl_interface.h b/servatrice/src/isl_interface.h
index 27e5b8293..19310e07b 100644
--- a/servatrice/src/isl_interface.h
+++ b/servatrice/src/isl_interface.h
@@ -1,13 +1,13 @@
 #ifndef ISL_INTERFACE_H
 #define ISL_INTERFACE_H
 
+#include "pb/serverinfo_game.pb.h"
+#include "pb/serverinfo_room.pb.h"
+#include "pb/serverinfo_user.pb.h"
 #include "servatrice.h"
 
 #include <QSslCertificate>
 #include <QWaitCondition>
-#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class Servatrice;
 class QSslSocket;
diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp
index b1294a04c..c8950d973 100644
--- a/servatrice/src/main.cpp
+++ b/servatrice/src/main.cpp
@@ -18,6 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "passwordhasher.h"
+#include "rng_sfmt.h"
 #include "servatrice.h"
 #include "server_logger.h"
 #include "settingscache.h"
@@ -32,8 +34,6 @@
 #include <QMetaType>
 #include <QtGlobal>
 #include <iostream>
-#include <libcockatrice/rng/rng_sfmt.h>
-#include <libcockatrice/utility/passwordhasher.h>
 
 RNG_Abstract *rng;
 ServerLogger *logger;
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 410bf4ed9..e1288a627 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -19,11 +19,17 @@
  ***************************************************************************/
 #include "servatrice.h"
 
+#include "deck_list.h"
 #include "email_parser.h"
+#include "featureset.h"
 #include "isl_interface.h"
 #include "main.h"
+#include "pb/event_connection_closed.pb.h"
+#include "pb/event_server_message.pb.h"
+#include "pb/event_server_shutdown.pb.h"
 #include "servatrice_connection_pool.h"
 #include "servatrice_database_interface.h"
+#include "server/server_room.h"
 #include "server_logger.h"
 #include "serversocketinterface.h"
 #include "settingscache.h"
@@ -39,12 +45,6 @@
 #include <QTimer>
 #include <QUrl>
 #include <iostream>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/protocol/featureset.h>
-#include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
-#include <libcockatrice/protocol/pb/event_server_message.pb.h>
-#include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
-#include <server_room.h>
 
 Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server,
                                              int _numberPools,
@@ -254,8 +254,13 @@ bool Servatrice::initServer()
     qDebug() << "Accept registered users only:" << getRegOnlyServerEnabled();
     qDebug() << "Registration enabled:" << getRegistrationEnabled();
     if (getRegistrationEnabled()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         QStringList emailBlackListFilters = getEmailBlackList().split(",", Qt::SkipEmptyParts);
         QStringList emailWhiteListFilters = getEmailWhiteList().split(",", Qt::SkipEmptyParts);
+#else
+        QStringList emailBlackListFilters = getEmailBlackList().split(",", QString::SkipEmptyParts);
+        QStringList emailWhiteListFilters = getEmailWhiteList().split(",", QString::SkipEmptyParts);
+#endif
         qDebug() << "Email blacklist:" << emailBlackListFilters;
         qDebug() << "Email whitelist:" << emailWhiteListFilters;
         qDebug() << "Require email address to register:" << getRequireEmailForRegistrationEnabled();
@@ -559,7 +564,11 @@ void Servatrice::setRequiredFeatures(const QString &featureList)
     FeatureSet features;
     serverRequiredFeatureList.clear();
     features.initalizeFeatureList(serverRequiredFeatureList);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QStringList listReqFeatures = featureList.split(",", Qt::SkipEmptyParts);
+#else
+    QStringList listReqFeatures = featureList.split(",", QString::SkipEmptyParts);
+#endif
     if (!listReqFeatures.isEmpty())
         for (const QString &reqFeature : listReqFeatures) {
             features.enableRequiredFeature(serverRequiredFeatureList, reqFeature);
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index 62fb382cb..c68327c60 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -20,6 +20,8 @@
 #ifndef SERVATRICE_H
 #define SERVATRICE_H
 
+#include "server/server.h"
+
 #include <QHostAddress>
 #include <QMetaType>
 #include <QMutex>
@@ -29,7 +31,6 @@
 #include <QSslKey>
 #include <QTcpServer>
 #include <QWebSocketServer>
-#include <server.h>
 #include <utility>
 
 Q_DECLARE_METATYPE(QSqlDatabase)
diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp
index bce3542e8..289059846 100644
--- a/servatrice/src/servatrice_database_interface.cpp
+++ b/servatrice/src/servatrice_database_interface.cpp
@@ -1,5 +1,8 @@
 #include "servatrice_database_interface.h"
 
+#include "deck_list.h"
+#include "passwordhasher.h"
+#include "pb/game_replay.pb.h"
 #include "servatrice.h"
 #include "serversocketinterface.h"
 #include "settingscache.h"
@@ -7,14 +10,8 @@
 #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)
@@ -59,16 +56,17 @@ bool Servatrice_DatabaseInterface::openDatabase()
         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;
     }
 
@@ -76,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;
     }
 
@@ -113,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();
@@ -142,7 +145,7 @@ bool Servatrice_DatabaseInterface::execSqlQuery(QSqlQuery *query)
     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;
@@ -160,7 +163,11 @@ bool Servatrice_DatabaseInterface::usernameIsValid(const QString &user, QString
     bool allowPunctuationPrefix = settingsCache->value("users/allowpunctuationprefix", false).toBool();
     QString allowedPunctuation = settingsCache->value("users/allowedpunctuation", "_").toString();
     QString disallowedWordsStr = settingsCache->value("users/disallowedwords", "").toString();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QStringList disallowedWords = disallowedWordsStr.split(",", Qt::SkipEmptyParts);
+#else
+    QStringList disallowedWords = disallowedWordsStr.split(",", QString::SkipEmptyParts);
+#endif
     disallowedWords.removeDuplicates();
     QVariant displayDisallowedWords = settingsCache->value("users/displaydisallowedwords");
     QString disallowedRegExpStr;
@@ -249,8 +256,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;
     }
 
@@ -268,8 +274,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;
     }
 
@@ -282,8 +288,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;
             }
 
@@ -325,7 +330,7 @@ AuthenticationResult Servatrice_DatabaseInterface::checkUserPassword(Server_Prot
                 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;
             }
 
@@ -333,7 +338,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;
@@ -343,14 +348,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;
             }
         }
@@ -368,7 +373,7 @@ bool Servatrice_DatabaseInterface::checkUserIsBanned(const QString &ipAddress,
         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;
     }
 
@@ -399,7 +404,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;
     }
 
@@ -409,7 +414,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;
         }
     }
@@ -427,7 +432,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;
     }
 
@@ -437,7 +442,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;
         }
     }
@@ -463,7 +468,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;
     }
 
@@ -473,7 +478,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;
         }
     }
@@ -864,17 +869,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);
     }
 
     {
@@ -1021,7 +1021,7 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user,
     passwordQuery->bindValue(":name", user);
 
     if (!execSqlQuery(passwordQuery)) {
-        qCWarning(DatabaseInterfaceLog) << "Change password denied: SQL error";
+        qDebug("Change password denied: SQL error");
         return false;
     }
 
@@ -1088,7 +1088,7 @@ void Servatrice_DatabaseInterface::updateUsersLastLoginData(const QString &userN
     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;
     }
 
@@ -1137,7 +1137,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;
     }
 
@@ -1172,7 +1172,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;
     }
 
@@ -1193,7 +1193,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,7 +1300,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;
     }
 
@@ -1328,8 +1328,7 @@ int Servatrice_DatabaseInterface::checkNumberOfUserAccounts(const QString &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;
     }
 
diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h
index 68080404c..9eb492953 100644
--- a/servatrice/src/servatrice_database_interface.h
+++ b/servatrice/src/servatrice_database_interface.h
@@ -1,14 +1,13 @@
 #ifndef SERVATRICE_DATABASE_INTERFACE_H
 #define SERVATRICE_DATABASE_INTERFACE_H
 
+#include "server/server.h"
+#include "server/server_database_interface.h"
+
 #include <QChar>
 #include <QHash>
 #include <QObject>
 #include <QSqlDatabase>
-#include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_warning.pb.h>
-#include <server.h>
-#include <server_database_interface.h>
 
 #define DATABASE_SCHEMA_VERSION 34
 
diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp
index de0befacb..9e40ac7b4 100644
--- a/servatrice/src/server_logger.cpp
+++ b/servatrice/src/server_logger.cpp
@@ -57,7 +57,11 @@ void ServerLogger::logMessage(const QString &message, void *caller)
     // filter out all log entries based on values in configuration file
     bool shouldWeWriteLog = settingsCache->value("server/writelog", 1).toBool();
     QString logFilters = settingsCache->value("server/logfilters").toString();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QStringList listlogFilters = logFilters.split(",", Qt::SkipEmptyParts);
+#else
+    QStringList listlogFilters = logFilters.split(",", QString::SkipEmptyParts);
+#endif
     bool shouldWeSkipLine = false;
 
     if (!shouldWeWriteLog)
@@ -116,9 +120,7 @@ void ServerLogger::rotateLogs()
     flushBuffer();
 
     logFile->close();
-    if (!logFile->open(QIODevice::Append)) {
-        std::cerr << "ERROR: Failed to open log file for writing!" << std::endl;
-    }
+    logFile->open(QIODevice::Append);
 }
 
 QFile *ServerLogger::logFile;
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index 41e61ddec..9b08ee330 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -20,74 +20,69 @@
 
 #include "serversocketinterface.h"
 
+#include "deck_list.h"
 #include "email_parser.h"
 #include "main.h"
+#include "pb/command_deck_del.pb.h"
+#include "pb/command_deck_del_dir.pb.h"
+#include "pb/command_deck_download.pb.h"
+#include "pb/command_deck_list.pb.h"
+#include "pb/command_deck_new_dir.pb.h"
+#include "pb/command_deck_upload.pb.h"
+#include "pb/command_replay_delete_match.pb.h"
+#include "pb/command_replay_download.pb.h"
+#include "pb/command_replay_get_code.pb.h"
+#include "pb/command_replay_list.pb.h"
+#include "pb/command_replay_modify_match.pb.h"
+#include "pb/command_replay_submit_code.pb.h"
+#include "pb/commands.pb.h"
+#include "pb/event_add_to_list.pb.h"
+#include "pb/event_connection_closed.pb.h"
+#include "pb/event_notify_user.pb.h"
+#include "pb/event_remove_from_list.pb.h"
+#include "pb/event_replay_added.pb.h"
+#include "pb/event_server_identification.pb.h"
+#include "pb/event_server_message.pb.h"
+#include "pb/event_user_message.pb.h"
+#include "pb/response_ban_history.pb.h"
+#include "pb/response_deck_download.pb.h"
+#include "pb/response_deck_list.pb.h"
+#include "pb/response_deck_upload.pb.h"
+#include "pb/response_forgotpasswordrequest.pb.h"
+#include "pb/response_get_admin_notes.pb.h"
+#include "pb/response_password_salt.pb.h"
+#include "pb/response_register.pb.h"
+#include "pb/response_replay_download.pb.h"
+#include "pb/response_replay_get_code.pb.h"
+#include "pb/response_replay_list.pb.h"
+#include "pb/response_viewlog_history.pb.h"
+#include "pb/response_warn_history.pb.h"
+#include "pb/response_warn_list.pb.h"
+#include "pb/serverinfo_ban.pb.h"
+#include "pb/serverinfo_chat_message.pb.h"
+#include "pb/serverinfo_deckstorage.pb.h"
+#include "pb/serverinfo_replay.pb.h"
+#include "pb/serverinfo_user.pb.h"
 #include "servatrice.h"
 #include "servatrice_database_interface.h"
+#include "server/game/server_player.h"
+#include "server/server_response_containers.h"
+#include "server/server_room.h"
 #include "server_logger.h"
 #include "settingscache.h"
+#include "trice_limits.h"
 #include "version_string.h"
 
 #include <QDateTime>
 #include <QDebug>
 #include <QHostAddress>
-#include <QLoggingCategory>
 #include <QRegularExpression>
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QString>
-#include <game/server_player.h>
 #include <iostream>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/protocol/pb/command_deck_del.pb.h>
-#include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
-#include <libcockatrice/protocol/pb/command_deck_download.pb.h>
-#include <libcockatrice/protocol/pb/command_deck_list.pb.h>
-#include <libcockatrice/protocol/pb/command_deck_new_dir.pb.h>
-#include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
-#include <libcockatrice/protocol/pb/command_replay_delete_match.pb.h>
-#include <libcockatrice/protocol/pb/command_replay_download.pb.h>
-#include <libcockatrice/protocol/pb/command_replay_get_code.pb.h>
-#include <libcockatrice/protocol/pb/command_replay_list.pb.h>
-#include <libcockatrice/protocol/pb/command_replay_modify_match.pb.h>
-#include <libcockatrice/protocol/pb/command_replay_submit_code.pb.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
-#include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
-#include <libcockatrice/protocol/pb/event_notify_user.pb.h>
-#include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
-#include <libcockatrice/protocol/pb/event_replay_added.pb.h>
-#include <libcockatrice/protocol/pb/event_server_identification.pb.h>
-#include <libcockatrice/protocol/pb/event_server_message.pb.h>
-#include <libcockatrice/protocol/pb/event_user_message.pb.h>
-#include <libcockatrice/protocol/pb/response_ban_history.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_download.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_list.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_upload.pb.h>
-#include <libcockatrice/protocol/pb/response_forgotpasswordrequest.pb.h>
-#include <libcockatrice/protocol/pb/response_get_admin_notes.pb.h>
-#include <libcockatrice/protocol/pb/response_password_salt.pb.h>
-#include <libcockatrice/protocol/pb/response_register.pb.h>
-#include <libcockatrice/protocol/pb/response_replay_download.pb.h>
-#include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
-#include <libcockatrice/protocol/pb/response_replay_list.pb.h>
-#include <libcockatrice/protocol/pb/response_viewlog_history.pb.h>
-#include <libcockatrice/protocol/pb/response_warn_history.pb.h>
-#include <libcockatrice/protocol/pb/response_warn_list.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_ban.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/utility/trice_limits.h>
-#include <server_response_containers.h>
-#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,
@@ -135,7 +130,7 @@ bool AbstractServerSocketInterface::initSession()
 
 void AbstractServerSocketInterface::catchSocketError(QAbstractSocket::SocketError socketError)
 {
-    qCWarning(AbstractServerSocketInterfaceLog) << "Socket error:" << socketError;
+    qDebug() << "Socket error:" << socketError;
 
     prepareDestroy();
 }
@@ -977,7 +972,11 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetWarnList(const Comma
     Response_WarnList *re = new Response_WarnList;
 
     QString officialWarnings = settingsCache->value("server/officialwarnings").toString();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QStringList warningsList = officialWarnings.split(",", Qt::SkipEmptyParts);
+#else
+    QStringList warningsList = officialWarnings.split(",", QString::SkipEmptyParts);
+#endif
     for (const QString &warning : warningsList) {
         re->add_warning(warning.toStdString());
     }
@@ -1105,7 +1104,7 @@ 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();
@@ -1157,7 +1156,7 @@ 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) {
@@ -1173,8 +1172,13 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
     const auto parsedEmailParts = EmailParser::parseEmailAddress(nameFromStdString(cmd.email()));
     const auto emailUser = parsedEmailParts.first;
     const auto emailDomain = parsedEmailParts.second;
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     const QStringList emailBlackListFilters = emailBlackList.split(",", Qt::SkipEmptyParts);
     const QStringList emailWhiteListFilters = emailWhiteList.split(",", Qt::SkipEmptyParts);
+#else
+    const QStringList emailBlackListFilters = emailBlackList.split(",", QString::SkipEmptyParts);
+    const QStringList emailWhiteListFilters = emailWhiteList.split(",", QString::SkipEmptyParts);
+#endif
 
     bool requireEmailForRegistration = settingsCache->value("registration/requireemail", true).toBool();
     if (requireEmailForRegistration && emailUser.isEmpty()) {
@@ -1203,7 +1207,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
         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())
@@ -1294,7 +1298,7 @@ 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)");
@@ -1326,7 +1330,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
 
 bool AbstractServerSocketInterface::tooManyRegistrationAttempts(const QString &ipAddress)
 {
-    //! \todo implement
+    // TODO: implement
     Q_UNUSED(ipAddress);
     return false;
 }
@@ -1342,7 +1346,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdActivateAccount(const C
         clientId = "UNKNOWN";
 
     if (sqlInterface->activateUser(userName, token)) {
-        qCDebug(AbstractServerSocketInterfaceLog) << "Accepted activation for user" << userName;
+        qDebug() << "Accepted activation for user" << userName;
 
         if (servatrice->getEnableRegistrationAudit())
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
@@ -1350,7 +1354,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdActivateAccount(const C
 
         return Response::RespActivationAccepted;
     } else {
-        qCDebug(AbstractServerSocketInterfaceLog) << "Failed activation for user" << userName;
+        qDebug() << "Failed activation for user" << userName;
 
         if (servatrice->getEnableRegistrationAudit())
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
@@ -1498,7 +1502,7 @@ 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())
@@ -1580,7 +1584,7 @@ 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())
@@ -1631,7 +1635,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()) {
@@ -1926,8 +1930,13 @@ TcpServerSocketInterface::TcpServerSocketInterface(Servatrice *_server,
     socket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
     connect(socket, SIGNAL(readyRead()), this, SLOT(readClient()));
     connect(socket, SIGNAL(disconnected()), this, SLOT(catchSocketDisconnected()));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
     connect(socket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), this,
             SLOT(catchSocketError(QAbstractSocket::SocketError)));
+#else
+    connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
+            SLOT(catchSocketError(QAbstractSocket::SocketError)));
+#endif
 }
 
 TcpServerSocketInterface::~TcpServerSocketInterface()
@@ -1976,16 +1985,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();
@@ -2018,48 +2024,41 @@ void TcpServerSocketInterface::readClient()
             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());
 }
 
@@ -2110,8 +2109,10 @@ void WebsocketServerSocketInterface::initConnection(void *_socket)
     }
     socket = (QWebSocket *)_socket;
     socket->setParent(this);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
     // https://bugreports.qt.io/browse/QTBUG-70693
     socket->setMaxAllowedIncomingMessageSize(1500000); // 1.5MB
+#endif
 
     address = socket->peerAddress();
 
@@ -2187,12 +2188,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();
@@ -2208,37 +2206,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/serversocketinterface.h b/servatrice/src/serversocketinterface.h
index e10aa0dde..9f15e62b8 100644
--- a/servatrice/src/serversocketinterface.h
+++ b/servatrice/src/serversocketinterface.h
@@ -20,11 +20,12 @@
 #ifndef SERVERSOCKETINTERFACE_H
 #define SERVERSOCKETINTERFACE_H
 
+#include "server/server_protocolhandler.h"
+
 #include <QHostAddress>
 #include <QMutex>
 #include <QTcpSocket>
 #include <QWebSocket>
-#include <server_protocolhandler.h>
 
 class Servatrice;
 class Servatrice_DatabaseInterface;
@@ -146,9 +147,7 @@ public:
     AbstractServerSocketInterface(Servatrice *_server,
                                   Servatrice_DatabaseInterface *_databaseInterface,
                                   QObject *parent = 0);
-    ~AbstractServerSocketInterface()
-    {
-    }
+    ~AbstractServerSocketInterface(){};
     bool initSession();
 
     virtual QHostAddress getPeerAddress() const = 0;
@@ -177,7 +176,7 @@ public:
     QString getConnectionType() const
     {
         return "tcp";
-    }
+    };
 
 private:
     QTcpSocket *socket;
@@ -190,11 +189,11 @@ protected:
     void writeToSocket(QByteArray &data)
     {
         socket->write(data);
-    }
+    };
     void flushSocket()
     {
         socket->flush();
-    }
+    };
     void initSessionDeprecated();
     bool initTcpSession();
 protected slots:
@@ -224,7 +223,7 @@ public:
     QString getConnectionType() const
     {
         return "websocket";
-    }
+    };
 
 private:
     QWebSocket *socket;
@@ -234,11 +233,11 @@ protected:
     void writeToSocket(QByteArray &data)
     {
         socket->sendBinaryMessage(data);
-    }
+    };
     void flushSocket()
     {
         socket->flush();
-    }
+    };
     bool initWebsocketSession();
 protected slots:
     void binaryMessageReceived(const QByteArray &message);
diff --git a/servatrice/src/settingscache.cpp b/servatrice/src/settingscache.cpp
index f6dcd5fc8..14bfaebfb 100644
--- a/servatrice/src/settingscache.cpp
+++ b/servatrice/src/settingscache.cpp
@@ -11,7 +11,12 @@ SettingsCache::SettingsCache(const QString &fileName, QSettings::Format format,
     // first, figure out if we are running in portable mode
     isPortableBuild = QFile::exists(qApp->applicationDirPath() + "/portable.dat");
 
-    QStringList disallowedRegExpStr = value("users/disallowedregexp", "").toString().split(",", Qt::SkipEmptyParts);
+    QStringList disallowedRegExpStr =
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+        value("users/disallowedregexp", "").toString().split(",", Qt::SkipEmptyParts);
+#else
+        value("users/disallowedregexp", "").toString().split(",", QString::SkipEmptyParts);
+#endif
     disallowedRegExpStr.removeDuplicates();
     for (const QString &regExpStr : disallowedRegExpStr) {
         disallowedRegExp.append(QRegularExpression(QString("\\A%1\\z").arg(regExpStr)));
diff --git a/servatrice/src/signalhandler.h b/servatrice/src/signalhandler.h
index bf8d9e52a..af9f40cb8 100644
--- a/servatrice/src/signalhandler.h
+++ b/servatrice/src/signalhandler.h
@@ -10,9 +10,7 @@ class SignalHandler : public QObject
     Q_OBJECT
 public:
     SignalHandler(QObject *parent = 0);
-    ~SignalHandler()
-    {
-    }
+    ~SignalHandler(){};
     static void sigHupHandler(int /* sig */);
     static void sigSegvHandler(int sig);
 
diff --git a/servatrice/src/smtp/qxtmailmessage.cpp b/servatrice/src/smtp/qxtmailmessage.cpp
index ff376c1a9..ca003d875 100644
--- a/servatrice/src/smtp/qxtmailmessage.cpp
+++ b/servatrice/src/smtp/qxtmailmessage.cpp
@@ -27,8 +27,9 @@
  * \class QxtMailMessage
  * \inmodule QxtNetwork
  * \brief The QxtMailMessage class encapsulates an e-mail according to RFC 2822 and related specifications
+ * TODO: {implicitshared}
  */
-//! \todo {implicitshared}
+
 #include "qxtmailmessage.h"
 
 #include "qxtmail_p.h"
diff --git a/servatrice/src/smtp/qxtsmtp.cpp b/servatrice/src/smtp/qxtsmtp.cpp
index 6326b101d..951492d7a 100644
--- a/servatrice/src/smtp/qxtsmtp.cpp
+++ b/servatrice/src/smtp/qxtsmtp.cpp
@@ -334,7 +334,11 @@ void QxtSmtpPrivate::authenticate()
         state = Authenticated;
         emit qxt_p().authenticated();
     } else {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         QStringList auth = extensions["AUTH"].toUpper().split(' ', Qt::SkipEmptyParts);
+#else
+        QStringList auth = extensions["AUTH"].toUpper().split(' ', QString::SkipEmptyParts);
+#endif
         if (auth.contains("CRAM-MD5")) {
             authCramMD5();
         } else if (auth.contains("PLAIN")) {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fffaf1bda..f6b2d12d2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,22 +1,16 @@
-# NOTE: Qt modules for tests are defined centrally in cmake/FindQtRuntime.cmake (the _TEST_NEEDED variable).
-# If a new test needs additional Qt modules, add them there — not in individual test CMakeLists.txt files.
 enable_testing()
-
 add_test(NAME dummy_test COMMAND dummy_test)
 add_test(NAME expression_test COMMAND expression_test)
+
 add_test(NAME test_age_formatting COMMAND test_age_formatting)
 add_test(NAME password_hash_test COMMAND password_hash_test)
 
-add_test(NAME deck_hash_performance_test COMMAND deck_hash_performance_test)
-set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 5)
-
 # Find GTest
 
 add_executable(dummy_test dummy_test.cpp)
 add_executable(expression_test expression_test.cpp)
 add_executable(test_age_formatting test_age_formatting.cpp)
 add_executable(password_hash_test password_hash_test.cpp)
-add_executable(deck_hash_performance_test deck_hash_performance_test.cpp)
 
 find_package(GTest)
 
@@ -47,23 +41,14 @@ if(NOT GTEST_FOUND)
   add_dependencies(expression_test gtest)
   add_dependencies(test_age_formatting gtest)
   add_dependencies(password_hash_test gtest)
-  add_dependencies(deck_hash_performance_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(expression_test cockatrice_common 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}
-)
-target_link_libraries(
-  deck_hash_performance_test libcockatrice_deck_list libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES}
-  ${TEST_QT_MODULES}
-)
+target_link_libraries(password_hash_test cockatrice_common 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
deleted file mode 100644
index 889e92eaa..000000000
--- a/tests/card_zone_algorithms/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-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/logic)
-
-target_link_libraries(
-  card_zone_algorithms_test
-  PRIVATE Threads::Threads
-  PRIVATE ${GTEST_BOTH_LIBRARIES}
-)
-
-add_test(NAME card_zone_algorithms_test COMMAND card_zone_algorithms_test)
-
-if(NOT GTEST_FOUND)
-  add_dependencies(card_zone_algorithms_test gtest)
-endif()
diff --git a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
deleted file mode 100644
index cc098cae9..000000000
--- a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-#include "card_zone_algorithms.h"
-
-#include <gtest/gtest.h>
-#include <vector>
-
-struct MockCardRef
-{
-};
-
-struct MockCard
-{
-    int idSet = 0;
-    bool idWasCalled = false;
-    MockCardRef cardRefSet{};
-    bool cardRefWasCalled = false;
-    bool resetStateCalled = false;
-    bool resetStateKeepAnnotations = false;
-    bool visibleSet = false;
-
-    void setId(int id)
-    {
-        idSet = id;
-        idWasCalled = true;
-    }
-
-    void setCardRef(MockCardRef ref)
-    {
-        cardRefSet = ref;
-        cardRefWasCalled = true;
-    }
-
-    void resetState(bool keepAnnotations)
-    {
-        resetStateCalled = true;
-        resetStateKeepAnnotations = keepAnnotations;
-    }
-
-    void setVisible(bool visible)
-    {
-        visibleSet = visible;
-    }
-};
-
-class MockCardList
-{
-    std::vector<MockCard *> cards;
-    bool contentsKnown;
-
-public:
-    explicit MockCardList(bool _contentsKnown) : contentsKnown(_contentsKnown)
-    {
-    }
-
-    int size() const
-    {
-        return static_cast<int>(cards.size());
-    }
-
-    void insert(int index, MockCard *card)
-    {
-        cards.insert(cards.begin() + index, card);
-    }
-
-    bool getContentsKnown() const
-    {
-        return contentsKnown;
-    }
-
-    MockCard *at(int index) const
-    {
-        return cards.at(index);
-    }
-};
-
-class AddCardAlgorithmTest : public ::testing::Test
-{
-protected:
-    MockCardList knownList{true};
-    MockCardList unknownList{false};
-};
-
-TEST_F(AddCardAlgorithmTest, NegativeIndexClampsToEnd)
-{
-    MockCard a, b;
-    CardZoneAlgorithms::addCardToList(knownList, &a, 0, false);
-    CardZoneAlgorithms::addCardToList(knownList, &b, -1, false);
-
-    EXPECT_EQ(knownList.at(0), &a);
-    EXPECT_EQ(knownList.at(1), &b);
-    EXPECT_EQ(knownList.size(), 2);
-}
-
-TEST_F(AddCardAlgorithmTest, IndexBeyondSizeClampsToEnd)
-{
-    MockCard a, b;
-    CardZoneAlgorithms::addCardToList(knownList, &a, 0, false);
-    CardZoneAlgorithms::addCardToList(knownList, &b, 999, false);
-
-    EXPECT_EQ(knownList.at(0), &a);
-    EXPECT_EQ(knownList.at(1), &b);
-    EXPECT_EQ(knownList.size(), 2);
-}
-
-TEST_F(AddCardAlgorithmTest, ContentsKnownPreservesIdentity)
-{
-    MockCard card;
-    CardZoneAlgorithms::addCardToList(knownList, &card, 0, false);
-
-    EXPECT_FALSE(card.idWasCalled);
-    EXPECT_FALSE(card.cardRefWasCalled);
-    EXPECT_TRUE(card.visibleSet);
-}
-
-TEST_F(AddCardAlgorithmTest, ContentsUnknownClearsIdentity)
-{
-    MockCard card;
-    CardZoneAlgorithms::addCardToList(unknownList, &card, 0, false);
-
-    EXPECT_TRUE(card.idWasCalled);
-    EXPECT_EQ(card.idSet, -1);
-    EXPECT_TRUE(card.cardRefWasCalled);
-}
-
-TEST_F(AddCardAlgorithmTest, MidListInsertionPreservesOrder)
-{
-    MockCard a, b, c;
-    CardZoneAlgorithms::addCardToList(knownList, &a, 0, false);
-    CardZoneAlgorithms::addCardToList(knownList, &b, 1, false);
-    CardZoneAlgorithms::addCardToList(knownList, &c, 1, false);
-
-    EXPECT_EQ(knownList.size(), 3);
-    EXPECT_EQ(knownList.at(0), &a);
-    EXPECT_EQ(knownList.at(1), &c);
-    EXPECT_EQ(knownList.at(2), &b);
-}
-
-TEST_F(AddCardAlgorithmTest, KeepAnnotationsFalsePassedThrough)
-{
-    MockCard card;
-    CardZoneAlgorithms::addCardToList(knownList, &card, 0, false);
-
-    EXPECT_TRUE(card.resetStateCalled);
-    EXPECT_FALSE(card.resetStateKeepAnnotations);
-}
-
-TEST_F(AddCardAlgorithmTest, KeepAnnotationsTruePassedThrough)
-{
-    MockCard card;
-    CardZoneAlgorithms::addCardToList(knownList, &card, 0, true);
-
-    EXPECT_TRUE(card.resetStateCalled);
-    EXPECT_TRUE(card.resetStateKeepAnnotations);
-}
-
-int main(int argc, char **argv)
-{
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}
diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt
index 987e23cd5..9797d27cf 100644
--- a/tests/carddatabase/CMakeLists.txt
+++ b/tests/carddatabase/CMakeLists.txt
@@ -1,51 +1,62 @@
-cmake_minimum_required(VERSION 3.16)
-project(CardDatabaseTests VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-
-# ------------------------
-# Definitions
-# ------------------------
 add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
 
-# ------------------------
-# Card Database Test
-# ------------------------
-add_executable(carddatabase_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} carddatabase_test.cpp mocks.cpp)
-
-target_link_libraries(
-  carddatabase_test
-  PRIVATE libcockatrice_card
-  PRIVATE Threads::Threads
-  PRIVATE ${GTEST_BOTH_LIBRARIES}
-  PRIVATE ${TEST_QT_MODULES}
+set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network
+                    ${COCKATRICE_QT_VERSION_NAME}::Widgets ${COCKATRICE_QT_VERSION_NAME}::Svg
 )
 
-add_test(NAME carddatabase_test COMMAND carddatabase_test)
-
-# ------------------------
-# Filter String Test
-# (guard must match the condition for libcockatrice_filters in the root CMakeLists.txt)
-# ------------------------
-if(WITH_ORACLE OR WITH_CLIENT)
-  add_executable(filter_string_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} filter_string_test.cpp mocks.cpp)
-
-  target_link_libraries(
-    filter_string_test
-    PRIVATE libcockatrice_filters
-    PRIVATE Threads::Threads
-    PRIVATE ${GTEST_BOTH_LIBRARIES}
-    PRIVATE ${TEST_QT_MODULES}
+if(Qt6_FOUND)
+  qt6_wrap_cpp(
+    MOCKS_SOURCES ../../cockatrice/src/settings/cache_settings.h ../../cockatrice/src/settings/card_database_settings.h
+  )
+elseif(Qt5_FOUND)
+  qt5_wrap_cpp(
+    MOCKS_SOURCES ../../cockatrice/src/settings/cache_settings.h ../../cockatrice/src/settings/card_database_settings.h
   )
-
-  add_test(NAME filter_string_test COMMAND filter_string_test)
-
-  if(NOT GTEST_FOUND)
-    add_dependencies(filter_string_test gtest)
-  endif()
 endif()
 
-# ------------------------
-# Dependencies on gtest
-# ------------------------
+add_executable(
+  carddatabase_test
+  ${MOCKS_SOURCES}
+  ${VERSION_STRING_CPP}
+  ../../cockatrice/src/card/card_info.cpp
+  ../../cockatrice/src/card/exact_card.cpp
+  ../../cockatrice/src/database/card_database.cpp
+  ../../cockatrice/src/database/card_database_loader.cpp
+  ../../cockatrice/src/database/card_database_querier.cpp
+  ../../cockatrice/src/database/parser/card_database_parser.cpp
+  ../../cockatrice/src/database/parser/cockatrice_xml_3.cpp
+  ../../cockatrice/src/database/parser/cockatrice_xml_4.cpp
+  ../../cockatrice/src/settings/settings_manager.cpp
+  carddatabase_test.cpp
+  mocks.cpp
+)
+add_executable(
+  filter_string_test
+  ${MOCKS_SOURCES}
+  ${VERSION_STRING_CPP}
+  ../../cockatrice/src/card/card_info.cpp
+  ../../cockatrice/src/card/exact_card.cpp
+  ../../cockatrice/src/database/card_database.cpp
+  ../../cockatrice/src/database/card_database_loader.cpp
+  ../../cockatrice/src/database/card_database_querier.cpp
+  ../../cockatrice/src/database/card_database_manager.cpp
+  ../../cockatrice/src/database/parser/card_database_parser.cpp
+  ../../cockatrice/src/database/parser/cockatrice_xml_3.cpp
+  ../../cockatrice/src/database/parser/cockatrice_xml_4.cpp
+  ../../cockatrice/src/filters/filter_card.cpp
+  ../../cockatrice/src/filters/filter_string.cpp
+  ../../cockatrice/src/filters/filter_tree.cpp
+  ../../cockatrice/src/settings/settings_manager.cpp
+  filter_string_test.cpp
+  mocks.cpp
+)
 if(NOT GTEST_FOUND)
   add_dependencies(carddatabase_test gtest)
+  add_dependencies(filter_string_test gtest)
 endif()
+
+target_link_libraries(carddatabase_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+target_link_libraries(filter_string_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+
+add_test(NAME carddatabase_test COMMAND carddatabase_test)
+add_test(NAME filter_string_test COMMAND filter_string_test)
diff --git a/tests/carddatabase/carddatabase_test.cpp b/tests/carddatabase/carddatabase_test.cpp
index 3fa0e3834..f3de287e5 100644
--- a/tests/carddatabase/carddatabase_test.cpp
+++ b/tests/carddatabase/carddatabase_test.cpp
@@ -1,17 +1,14 @@
 #include "mocks.h"
-#include "test_card_database_path_provider.h"
 
 #include "gtest/gtest.h"
-#include <libcockatrice/interfaces/noop_card_preference_provider.h>
-#include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 
 namespace
 {
 
 TEST(CardDatabaseTest, LoadXml)
 {
-    CardDatabase *db = new CardDatabase(nullptr, new NoopCardPreferenceProvider(), new TestCardDatabasePathProvider(),
-                                        new NoopCardSetPriorityController());
+    settingsCache = new SettingsCache;
+    CardDatabase *db = new CardDatabase;
 
     // ensure the card database is empty at start
     ASSERT_EQ(0, db->getCardList().size()) << "Cards not empty at start";
diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp
index c6d68be1f..3055bb76a 100644
--- a/tests/carddatabase/filter_string_test.cpp
+++ b/tests/carddatabase/filter_string_test.cpp
@@ -1,10 +1,8 @@
+#include "../../cockatrice/src/database/card_database_manager.h"
+#include "../../cockatrice/src/filters/filter_string.h"
 #include "mocks.h"
-#include "test_card_database_path_provider.h"
 
 #include "gtest/gtest.h"
-#include <libcockatrice/filters/filter_string.h>
-#include <libcockatrice/interfaces/noop_card_preference_provider.h>
-#include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
 
 #define QUERY(name, card, query, match)                                                                                \
     TEST_F(CardQuery, name)                                                                                            \
@@ -20,14 +18,10 @@ class CardQuery : public ::testing::Test
 protected:
     void SetUp() override
     {
-        CardDatabase *db = new CardDatabase(nullptr, new NoopCardPreferenceProvider(),
-                                            new TestCardDatabasePathProvider(), new NoopCardSetPriorityController());
-        db->loadCardDatabases();
-
-        cat = db->query()->getCardBySimpleName("Cat");
-        notDeadAfterAll = db->query()->getCardBySimpleName("Not Dead");
-        truth = db->query()->getCardBySimpleName("Truth");
-        doctor = db->query()->getCardBySimpleName("Doctor");
+        cat = CardDatabaseManager::query()->getCardBySimpleName("Cat");
+        notDeadAfterAll = CardDatabaseManager::query()->getCardBySimpleName("Not Dead");
+        truth = CardDatabaseManager::query()->getCardBySimpleName("Truth");
+        doctor = CardDatabaseManager::query()->getCardBySimpleName("Doctor");
     }
     // void TearDown() override {}
 
@@ -71,12 +65,13 @@ QUERY(Color2, cat, "c:gw", true)
 QUERY(Color3, cat, "c!g", true)
 QUERY(Color4, cat, "c!gw", false)
 
-QUERY(BracketNextToUnquotedString, cat, "(o:woof OR o:meow)", true)
-
 } // namespace
 
 int main(int argc, char **argv)
 {
+    settingsCache = new SettingsCache;
+    CardDatabaseManager::getInstance()->loadCardDatabases();
+
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }
diff --git a/tests/carddatabase/mocks.cpp b/tests/carddatabase/mocks.cpp
index 5568ac84f..08d82d765 100644
--- a/tests/carddatabase/mocks.cpp
+++ b/tests/carddatabase/mocks.cpp
@@ -1,6 +1,464 @@
 
 #include "mocks.h"
 
-void CardPictureLoader::clearPixmapCache(CardInfoPtr /* card */)
+CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent)
+    : SettingsManager(settingPath + "cardDatabase.ini", parent)
 {
 }
+void CardDatabaseSettings::setSortKey(QString /* shortName */, unsigned int /* sortKey */)
+{
+}
+void CardDatabaseSettings::setEnabled(QString /* shortName */, bool /* enabled */)
+{
+}
+void CardDatabaseSettings::setIsKnown(QString /* shortName */, bool /* isknown */)
+{
+}
+unsigned int CardDatabaseSettings::getSortKey(QString /* shortName */)
+{
+    return 0;
+};
+bool CardDatabaseSettings::isEnabled(QString /* shortName */)
+{
+    return true;
+};
+bool CardDatabaseSettings::isKnown(QString /* shortName */)
+{
+    return true;
+};
+
+QString SettingsCache::getDataPath()
+{
+    return "";
+}
+QString SettingsCache::getSettingsPath()
+{
+    return "";
+}
+void SettingsCache::translateLegacySettings()
+{
+}
+QString SettingsCache::getSafeConfigPath(QString /* configEntry */, QString defaultPath) const
+{
+    return defaultPath;
+}
+QString SettingsCache::getSafeConfigFilePath(QString /* configEntry */, QString defaultPath) const
+{
+    return defaultPath;
+}
+SettingsCache::SettingsCache()
+    : settings{new QSettings("global.ini", QSettings::IniFormat, this)}, shortcutsSettings{nullptr},
+      cardDatabaseSettings{new CardDatabaseSettings("", this)}, serversSettings{nullptr}, messageSettings{nullptr},
+      gameFiltersSettings{nullptr}, layoutsSettings{nullptr}, downloadSettings{nullptr},
+      cardDatabasePath{QString("%1/cards.xml").arg(CARDDB_DATADIR)},
+      customCardDatabasePath{QString("%1/customsets/").arg(CARDDB_DATADIR)},
+      spoilerDatabasePath{QString("%1/spoiler.xml").arg(CARDDB_DATADIR)},
+      tokenDatabasePath{QString("%1/tokens.xml").arg(CARDDB_DATADIR)}
+{
+}
+void SettingsCache::setUseTearOffMenus(bool /* _useTearOffMenus */)
+{
+}
+void SettingsCache::setCardViewInitialRowsMax(int /* _cardViewInitialRowsMax */)
+{
+}
+void SettingsCache::setCardViewExpandedRowsMax(int /* value */)
+{
+}
+void SettingsCache::setCloseEmptyCardView(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setFocusCardViewSearchBar(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setKnownMissingFeatures(const QString & /* _knownMissingFeatures */)
+{
+}
+void SettingsCache::setCardInfoViewMode(const int /* _viewMode */)
+{
+}
+void SettingsCache::setHighlightWords(const QString & /* _highlightWords */)
+{
+}
+void SettingsCache::setMasterVolume(int /* _masterVolume */)
+{
+}
+void SettingsCache::setLeftJustified(const QT_STATE_CHANGED_T /* _leftJustified */)
+{
+}
+void SettingsCache::setCardScaling(const QT_STATE_CHANGED_T /* _scaleCards */)
+{
+}
+void SettingsCache::setStackCardOverlapPercent(const int /* _verticalCardOverlapPercent */)
+{
+}
+void SettingsCache::setShowMessagePopups(const QT_STATE_CHANGED_T /* _showMessagePopups */)
+{
+}
+void SettingsCache::setShowMentionPopups(const QT_STATE_CHANGED_T /* _showMentionPopus */)
+{
+}
+void SettingsCache::setRoomHistory(const QT_STATE_CHANGED_T /* _roomHistory */)
+{
+}
+void SettingsCache::setLang(const QString & /* _lang */)
+{
+}
+void SettingsCache::setShowTipsOnStartup(bool /* _showTipsOnStartup */)
+{
+}
+void SettingsCache::setSeenTips(const QList<int> & /* _seenTips */)
+{
+}
+void SettingsCache::setDeckPath(const QString & /* _deckPath */)
+{
+}
+void SettingsCache::setFiltersPath(const QString & /*_filtersPath */)
+{
+}
+void SettingsCache::setReplaysPath(const QString & /* _replaysPath */)
+{
+}
+void SettingsCache::setThemesPath(const QString & /* _themesPath */)
+{
+}
+void SettingsCache::setPicsPath(const QString & /* _picsPath */)
+{
+}
+void SettingsCache::setCardDatabasePath(const QString & /* _cardDatabasePath */)
+{
+}
+void SettingsCache::setCustomCardDatabasePath(const QString & /* _customCardDatabasePath */)
+{
+}
+void SettingsCache::setSpoilerDatabasePath(const QString & /* _spoilerDatabasePath */)
+{
+}
+void SettingsCache::setTokenDatabasePath(const QString & /* _tokenDatabasePath */)
+{
+}
+void SettingsCache::setThemeName(const QString & /* _themeName */)
+{
+}
+void SettingsCache::setHomeTabBackgroundSource(const QString & /* _backgroundSource */)
+{
+}
+void SettingsCache::setHomeTabBackgroundShuffleFrequency(int /* frequency */)
+{
+}
+void SettingsCache::setTabVisualDeckStorageOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabServerOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabAccountOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabDeckStorageOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabReplaysOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabAdminOpen(bool /*value*/)
+{
+}
+void SettingsCache::setTabLogOpen(bool /*value*/)
+{
+}
+void SettingsCache::setPicDownload(QT_STATE_CHANGED_T /* _picDownload */)
+{
+}
+void SettingsCache::setShowStatusBar(bool /* value */)
+{
+}
+void SettingsCache::setNotificationsEnabled(QT_STATE_CHANGED_T /* _notificationsEnabled */)
+{
+}
+void SettingsCache::setSpectatorNotificationsEnabled(QT_STATE_CHANGED_T /* _spectatorNotificationsEnabled */)
+{
+}
+void SettingsCache::setBuddyConnectNotificationsEnabled(QT_STATE_CHANGED_T /* _buddyConnectNotificationsEnabled */)
+{
+}
+void SettingsCache::setDoubleClickToPlay(QT_STATE_CHANGED_T /* _doubleClickToPlay */)
+{
+}
+void SettingsCache::setClickPlaysAllSelected(QT_STATE_CHANGED_T /* _clickPlaysAllSelected */)
+{
+}
+void SettingsCache::setPlayToStack(QT_STATE_CHANGED_T /* _playToStack */)
+{
+}
+void SettingsCache::setStartingHandSize(int /* _startingHandSize */)
+{
+}
+void SettingsCache::setAnnotateTokens(QT_STATE_CHANGED_T /* _annotateTokens */)
+{
+}
+void SettingsCache::setTabGameSplitterSizes(const QByteArray & /* _tabGameSplitterSizes */)
+{
+}
+void SettingsCache::setShowShortcuts(QT_STATE_CHANGED_T /* _showShortcuts */)
+{
+}
+void SettingsCache::setDisplayCardNames(QT_STATE_CHANGED_T /* _displayCardNames */)
+{
+}
+void SettingsCache::setOverrideAllCardArtWithPersonalPreference(QT_STATE_CHANGED_T /* _overrideAllCardArt */)
+{
+}
+void SettingsCache::setBumpSetsWithCardsInDeckToTop(QT_STATE_CHANGED_T /* _bumpSetsWithCardsInDeckToTop */)
+{
+}
+void SettingsCache::setPrintingSelectorSortOrder(int /* _printingSelectorSortOrder */)
+{
+}
+void SettingsCache::setPrintingSelectorCardSize(int /* _printingSelectorCardSize */)
+{
+}
+void SettingsCache::setIncludeRebalancedCards(bool /* _includeRebalancedCards */)
+{
+}
+void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T /* _navigationButtonsVisible */)
+{
+}
+void SettingsCache::setDeckEditorBannerCardComboBoxVisible(
+    QT_STATE_CHANGED_T /* _deckEditorBannerCardComboBoxVisible */)
+{
+}
+void SettingsCache::setDeckEditorTagsWidgetVisible(QT_STATE_CHANGED_T /* _deckEditorTagsWidgetVisible */)
+{
+}
+void SettingsCache::setVisualDeckStorageSortingOrder(int /* _visualDeckStorageSortingOrder */)
+{
+}
+void SettingsCache::setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T /* _showTags */)
+{
+}
+void SettingsCache::setVisualDeckStorageDefaultTagsList(QStringList /* _defaultTagsList */)
+{
+}
+void SettingsCache::setVisualDeckStorageSearchFolderNames(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setVisualDeckStorageShowBannerCardComboBox(QT_STATE_CHANGED_T /* _showBannerCardComboBox */)
+{
+}
+void SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T /* _showTags */)
+{
+}
+void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */)
+{
+}
+void SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities(
+    QT_STATE_CHANGED_T /* _visualDeckStorageDrawUnusedColorIdentities */)
+{
+}
+void SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity(
+    int /* _visualDeckStorageUnusedColorIdentitiesOpacity */)
+{
+}
+void SettingsCache::setVisualDeckStorageTooltipType(int /* value */)
+{
+}
+void SettingsCache::setVisualDeckStoragePromptForConversion(bool /* _visualDeckStoragePromptForConversion */)
+{
+}
+void SettingsCache::setVisualDeckStorageAlwaysConvert(bool /* _visualDeckStorageAlwaysConvert */)
+{
+}
+void SettingsCache::setVisualDeckStorageInGame(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setDefaultDeckEditorType(int /* value */)
+{
+}
+void SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T /* _enabled */)
+{
+}
+void SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int /* _amount */)
+{
+}
+void SettingsCache::setVisualDeckEditorSampleHandSize(int /* _amount */)
+{
+}
+void SettingsCache::setHorizontalHand(QT_STATE_CHANGED_T /* _horizontalHand */)
+{
+}
+void SettingsCache::setInvertVerticalCoordinate(QT_STATE_CHANGED_T /* _invertVerticalCoordinate */)
+{
+}
+void SettingsCache::setMinPlayersForMultiColumnLayout(int /* _minPlayersForMultiColumnLayout */)
+{
+}
+void SettingsCache::setTapAnimation(QT_STATE_CHANGED_T /* _tapAnimation */)
+{
+}
+void SettingsCache::setAutoRotateSidewaysLayoutCards(QT_STATE_CHANGED_T /* _autoRotateSidewaysLayoutCards */)
+{
+}
+void SettingsCache::setOpenDeckInNewTab(QT_STATE_CHANGED_T /* _openDeckInNewTab */)
+{
+}
+void SettingsCache::setRewindBufferingMs(int /* _rewindBufferingMs */)
+{
+}
+void SettingsCache::setChatMention(QT_STATE_CHANGED_T /* _chatMention */)
+{
+}
+void SettingsCache::setChatMentionCompleter(const QT_STATE_CHANGED_T /* _enableMentionCompleter */)
+{
+}
+void SettingsCache::setChatMentionForeground(QT_STATE_CHANGED_T /* _chatMentionForeground */)
+{
+}
+void SettingsCache::setChatHighlightForeground(QT_STATE_CHANGED_T /* _chatHighlightForeground */)
+{
+}
+void SettingsCache::setChatMentionColor(const QString & /* _chatMentionColor */)
+{
+}
+void SettingsCache::setChatHighlightColor(const QString & /* _chatHighlightColor */)
+{
+}
+void SettingsCache::setZoneViewGroupByIndex(int /* _zoneViewGroupByIndex */)
+{
+}
+void SettingsCache::setZoneViewSortByIndex(int /* _zoneViewSortByIndex */)
+{
+}
+void SettingsCache::setZoneViewPileView(QT_STATE_CHANGED_T /* _zoneViewPileView */)
+{
+}
+void SettingsCache::setSoundEnabled(QT_STATE_CHANGED_T /* _soundEnabled */)
+{
+}
+void SettingsCache::setSoundThemeName(const QString & /* _soundThemeName */)
+{
+}
+void SettingsCache::setIgnoreUnregisteredUsers(QT_STATE_CHANGED_T /* _ignoreUnregisteredUsers */)
+{
+}
+void SettingsCache::setIgnoreUnregisteredUserMessages(QT_STATE_CHANGED_T /* _ignoreUnregisteredUserMessages */)
+{
+}
+void SettingsCache::setMainWindowGeometry(const QByteArray & /* _mainWindowGeometry */)
+{
+}
+void SettingsCache::setTokenDialogGeometry(const QByteArray & /* _tokenDialogGeometry */)
+{
+}
+void SettingsCache::setSetsDialogGeometry(const QByteArray & /* _setsDialogGeometry */)
+{
+}
+void SettingsCache::setPixmapCacheSize(const int /* _pixmapCacheSize */)
+{
+}
+void SettingsCache::setNetworkCacheSizeInMB(const int /* _networkCacheSize */)
+{
+}
+void SettingsCache::setNetworkRedirectCacheTtl(const int /* _redirectCacheTtl */)
+{
+}
+void SettingsCache::setClientID(const QString & /* _clientID */)
+{
+}
+void SettingsCache::setClientVersion(const QString & /* _clientVersion */)
+{
+}
+QStringList SettingsCache::getCountries() const
+{
+    static QStringList countries = QStringList() << "us";
+    return countries;
+}
+void SettingsCache::setGameDescription(const QString /* _gameDescription */)
+{
+}
+void SettingsCache::setMaxPlayers(const int /* _maxPlayers */)
+{
+}
+void SettingsCache::setGameTypes(const QString /* _gameTypes */)
+{
+}
+void SettingsCache::setOnlyBuddies(const bool /* _onlyBuddies */)
+{
+}
+void SettingsCache::setOnlyRegistered(const bool /* _onlyRegistered */)
+{
+}
+void SettingsCache::setSpectatorsAllowed(const bool /* _spectatorsAllowed */)
+{
+}
+void SettingsCache::setSpectatorsNeedPassword(const bool /* _spectatorsNeedPassword */)
+{
+}
+void SettingsCache::setSpectatorsCanTalk(const bool /* _spectatorsCanTalk */)
+{
+}
+void SettingsCache::setSpectatorsCanSeeEverything(const bool /* _spectatorsCanSeeEverything */)
+{
+}
+void SettingsCache::setCreateGameAsSpectator(const bool /* _createGameAsSpectator */)
+{
+}
+void SettingsCache::setDefaultStartingLifeTotal(const int /* _startingLifeTotal */)
+{
+}
+void SettingsCache::setShareDecklistsOnLoad(const bool /* _shareDecklistsOnLoad */)
+{
+}
+void SettingsCache::setRememberGameSettings(const bool /* _rememberGameSettings */)
+{
+}
+void SettingsCache::setCheckUpdatesOnStartup(QT_STATE_CHANGED_T /* value */)
+{
+}
+void SettingsCache::setStartupCardUpdateCheckPromptForUpdate(bool /* value */)
+{
+}
+void SettingsCache::setStartupCardUpdateCheckAlwaysUpdate(bool /* value */)
+{
+}
+void SettingsCache::setCardUpdateCheckInterval(int /* value */)
+{
+}
+void SettingsCache::setLastCardUpdateCheck(QDate /* value */)
+{
+}
+void SettingsCache::setNotifyAboutUpdate(QT_STATE_CHANGED_T /* _notifyaboutupdate */)
+{
+}
+void SettingsCache::setNotifyAboutNewVersion(QT_STATE_CHANGED_T /* _notifyaboutnewversion */)
+{
+}
+void SettingsCache::setDownloadSpoilerStatus(bool /* _spoilerStatus */)
+{
+}
+void SettingsCache::setUpdateReleaseChannelIndex(int /* value */)
+{
+}
+void SettingsCache::setMaxFontSize(int /* _max */)
+{
+}
+void SettingsCache::setRoundCardCorners(bool /* _roundCardCorners */)
+{
+}
+
+void PictureLoader::clearPixmapCache(CardInfoPtr /* card */)
+{
+}
+
+SettingsCache *settingsCache;
+
+SettingsCache &SettingsCache::instance()
+{
+    return *settingsCache;
+}
diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h
index 016642005..18a50155b 100644
--- a/tests/carddatabase/mocks.h
+++ b/tests/carddatabase/mocks.h
@@ -5,11 +5,18 @@
  * with mocked objects.
  */
 
+#include <QObject>
+#include <QString>
+
 #define PICTURELOADER_H
 
-#include <libcockatrice/card/database/card_database.h>
+#include "../../cockatrice/src/database/card_database.h"
+#include "../../cockatrice/src/settings/cache_settings.h"
+#include "../../cockatrice/src/utility/macros.h"
 
-class CardPictureLoader
+extern SettingsCache *settingsCache;
+
+class PictureLoader
 {
 public:
     static void clearPixmapCache(CardInfoPtr card);
diff --git a/tests/carddatabase/test_card_database_path_provider.h b/tests/carddatabase/test_card_database_path_provider.h
deleted file mode 100644
index 8fc8ef962..000000000
--- a/tests/carddatabase/test_card_database_path_provider.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef COCKATRICE_TEST_CARD_DATABASE_PATH_PROVIDER_H
-#define COCKATRICE_TEST_CARD_DATABASE_PATH_PROVIDER_H
-
-#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
-
-class TestCardDatabasePathProvider : public ICardDatabasePathProvider
-{
-
-public:
-    QString getCardDatabasePath() const override
-    {
-        return QString("%1/cards.xml").arg(CARDDB_DATADIR);
-    }
-    QString getCustomCardDatabasePath() const override
-    {
-        return QString("%1/customsets/").arg(CARDDB_DATADIR);
-    }
-    QString getTokenDatabasePath() const override
-    {
-        return QString("%1/tokens.xml").arg(CARDDB_DATADIR);
-    }
-    QString getSpoilerCardDatabasePath() const override
-    {
-        return QString("%1/spoiler.xml").arg(CARDDB_DATADIR);
-    }
-};
-
-#endif // COCKATRICE_TEST_CARD_DATABASE_PATH_PROVIDER_H
diff --git a/tests/deck_hash_performance_test.cpp b/tests/deck_hash_performance_test.cpp
deleted file mode 100644
index 154283e8e..000000000
--- a/tests/deck_hash_performance_test.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "gtest/gtest.h"
-#include <QDebug>
-#include <libcockatrice/deck_list/deck_list.h>
-
-static constexpr int amount = 1e5;
-QString repeatDeck;
-QString numberDeck;
-QString uniquesDeck;
-QString uniquesXorDeck;
-QString duplicatesDeck;
-
-TEST(DeckHashTest, RepeatTest)
-{
-    DeckList decklist(repeatDeck);
-    for (int i = 0; i < amount; ++i) {
-        decklist.getDeckHash();
-        decklist.refreshDeckHash();
-    }
-    auto hash = decklist.getDeckHash().toStdString();
-    ASSERT_EQ(hash, "5cac19qm") << "The hash does not match!";
-}
-
-TEST(DeckHashTest, NumberTest)
-{
-    DeckList decklist(numberDeck);
-    auto hash = decklist.getDeckHash().toStdString();
-    ASSERT_EQ(hash, "e0m38p19") << "The hash does not match!";
-}
-
-TEST(DeckHashTest, UniquesTest)
-{
-    DeckList decklist(uniquesDeck);
-    auto hash = decklist.getDeckHash().toStdString();
-    ASSERT_EQ(hash, "88prk025") << "The hash does not match!";
-}
-
-TEST(DeckHashTest, UniquesTestXor)
-{
-    DeckList decklist(uniquesXorDeck);
-    auto hash = decklist.getDeckHash().toStdString();
-    ASSERT_EQ(hash, "hkn6q4pf") << "The hash does not match!";
-}
-
-TEST(DeckHashTest, DuplicatesTest)
-{
-    DeckList decklist(duplicatesDeck);
-    auto hash = decklist.getDeckHash().toStdString();
-    ASSERT_EQ(hash, "ekt6tg1h") << "The hash does not match!";
-}
-
-int main(int argc, char **argv)
-{
-    const QString deckStart =
-        R"(<?xml version="1.0"?><cockatrice_deck version="1"><deckname></deckname><comments></comments><zone name="main">)";
-    const QString deckEnd = R"(</zone></cockatrice_deck>)";
-
-    repeatDeck =
-        deckStart +
-        R"(<card number="1" name="Mountain"/><card number="2" name="Island"/></zone><zone name="side"><card number="3" name="Forest"/>)" +
-        deckEnd;
-    numberDeck = deckStart + QString(R"(<card number="%1" name="Island"/>)").arg(amount) + deckEnd;
-
-    QStringList deckString{deckStart};
-    QStringList deckStringXor = deckString;
-    int len = QString::number(amount).length();
-    for (int i = 0; i < amount; ++i) {
-        // creates already sorted list
-        deckString << R"(<card number="1" name="card )" << QString::number(i).rightJustified(len, '0') << R"("/>)";
-        // xor in order to mess with sorting
-        deckStringXor << R"(<card number="1" name="card )" << QString::number(i ^ amount) << R"("/>)";
-    }
-    deckString << deckEnd;
-    deckStringXor << deckEnd;
-    uniquesDeck = deckString.join("");
-    uniquesXorDeck = deckStringXor.join("");
-
-    duplicatesDeck = deckStart + QString(R"(<card number="1" name="card"/>)").repeated(amount) + deckEnd;
-
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}
diff --git a/tests/expression_test.cpp b/tests/expression_test.cpp
index 4fbe98cb9..51c4039a4 100644
--- a/tests/expression_test.cpp
+++ b/tests/expression_test.cpp
@@ -1,6 +1,7 @@
+#include "../common/expression.h"
+
 #include "gtest/gtest.h"
 #include <QtMath>
-#include <libcockatrice/utility/expression.h>
 
 #define TEST_EXPR(name, a, b)                                                                                          \
     TEST(ExpressionTest, name)                                                                                         \
diff --git a/tests/loading_from_clipboard/CMakeLists.txt b/tests/loading_from_clipboard/CMakeLists.txt
index 719d62f45..be8ac6374 100644
--- a/tests/loading_from_clipboard/CMakeLists.txt
+++ b/tests/loading_from_clipboard/CMakeLists.txt
@@ -1,12 +1,17 @@
 add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
-add_executable(loading_from_clipboard_test ${VERSION_STRING_CPP} clipboard_testing.cpp loading_from_clipboard_test.cpp)
+add_executable(
+  loading_from_clipboard_test ../../common/deck_list.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp
+)
 
 if(NOT GTEST_FOUND)
   add_dependencies(loading_from_clipboard_test gtest)
 endif()
 
+set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network
+                    ${COCKATRICE_QT_VERSION_NAME}::Widgets
+)
+
 target_link_libraries(
-  loading_from_clipboard_test libcockatrice_deck_list libcockatrice_card Threads::Threads ${GTEST_BOTH_LIBRARIES}
-  ${TEST_QT_MODULES}
+  loading_from_clipboard_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
 )
 add_test(NAME loading_from_clipboard_test COMMAND loading_from_clipboard_test)
diff --git a/tests/loading_from_clipboard/clipboard_testing.cpp b/tests/loading_from_clipboard/clipboard_testing.cpp
index a9977b800..943c6a05d 100644
--- a/tests/loading_from_clipboard/clipboard_testing.cpp
+++ b/tests/loading_from_clipboard/clipboard_testing.cpp
@@ -1,35 +1,25 @@
 #include "clipboard_testing.h"
 
-#include <QTextStream>
-#include <libcockatrice/card/import/card_name_normalizer.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
+#include "../../common/deck_list_card_node.h"
 
-DeckList getDeckList(const QString &clipboard)
-{
-    DeckList deckList;
-    QString cp(clipboard);
-    QTextStream stream(&cp); // text stream requires local copy
-    deckList.loadFromStream_Plain(stream, false, CardNameNormalizer());
-    return deckList;
-}
+#include <QTextStream>
 
 void testEmpty(const QString &clipboard)
 {
-    DeckList deckList = getDeckList(clipboard);
+    QString cp(clipboard);
+    DeckList deckList;
+    QTextStream stream(&cp); // text stream requires local copy
+    deckList.loadFromStream_Plain(stream, false);
 
     ASSERT_TRUE(deckList.getCardList().isEmpty());
 }
 
-void testHash(const QString &clipboard, const std::string &hash)
-{
-    DeckList deckList = getDeckList(clipboard);
-
-    ASSERT_EQ(deckList.getDeckHash().toStdString(), hash);
-}
-
 void testDeck(const QString &clipboard, const Result &result)
 {
-    DeckList deckList = getDeckList(clipboard);
+    QString cp(clipboard);
+    DeckList deckList;
+    QTextStream stream(&cp); // text stream requires local copy
+    deckList.loadFromStream_Plain(stream, false);
 
     ASSERT_EQ(result.name, deckList.getName().toStdString());
     ASSERT_EQ(result.comments, deckList.getComments().toStdString());
diff --git a/tests/loading_from_clipboard/clipboard_testing.h b/tests/loading_from_clipboard/clipboard_testing.h
index 41d8ea794..8f1b215b8 100644
--- a/tests/loading_from_clipboard/clipboard_testing.h
+++ b/tests/loading_from_clipboard/clipboard_testing.h
@@ -1,8 +1,9 @@
 #ifndef CLIPBOARD_TESTING_H
 #define CLIPBOARD_TESTING_H
 
+#include "../../common/deck_list.h"
+
 #include "gtest/gtest.h"
-#include <libcockatrice/deck_list/deck_list.h>
 
 // using std types because qt types aren't understood by gtest (without this you'll get less nice errors)
 using CardRows = QVector<std::pair<std::string, int>>;
@@ -21,7 +22,7 @@ struct Result
 };
 
 void testEmpty(const QString &clipboard);
-void testHash(const QString &clipboard, const std::string &hash);
+
 void testDeck(const QString &clipboard, const Result &result);
 
 #endif // CLIPBOARD_TESTING_H
diff --git a/tests/loading_from_clipboard/loading_from_clipboard_test.cpp b/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
index fcfbb22db..6f9762be9 100644
--- a/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
+++ b/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
@@ -203,22 +203,6 @@ TEST(LoadingFromClipboardTest, emptyMainBoard)
     testEmpty(clipboard);
 }
 
-TEST(LoadingFromClipboardTest, emptyHash)
-{
-    QString clipboard("");
-
-    testHash(clipboard, "r8sq7riu");
-}
-
-TEST(LoadingFromClipboardTest, deckHash)
-{
-    QString clipboard("1 Mountain\n"
-                      "2 Island\n"
-                      "SB: 3 Forest\n");
-
-    testHash(clipboard, "5cac19qm");
-}
-
 int main(int argc, char **argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
diff --git a/tests/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/oracle/CMakeLists.txt b/tests/oracle/CMakeLists.txt
index c5c1e9097..0c11eb751 100644
--- a/tests/oracle/CMakeLists.txt
+++ b/tests/oracle/CMakeLists.txt
@@ -4,6 +4,8 @@ if(NOT GTEST_FOUND)
   add_dependencies(parse_cipt_test gtest)
 endif()
 
-target_link_libraries(parse_cipt_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
+set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Widgets)
+
+target_link_libraries(parse_cipt_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
 
 add_test(NAME parse_cipt_test COMMAND parse_cipt_test)
diff --git a/tests/password_hash_test.cpp b/tests/password_hash_test.cpp
index 38d9b6315..84e7c8eb1 100644
--- a/tests/password_hash_test.cpp
+++ b/tests/password_hash_test.cpp
@@ -1,7 +1,8 @@
+#include "../common/passwordhasher.h"
+#include "../common/rng_abstract.h"
+#include "../common/rng_sfmt.h"
+
 #include "gtest/gtest.h"
-#include <libcockatrice/rng/rng_abstract.h>
-#include <libcockatrice/rng/rng_sfmt.h>
-#include <libcockatrice/utility/passwordhasher.h>
 
 RNG_Abstract *rng;
 
diff --git a/tests/test_age_formatting.cpp b/tests/test_age_formatting.cpp
index e4fc64cf9..4593a7b56 100644
--- a/tests/test_age_formatting.cpp
+++ b/tests/test_age_formatting.cpp
@@ -1,4 +1,4 @@
-#include "../cockatrice/src/interface/widgets/server/user/user_info_box.h"
+#include "../cockatrice/src/server/user/user_info_box.h"
 
 #include "gtest/gtest.h"
 
diff --git a/vcpkg b/vcpkg
index 74e653621..29ff5b813 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit 74e6536215718009aae747d86d84b78376bf9e09
+Subproject commit 29ff5b8131d0c6c8fcb8fbaef35992f0d507cd7c
diff --git a/webclient/package-lock.json b/webclient/package-lock.json
index 6b12b4ad6..b5d961a75 100644
--- a/webclient/package-lock.json
+++ b/webclient/package-lock.json
@@ -4866,9 +4866,9 @@
       }
     },
     "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=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
+      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ=="
     },
     "node_modules/@types/express": {
       "version": "4.17.14",
@@ -5641,9 +5641,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5671,17 +5671,6 @@
         "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",
@@ -6355,14 +6344,6 @@
       "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",
@@ -6500,9 +6481,9 @@
       "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==",
+      "version": "4.24.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
+      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
       "funding": [
         {
           "type": "opencollective",
@@ -6518,11 +6499,10 @@
         }
       ],
       "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"
+        "caniuse-lite": "^1.0.30001716",
+        "electron-to-chromium": "^1.5.149",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -6629,9 +6609,9 @@
       }
     },
     "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==",
+      "version": "1.0.30001718",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
+      "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
       "funding": [
         {
           "type": "opencollective",
@@ -7869,9 +7849,9 @@
       }
     },
     "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=="
+      "version": "1.5.155",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.155.tgz",
+      "integrity": "sha512-ps5KcGGmwL8VaeJlvlDlu4fORQpv3+GIcF5I3f9tUKUlJ/wsysh6HU8P5L1XWRYeXfA0oJd4PyM8ds8zTFf6Ng=="
     },
     "node_modules/emittery": {
       "version": "0.8.1",
@@ -7906,12 +7886,12 @@
       }
     },
     "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==",
+      "version": "5.18.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
       "dependencies": {
         "graceful-fs": "^4.2.4",
-        "tapable": "^2.3.0"
+        "tapable": "^2.2.0"
       },
       "engines": {
         "node": ">=10.13.0"
@@ -8022,9 +8002,9 @@
       }
     },
     "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=="
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
+      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA=="
     },
     "node_modules/es-shim-unscopables": {
       "version": "1.0.0",
@@ -14403,15 +14383,11 @@
       "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==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "engines": {
         "node": ">=6.11.5"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/loader-utils": {
@@ -14839,9 +14815,9 @@
       "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=="
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -18771,15 +18747,11 @@
       }
     },
     "node_modules/tapable": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
-      "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/temp-dir": {
@@ -18851,9 +18823,9 @@
       }
     },
     "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==",
+      "version": "5.3.14",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
+      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
@@ -19236,9 +19208,9 @@
       }
     },
     "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==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "funding": [
         {
           "type": "opencollective",
@@ -19395,9 +19367,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz",
-      "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
+      "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -19423,35 +19395,34 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.105.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.0.tgz",
-      "integrity": "sha512-gX/dMkRQc7QOMzgTe6KsYFM7DxeIONQSui1s0n/0xht36HvrgbxtM1xBlgx596NbpHuQU8P7QpKwrZYwUX48nw==",
+      "version": "5.99.9",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.9.tgz",
+      "integrity": "sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==",
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
-        "@types/estree": "^1.0.8",
+        "@types/estree": "^1.0.6",
         "@types/json-schema": "^7.0.15",
         "@webassemblyjs/ast": "^1.14.1",
         "@webassemblyjs/wasm-edit": "^1.14.1",
         "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.15.0",
-        "acorn-import-phases": "^1.0.3",
-        "browserslist": "^4.28.1",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.19.0",
-        "es-module-lexer": "^2.0.0",
+        "enhanced-resolve": "^5.17.1",
+        "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.2.11",
         "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.3.1",
+        "loader-runner": "^4.2.0",
         "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"
+        "schema-utils": "^4.3.2",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.11",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.2.3"
       },
       "bin": {
         "webpack": "bin/webpack.js"
@@ -19699,9 +19670,9 @@
       }
     },
     "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==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "engines": {
         "node": ">=10.13.0"
       }
@@ -19738,9 +19709,9 @@
       "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==",
+      "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",
@@ -23620,9 +23591,9 @@
       }
     },
     "@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
+      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ=="
     },
     "@types/express": {
       "version": "4.17.14",
@@ -24274,9 +24245,9 @@
       }
     },
     "acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg=="
     },
     "acorn-globals": {
       "version": "6.0.0",
@@ -24294,11 +24265,6 @@
         }
       }
     },
-    "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",
@@ -24786,11 +24752,6 @@
       "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",
@@ -24908,15 +24869,14 @@
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
     },
     "browserslist": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
-      "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
+      "version": "4.24.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
+      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
       "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"
+        "caniuse-lite": "^1.0.30001716",
+        "electron-to-chromium": "^1.5.149",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.3"
       }
     },
     "bser": {
@@ -24990,9 +24950,9 @@
       }
     },
     "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=="
+      "version": "1.0.30001718",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
+      "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw=="
     },
     "case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
@@ -25883,9 +25843,9 @@
       }
     },
     "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=="
+      "version": "1.5.155",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.155.tgz",
+      "integrity": "sha512-ps5KcGGmwL8VaeJlvlDlu4fORQpv3+GIcF5I3f9tUKUlJ/wsysh6HU8P5L1XWRYeXfA0oJd4PyM8ds8zTFf6Ng=="
     },
     "emittery": {
       "version": "0.8.1",
@@ -25908,12 +25868,12 @@
       "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==",
+      "version": "5.18.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
       "requires": {
         "graceful-fs": "^4.2.4",
-        "tapable": "^2.3.0"
+        "tapable": "^2.2.0"
       }
     },
     "entities": {
@@ -26003,9 +25963,9 @@
       }
     },
     "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=="
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
+      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA=="
     },
     "es-shim-unscopables": {
       "version": "1.0.0",
@@ -30676,9 +30636,9 @@
       "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=="
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
     },
     "loader-utils": {
       "version": "2.0.4",
@@ -30993,9 +30953,9 @@
       "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=="
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
     },
     "normalize-path": {
       "version": "3.0.0",
@@ -33622,9 +33582,9 @@
       }
     },
     "tapable": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
-      "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg=="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
     },
     "temp-dir": {
       "version": "2.0.0",
@@ -33677,9 +33637,9 @@
       }
     },
     "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==",
+      "version": "5.3.14",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
+      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
       "requires": {
         "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
@@ -33950,9 +33910,9 @@
       "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==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "requires": {
         "escalade": "^3.2.0",
         "picocolors": "^1.1.1"
@@ -34063,9 +34023,9 @@
       }
     },
     "watchpack": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz",
-      "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
+      "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
       "requires": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -34085,35 +34045,34 @@
       "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==",
+      "version": "5.99.9",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.9.tgz",
+      "integrity": "sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==",
       "requires": {
         "@types/eslint-scope": "^3.7.7",
-        "@types/estree": "^1.0.8",
+        "@types/estree": "^1.0.6",
         "@types/json-schema": "^7.0.15",
         "@webassemblyjs/ast": "^1.14.1",
         "@webassemblyjs/wasm-edit": "^1.14.1",
         "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.15.0",
-        "acorn-import-phases": "^1.0.3",
-        "browserslist": "^4.28.1",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.19.0",
-        "es-module-lexer": "^2.0.0",
+        "enhanced-resolve": "^5.17.1",
+        "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.2.11",
         "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.3.1",
+        "loader-runner": "^4.2.0",
         "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"
+        "schema-utils": "^4.3.2",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.11",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.2.3"
       },
       "dependencies": {
         "ajv": {
@@ -34141,9 +34100,9 @@
           "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==",
+          "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",
@@ -34306,9 +34265,9 @@
       }
     },
     "webpack-sources": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
-      "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg=="
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
     },
     "websocket-driver": {
       "version": "0.7.4",
diff --git a/webclient/prebuild.js b/webclient/prebuild.js
index 3b420f32c..f931f508b 100644
--- a/webclient/prebuild.js
+++ b/webclient/prebuild.js
@@ -12,7 +12,7 @@ const serverPropsFile = `${ROOT_DIR}/server-props.json`;
 const masterProtoFile = `${ROOT_DIR}/proto-files.json`;
 
 const sharedFiles = [
-  ['../libcockatrice_protocol/libcockatrice/protocol/pb', protoFilesDir],
+  ['../common/pb', protoFilesDir],
   ['../cockatrice/resources/countries', `${ROOT_DIR}/images/countries`],
 ];
 
diff --git a/webclient/public/locales/fi/translation.json b/webclient/public/locales/fi/translation.json
index 12737731a..57fb2e1a9 100644
--- a/webclient/public/locales/fi/translation.json
+++ b/webclient/public/locales/fi/translation.json
@@ -354,7 +354,7 @@
     "label": {
       "autoConnect": "Auto Connect",
       "forgot": "Forgot Password",
-      "login": "Kirjaudu sisään",
+      "login": "Login",
       "savePassword": "Save Password",
       "savedPassword": "Saved Password"
     }
@@ -376,7 +376,7 @@
   "ResetPasswordForm": {
     "error": "Password reset failed",
     "label": {
-      "reset": "Nollaa Salasana"
+      "reset": "Reset Password"
     }
   }
 }
\ No newline at end of file
diff --git a/webclient/public/locales/ru/translation.json b/webclient/public/locales/ru/translation.json
index 5e92f790e..457a772e2 100644
--- a/webclient/public/locales/ru/translation.json
+++ b/webclient/public/locales/ru/translation.json
@@ -24,263 +24,263 @@
       "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": "Европейский Союз"
+      "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": "Английский - США",
-      "fr": "Французский",
-      "nl": "Датский",
-      "pt_BR": "Португальский - Бразилия"
+      "en-US": "English - US",
+      "fr": "French",
+      "nl": "Dutch",
+      "pt_BR": "Portuguese - Brazil"
     }
   },
   "KnownHosts": {
@@ -295,36 +295,36 @@
   "LoginContainer": {
     "header": {
       "title": "Логин",
-      "subtitle": "Кросс-платформенный виртуальный стол для мультиплеерных ККИ"
+      "subtitle": "A cross-platform virtual tabletop for multiplayer card games."
     },
     "footer": {
-      "registerPrompt": "Ещё не зарегистрированы?",
-      "registerAction": "Создать учетную запись",
-      "credit": "Cockatrice - проект с открытым исходным кодом",
-      "version": "Версия"
+      "registerPrompt": "Not registered yet?",
+      "registerAction": "Create an account",
+      "credit": "Cockatrice is an open source project",
+      "version": "Version"
     },
     "content": {
-      "subtitle1": "Играйте в мультиплеерные ККИ онлайн",
-      "subtitle2": "Кросс-платформенный виртуальный стол для мультиплеерных ККИ. Всегда будет бесплатным."
+      "subtitle1": "Play multiplayer card games online.",
+      "subtitle2": "Cross-platform virtual tabletop for multiplayer card games. Forever free."
     },
     "toasts": {
-      "passwordResetSuccessToast": "Пароль сброшен успешно",
-      "accountActivationSuccess": "Учетная запись активирована успешно"
+      "passwordResetSuccessToast": "Password Reset Successfully",
+      "accountActivationSuccess": "Account Activated Successfully"
     }
   },
   "UnsupportedContainer": {
-    "title": "Браузер не поддерживается",
-    "subtitle1": "Обновите бразуер и/или проверьте права доступа",
-    "subtitle2": "Обратите внимание, что использование анонимных браузеров может привести к неработоспособности некоторых фич и проблемами с правами доступа"
+    "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": "Активация учетной записи",
-    "subtitle1": "Ваша учетная запись не активирована",
-    "subtitle2": "Ваш аккаунт пока не активирован. Вам необходимо следовать указаниям по активации, отправленным на ваш email"
+    "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": "{модифицировать, выбрать, редактировать {Edit} другой {Add}} известный хост",
-    "subtitle": "Добавление нового хоста позволит вам присоединяться к различным серверам. Введите данные о сервере в ваш список хостов"
+    "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": "Создать новый аккаунт"
diff --git a/webclient/public/locales/tok/translation.json b/webclient/public/locales/tok/translation.json
index 46437f558..b42f7b1c9 100644
--- a/webclient/public/locales/tok/translation.json
+++ b/webclient/public/locales/tok/translation.json
@@ -333,7 +333,7 @@
     "title": "Request Password Reset"
   },
   "ResetPasswordDialog": {
-    "title": "mi o sin e nimi ken"
+    "title": "Reset Password"
   },
   "AccountActivationForm": {
     "error": {
@@ -354,7 +354,7 @@
     "label": {
       "autoConnect": "Auto Connect",
       "forgot": "nimi ken pi kama sina li weka tan sona",
-      "login": "mi o kama e sina lon kulupu",
+      "login": "Login",
       "savePassword": "mi o awen e nimi ken",
       "savedPassword": "mi awen e nimi ken"
     }
diff --git a/webclient/src/api/AuthenticationService.tsx b/webclient/src/api/AuthenticationService.tsx
index 7b3a46988..368390708 100644
--- a/webclient/src/api/AuthenticationService.tsx
+++ b/webclient/src/api/AuthenticationService.tsx
@@ -1,6 +1,5 @@
 import { StatusEnum, User, WebSocketConnectReason, WebSocketConnectOptions } from 'types';
 import { SessionCommands, webClient } from 'websocket';
-import { ProtoController } from 'websocket/services/ProtoController';
 
 export class AuthenticationService {
   static login(options: WebSocketConnectOptions): void {
@@ -40,7 +39,7 @@ export class AuthenticationService {
   }
 
   static isModerator(user: User): boolean {
-    const moderatorLevel = ProtoController.root.ServerInfo_User.UserLevelFlag.IsModerator;
+    const moderatorLevel = webClient.protobuf.controller.ServerInfo_User.UserLevelFlag.IsModerator;
     // @TODO tell cockatrice not to do this so shittily
     return (user.userLevel & moderatorLevel) === moderatorLevel;
   }
diff --git a/webclient/src/api/ModeratorService.tsx b/webclient/src/api/ModeratorService.tsx
index 6c22ee55e..e7c8822e8 100644
--- a/webclient/src/api/ModeratorService.tsx
+++ b/webclient/src/api/ModeratorService.tsx
@@ -23,7 +23,7 @@ export class ModeratorService {
     ModeratorCommands.viewLogHistory(filters);
   }
 
-  static warnUser(userName: string, reason: string, clientid?: string, removeMessages?: number): void {
-    ModeratorCommands.warnUser(userName, reason, clientid, removeMessages);
+  static warnUser(userName: string, reason: string, clientid?: string, removeMessage?: boolean): void {
+    ModeratorCommands.warnUser(userName, reason, clientid, removeMessage);
   }
 }
diff --git a/webclient/src/api/SessionService.tsx b/webclient/src/api/SessionService.tsx
index 2787f098d..051954f93 100644
--- a/webclient/src/api/SessionService.tsx
+++ b/webclient/src/api/SessionService.tsx
@@ -1,4 +1,6 @@
 import { SessionCommands } from 'websocket';
+import { common } from 'protobufjs';
+import IBytesValue = common.IBytesValue;
 
 export class SessionService {
   static addToBuddyList(userName: string) {
@@ -25,7 +27,7 @@ export class SessionService {
     SessionCommands.accountEdit(passwordCheck, realName, email, country);
   }
 
-  static changeAccountImage(image: Uint8Array): void {
+  static changeAccountImage(image: IBytesValue): void {
     SessionCommands.accountImage(image);
   }
 
diff --git a/webclient/src/store/server/server.actions.ts b/webclient/src/store/server/server.actions.ts
index 8af5adb75..ed1f06977 100644
--- a/webclient/src/store/server/server.actions.ts
+++ b/webclient/src/store/server/server.actions.ts
@@ -1,4 +1,4 @@
-import { DeckList, DeckStorageTreeItem, ReplayMatch, WebSocketConnectOptions } from 'types';
+import { WebSocketConnectOptions } from 'types';
 import { Types } from './server.types';
 
 export const Actions = {
@@ -210,33 +210,4 @@ export const Actions = {
     type: Types.WARN_USER,
     userName,
   }),
-  grantReplayAccess: (replayId: number, moderatorName: string) => ({
-    type: Types.GRANT_REPLAY_ACCESS,
-    replayId,
-    moderatorName,
-  }),
-  forceActivateUser: (usernameToActivate: string, moderatorName: string) => ({
-    type: Types.FORCE_ACTIVATE_USER,
-    usernameToActivate,
-    moderatorName,
-  }),
-  getAdminNotes: (userName: string, notes: string) => ({
-    type: Types.GET_ADMIN_NOTES,
-    userName,
-    notes,
-  }),
-  updateAdminNotes: (userName: string, notes: string) => ({
-    type: Types.UPDATE_ADMIN_NOTES,
-    userName,
-    notes,
-  }),
-  replayList: (matchList: ReplayMatch[]) => ({ type: Types.REPLAY_LIST, matchList }),
-  replayAdded: (matchInfo: ReplayMatch) => ({ type: Types.REPLAY_ADDED, matchInfo }),
-  replayModifyMatch: (gameId: number, doNotHide: boolean) => ({ type: Types.REPLAY_MODIFY_MATCH, gameId, doNotHide }),
-  replayDeleteMatch: (gameId: number) => ({ type: Types.REPLAY_DELETE_MATCH, gameId }),
-  backendDecks: (deckList: DeckList) => ({ type: Types.BACKEND_DECKS, deckList }),
-  deckNewDir: (path: string, dirName: string) => ({ type: Types.DECK_NEW_DIR, path, dirName }),
-  deckDelDir: (path: string) => ({ type: Types.DECK_DEL_DIR, path }),
-  deckUpload: (path: string, treeItem: DeckStorageTreeItem) => ({ type: Types.DECK_UPLOAD, path, treeItem }),
-  deckDelete: (deckId: number) => ({ type: Types.DECK_DELETE, deckId }),
 }
diff --git a/webclient/src/store/server/server.dispatch.ts b/webclient/src/store/server/server.dispatch.ts
index 3d3b6d360..3a958043a 100644
--- a/webclient/src/store/server/server.dispatch.ts
+++ b/webclient/src/store/server/server.dispatch.ts
@@ -1,7 +1,7 @@
 import { reset } from 'redux-form';
 import { Actions } from './server.actions';
 import { store } from 'store';
-import { DeckList, DeckStorageTreeItem, ReplayMatch, WebSocketConnectOptions } from 'types';
+import { WebSocketConnectOptions } from 'types';
 
 export const Dispatch = {
   initialized: () => {
@@ -177,43 +177,4 @@ export const Dispatch = {
   warnUser: (userName) => {
     store.dispatch(Actions.warnUser(userName))
   },
-  grantReplayAccess: (replayId: number, moderatorName: string) => {
-    store.dispatch(Actions.grantReplayAccess(replayId, moderatorName));
-  },
-  forceActivateUser: (usernameToActivate: string, moderatorName: string) => {
-    store.dispatch(Actions.forceActivateUser(usernameToActivate, moderatorName));
-  },
-  getAdminNotes: (userName: string, notes: string) => {
-    store.dispatch(Actions.getAdminNotes(userName, notes));
-  },
-  updateAdminNotes: (userName: string, notes: string) => {
-    store.dispatch(Actions.updateAdminNotes(userName, notes));
-  },
-  replayList: (matchList: ReplayMatch[]) => {
-    store.dispatch(Actions.replayList(matchList));
-  },
-  replayAdded: (matchInfo: ReplayMatch) => {
-    store.dispatch(Actions.replayAdded(matchInfo));
-  },
-  replayModifyMatch: (gameId: number, doNotHide: boolean) => {
-    store.dispatch(Actions.replayModifyMatch(gameId, doNotHide));
-  },
-  replayDeleteMatch: (gameId: number) => {
-    store.dispatch(Actions.replayDeleteMatch(gameId));
-  },
-  backendDecks: (deckList: DeckList) => {
-    store.dispatch(Actions.backendDecks(deckList));
-  },
-  deckNewDir: (path: string, dirName: string) => {
-    store.dispatch(Actions.deckNewDir(path, dirName));
-  },
-  deckDelDir: (path: string) => {
-    store.dispatch(Actions.deckDelDir(path));
-  },
-  deckUpload: (path: string, treeItem: DeckStorageTreeItem) => {
-    store.dispatch(Actions.deckUpload(path, treeItem));
-  },
-  deckDelete: (deckId: number) => {
-    store.dispatch(Actions.deckDelete(deckId));
-  },
 }
diff --git a/webclient/src/store/server/server.interfaces.ts b/webclient/src/store/server/server.interfaces.ts
index 97e9d99da..499197852 100644
--- a/webclient/src/store/server/server.interfaces.ts
+++ b/webclient/src/store/server/server.interfaces.ts
@@ -1,6 +1,4 @@
-import {
-  WarnHistoryItem, BanHistoryItem, DeckList, LogItem, ReplayMatch, SortBy, User, UserSortField, WebSocketConnectOptions, WarnListItem
-} from 'types';
+import { WarnHistoryItem, BanHistoryItem, LogItem, SortBy, User, UserSortField, WebSocketConnectOptions, WarnListItem } from 'types';
 import { NotifyUserData, ServerShutdownData, UserMessageData } from 'websocket/events/session/interfaces';
 
 export interface ServerConnectParams {
@@ -69,9 +67,6 @@ export interface ServerState {
   };
   warnListOptions: WarnListItem[];
   warnUser: string;
-  adminNotes: { [userName: string]: string };
-  replays: ReplayMatch[];
-  backendDecks: DeckList | null;
 }
 
 export interface ServerStateStatus {
diff --git a/webclient/src/store/server/server.reducer.ts b/webclient/src/store/server/server.reducer.ts
index a63418eeb..46daa4007 100644
--- a/webclient/src/store/server/server.reducer.ts
+++ b/webclient/src/store/server/server.reducer.ts
@@ -1,60 +1,10 @@
-import { DeckStorageFolder, DeckStorageTreeItem, SortDirection, StatusEnum, UserLevelFlag, UserSortField } from 'types';
+import { SortDirection, StatusEnum, UserLevelFlag, UserSortField } from 'types';
 
 import { SortUtil } from '../common';
 
 import { ServerState } from './server.interfaces'
 import { Types } from './server.types';
 
-function splitPath(path: string): string[] {
-  return path ? path.split('/') : [];
-}
-
-function insertAtPath(folder: DeckStorageFolder, pathSegments: string[], item: DeckStorageTreeItem): DeckStorageFolder {
-  if (pathSegments.length === 0 || (pathSegments.length === 1 && pathSegments[0] === '')) {
-    return { items: [...folder.items, item] };
-  }
-  const [head, ...tail] = pathSegments;
-  const match = folder.items.find(child => child.name === head && child.folder);
-  if (match) {
-    return {
-      items: folder.items.map(child =>
-        child === match
-          ? { ...child, folder: insertAtPath(child.folder!, tail, item) }
-          : child
-      ),
-    };
-  }
-  const created: DeckStorageTreeItem = { id: 0, name: head, file: null, folder: insertAtPath({ items: [] }, tail, item) };
-  return { items: [...folder.items, created] };
-}
-
-function removeById(folder: DeckStorageFolder, id: number): DeckStorageFolder {
-  return {
-    items: folder.items
-      .filter(item => item.id !== id)
-      .map(item =>
-        item.folder ? { ...item, folder: removeById(item.folder, id) } : item
-      ),
-  };
-}
-
-function removeByPath(folder: DeckStorageFolder, pathSegments: string[]): DeckStorageFolder {
-  if (pathSegments.length === 0 || (pathSegments.length === 1 && pathSegments[0] === '')) {
-    return folder;
-  }
-  const [head, ...tail] = pathSegments;
-  if (tail.length === 0) {
-    return { items: folder.items.filter(item => !(item.name === head && item.folder !== null)) };
-  }
-  return {
-    items: folder.items.map(item =>
-      item.name === head && item.folder
-        ? { ...item, folder: removeByPath(item.folder, tail) }
-        : item
-    ),
-  };
-}
-
 const initialState: ServerState = {
   initialized: false,
   buddyList: [],
@@ -90,9 +40,6 @@ const initialState: ServerState = {
   warnHistory: {},
   warnListOptions: [],
   warnUser: '',
-  adminNotes: {},
-  replays: [],
-  backendDecks: null,
 };
 
 export const serverReducer = (state = initialState, action: any) => {
@@ -300,7 +247,7 @@ export const serverReducer = (state = initialState, action: any) => {
         messages: {
           ...state.messages,
           [userName]: [
-            ...(state.messages[userName] ?? []),
+            ...state.messages[userName],
             action.messageData,
           ],
         }
@@ -381,17 +328,6 @@ export const serverReducer = (state = initialState, action: any) => {
         warnUser: userName,
       };
     }
-    case Types.GET_ADMIN_NOTES:
-    case Types.UPDATE_ADMIN_NOTES: {
-      const { userName, notes } = action;
-      return {
-        ...state,
-        adminNotes: {
-          ...state.adminNotes,
-          [userName]: notes,
-        }
-      };
-    }
     case Types.ADJUST_MOD: {
       const { userName, shouldBeMod, shouldBeJudge } = action;
 
@@ -410,71 +346,6 @@ export const serverReducer = (state = initialState, action: any) => {
         })
       };
     }
-    case Types.REPLAY_LIST: {
-      return { ...state, replays: [...action.matchList] };
-    }
-    case Types.REPLAY_ADDED: {
-      return { ...state, replays: [...state.replays, action.matchInfo] };
-    }
-    case Types.REPLAY_MODIFY_MATCH: {
-      return {
-        ...state,
-        replays: state.replays.map(r =>
-          r.gameId === action.gameId ? { ...r, doNotHide: action.doNotHide } : r
-        ),
-      };
-    }
-    case Types.REPLAY_DELETE_MATCH: {
-      return { ...state, replays: state.replays.filter(r => r.gameId !== action.gameId) };
-    }
-    case Types.BACKEND_DECKS: {
-      return { ...state, backendDecks: action.deckList };
-    }
-    case Types.DECK_UPLOAD: {
-      if (!state.backendDecks) {
-        return state;
-      }
-      return {
-        ...state,
-        backendDecks: {
-          root: insertAtPath(state.backendDecks.root, splitPath(action.path), action.treeItem),
-        },
-      };
-    }
-    case Types.DECK_DELETE: {
-      if (!state.backendDecks) {
-        return state;
-      }
-      return {
-        ...state,
-        backendDecks: {
-          root: removeById(state.backendDecks.root, action.deckId),
-        },
-      };
-    }
-    case Types.DECK_NEW_DIR: {
-      if (!state.backendDecks) {
-        return state;
-      }
-      const newFolder: DeckStorageTreeItem = { id: 0, name: action.dirName, file: null, folder: { items: [] } };
-      return {
-        ...state,
-        backendDecks: {
-          root: insertAtPath(state.backendDecks.root, splitPath(action.path), newFolder),
-        },
-      };
-    }
-    case Types.DECK_DEL_DIR: {
-      if (!state.backendDecks) {
-        return state;
-      }
-      return {
-        ...state,
-        backendDecks: {
-          root: removeByPath(state.backendDecks.root, splitPath(action.path)),
-        },
-      };
-    }
     default:
       return state;
   }
diff --git a/webclient/src/store/server/server.selectors.ts b/webclient/src/store/server/server.selectors.ts
index fa9f82297..263946425 100644
--- a/webclient/src/store/server/server.selectors.ts
+++ b/webclient/src/store/server/server.selectors.ts
@@ -16,7 +16,5 @@ export const Selectors = {
   getUsers: ({ server }: State) => server.users,
   getLogs: ({ server }: State) => server.logs,
   getBuddyList: ({ server }: State) => server.buddyList,
-  getIgnoreList: ({ server }: State) => server.ignoreList,
-  getReplays: ({ server }: State) => server.replays,
-  getBackendDecks: ({ server }: State) => server.backendDecks,
+  getIgnoreList: ({ server }: State) => server.ignoreList
 }
diff --git a/webclient/src/store/server/server.types.ts b/webclient/src/store/server/server.types.ts
index fb4249011..ab9307295 100644
--- a/webclient/src/store/server/server.types.ts
+++ b/webclient/src/store/server/server.types.ts
@@ -54,19 +54,4 @@ export const Types = {
   WARN_HISTORY: '[Server] Warn History',
   WARN_LIST_OPTIONS: '[Server] Warn List Options',
   WARN_USER: '[Server] Warn User',
-  GRANT_REPLAY_ACCESS: '[Server] Grant Replay Access',
-  FORCE_ACTIVATE_USER: '[Server] Force Activate User',
-  GET_ADMIN_NOTES: '[Server] Get Admin Notes',
-  UPDATE_ADMIN_NOTES: '[Server] Update Admin Notes',
-  // Replay
-  REPLAY_LIST: '[Server] Replay List',
-  REPLAY_ADDED: '[Server] Replay Added',
-  REPLAY_MODIFY_MATCH: '[Server] Replay Modify Match',
-  REPLAY_DELETE_MATCH: '[Server] Replay Delete Match',
-  // Deck Storage
-  BACKEND_DECKS: '[Server] Backend Decks',
-  DECK_NEW_DIR: '[Server] Deck New Dir',
-  DECK_DEL_DIR: '[Server] Deck Del Dir',
-  DECK_UPLOAD: '[Server] Deck Upload',
-  DECK_DELETE: '[Server] Deck Delete',
 };
diff --git a/webclient/src/types/deckList.ts b/webclient/src/types/deckList.ts
index 9d7d792a6..18212079e 100644
--- a/webclient/src/types/deckList.ts
+++ b/webclient/src/types/deckList.ts
@@ -13,6 +13,6 @@ export interface DeckStorageFile {
 export interface DeckStorageTreeItem {
     id: number;
     name: string;
-    file: DeckStorageFile | null;
-    folder: DeckStorageFolder | null;
+    file: DeckStorageFile;
+    folder: DeckStorageFolder;
 }
diff --git a/webclient/src/types/index.ts b/webclient/src/types/index.ts
index ded9962e5..00838a16d 100644
--- a/webclient/src/types/index.ts
+++ b/webclient/src/types/index.ts
@@ -16,4 +16,3 @@ export * from './logs';
 export * from './session';
 export * from './deckList';
 export * from './moderator';
-export * from './replay';
diff --git a/webclient/src/types/logs.ts b/webclient/src/types/logs.ts
index 3cf34b486..4c2f0364e 100644
--- a/webclient/src/types/logs.ts
+++ b/webclient/src/types/logs.ts
@@ -1,10 +1,8 @@
 export interface LogFilters {
-    userName?: string;
-    ipAddress?: string;
-    gameName?: string;
-    gameId?: string;
-    message?: string;
-    logLocation?: string[];
-    dateRange: number;
-    maximumResults?: number;
+    userName: string;
+    ipAddress: string;
+    gameName: string;
+    gameId: string;
+    message: string;
+    logLocation: string;
 }
diff --git a/webclient/src/types/replay.ts b/webclient/src/types/replay.ts
deleted file mode 100644
index dfa78538a..000000000
--- a/webclient/src/types/replay.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export interface Replay {
-  replayId: number;
-  replayName: string;
-  duration: number;
-}
-
-export interface ReplayMatch {
-  replayList: Replay[];
-  gameId: number;
-  roomName: string;
-  timeStarted: number;
-  length: number;
-  gameName: string;
-  playerNames: string[];
-  doNotHide: boolean;
-}
diff --git a/webclient/src/websocket/commands/admin/adjustMod.ts b/webclient/src/websocket/commands/admin/adjustMod.ts
index fd71fece1..5e8a83153 100644
--- a/webclient/src/websocket/commands/admin/adjustMod.ts
+++ b/webclient/src/websocket/commands/admin/adjustMod.ts
@@ -1,10 +1,26 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { AdminPersistence } from '../../persistence';
 
 export function adjustMod(userName: string, shouldBeMod?: boolean, shouldBeJudge?: boolean): void {
-  BackendService.sendAdminCommand('Command_AdjustMod', { userName, shouldBeMod, shouldBeJudge }, {
-    onSuccess: () => {
-      AdminPersistence.adjustMod(userName, shouldBeMod, shouldBeJudge);
-    },
+  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/reloadConfig.ts b/webclient/src/websocket/commands/admin/reloadConfig.ts
index 979f3ec73..16d2a574b 100644
--- a/webclient/src/websocket/commands/admin/reloadConfig.ts
+++ b/webclient/src/websocket/commands/admin/reloadConfig.ts
@@ -1,10 +1,26 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { AdminPersistence } from '../../persistence';
 
 export function reloadConfig(): void {
-  BackendService.sendAdminCommand('Command_ReloadConfig', {}, {
-    onSuccess: () => {
-      AdminPersistence.reloadConfig();
-    },
+  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
index e65c900db..0624e823d 100644
--- a/webclient/src/websocket/commands/admin/shutdownServer.ts
+++ b/webclient/src/websocket/commands/admin/shutdownServer.ts
@@ -1,10 +1,26 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { AdminPersistence } from '../../persistence';
 
 export function shutdownServer(reason: string, minutes: number): void {
-  BackendService.sendAdminCommand('Command_ShutdownServer', { reason, minutes }, {
-    onSuccess: () => {
-      AdminPersistence.shutdownServer();
-    },
+  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
index e2b194514..cb025f5a9 100644
--- a/webclient/src/websocket/commands/admin/updateServerMessage.ts
+++ b/webclient/src/websocket/commands/admin/updateServerMessage.ts
@@ -1,10 +1,26 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { AdminPersistence } from '../../persistence';
 
 export function updateServerMessage(): void {
-  BackendService.sendAdminCommand('Command_UpdateServerMessage', {}, {
-    onSuccess: () => {
-      AdminPersistence.updateServerMessage();
-    },
+  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/moderator/banFromServer.ts b/webclient/src/websocket/commands/moderator/banFromServer.ts
index e45e34504..028eb4606 100644
--- a/webclient/src/websocket/commands/moderator/banFromServer.ts
+++ b/webclient/src/websocket/commands/moderator/banFromServer.ts
@@ -1,13 +1,29 @@
-import { BackendService } from '../../services/BackendService';
+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 {
-  BackendService.sendModeratorCommand('Command_BanFromServer', {
+  const command = webClient.protobuf.controller.Command_BanFromServer.create({
     minutes, userName, address, reason, visibleReason, clientid, removeMessages
-  }, {
-    onSuccess: () => {
-      ModeratorPersistence.banFromServer(userName);
-    },
+  });
+  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/forceActivateUser.ts b/webclient/src/websocket/commands/moderator/forceActivateUser.ts
deleted file mode 100644
index d4138a015..000000000
--- a/webclient/src/websocket/commands/moderator/forceActivateUser.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { BackendService } from '../../services/BackendService';
-import { ModeratorPersistence } from '../../persistence';
-
-export function forceActivateUser(usernameToActivate: string, moderatorName: string): void {
-  BackendService.sendModeratorCommand('Command_ForceActivateUser', { usernameToActivate, moderatorName }, {
-    onSuccess: () => {
-      ModeratorPersistence.forceActivateUser(usernameToActivate, moderatorName);
-    },
-  });
-}
diff --git a/webclient/src/websocket/commands/moderator/getAdminNotes.ts b/webclient/src/websocket/commands/moderator/getAdminNotes.ts
deleted file mode 100644
index d4f626aa2..000000000
--- a/webclient/src/websocket/commands/moderator/getAdminNotes.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BackendService } from '../../services/BackendService';
-import { ModeratorPersistence } from '../../persistence';
-
-export function getAdminNotes(userName: string): void {
-  BackendService.sendModeratorCommand('Command_GetAdminNotes', { userName }, {
-    responseName: 'Response_GetAdminNotes',
-    onSuccess: (response) => {
-      ModeratorPersistence.getAdminNotes(userName, response.notes);
-    },
-  });
-}
diff --git a/webclient/src/websocket/commands/moderator/getBanHistory.ts b/webclient/src/websocket/commands/moderator/getBanHistory.ts
index dd4e90eda..3378f5842 100644
--- a/webclient/src/websocket/commands/moderator/getBanHistory.ts
+++ b/webclient/src/websocket/commands/moderator/getBanHistory.ts
@@ -1,11 +1,27 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { ModeratorPersistence } from '../../persistence';
 
 export function getBanHistory(userName: string): void {
-  BackendService.sendModeratorCommand('Command_GetBanHistory', { userName }, {
-    responseName: 'Response_BanHistory',
-    onSuccess: (response) => {
-      ModeratorPersistence.banHistory(userName, response.banList);
-    },
+  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
index c47e2c6e4..fce008eec 100644
--- a/webclient/src/websocket/commands/moderator/getWarnHistory.ts
+++ b/webclient/src/websocket/commands/moderator/getWarnHistory.ts
@@ -1,11 +1,27 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { ModeratorPersistence } from '../../persistence';
 
 export function getWarnHistory(userName: string): void {
-  BackendService.sendModeratorCommand('Command_GetWarnHistory', { userName }, {
-    responseName: 'Response_WarnHistory',
-    onSuccess: (response) => {
-      ModeratorPersistence.warnHistory(userName, response.warnList);
-    },
+  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
index 412aee09e..f83e5eb1b 100644
--- a/webclient/src/websocket/commands/moderator/getWarnList.ts
+++ b/webclient/src/websocket/commands/moderator/getWarnList.ts
@@ -1,11 +1,27 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { ModeratorPersistence } from '../../persistence';
 
 export function getWarnList(modName: string, userName: string, userClientid: string): void {
-  BackendService.sendModeratorCommand('Command_GetWarnList', { modName, userName, userClientid }, {
-    responseName: 'Response_WarnList',
-    onSuccess: (response) => {
-      ModeratorPersistence.warnListOptions(response.warning);
-    },
+  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/grantReplayAccess.ts b/webclient/src/websocket/commands/moderator/grantReplayAccess.ts
deleted file mode 100644
index 74d64d17a..000000000
--- a/webclient/src/websocket/commands/moderator/grantReplayAccess.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { BackendService } from '../../services/BackendService';
-import { ModeratorPersistence } from '../../persistence';
-
-export function grantReplayAccess(replayId: number, moderatorName: string): void {
-  BackendService.sendModeratorCommand('Command_GrantReplayAccess', { replayId, moderatorName }, {
-    onSuccess: () => {
-      ModeratorPersistence.grantReplayAccess(replayId, moderatorName);
-    },
-  });
-}
diff --git a/webclient/src/websocket/commands/moderator/index.ts b/webclient/src/websocket/commands/moderator/index.ts
index 10bb0e1c6..cb4f2455c 100644
--- a/webclient/src/websocket/commands/moderator/index.ts
+++ b/webclient/src/websocket/commands/moderator/index.ts
@@ -1,10 +1,6 @@
 export * from './banFromServer';
-export * from './forceActivateUser';
-export * from './getAdminNotes';
 export * from './getBanHistory';
 export * from './getWarnHistory';
 export * from './getWarnList';
-export * from './grantReplayAccess';
-export * from './updateAdminNotes';
 export * from './viewLogHistory';
 export * from './warnUser';
diff --git a/webclient/src/websocket/commands/moderator/updateAdminNotes.ts b/webclient/src/websocket/commands/moderator/updateAdminNotes.ts
deleted file mode 100644
index c7ac315c5..000000000
--- a/webclient/src/websocket/commands/moderator/updateAdminNotes.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { BackendService } from '../../services/BackendService';
-import { ModeratorPersistence } from '../../persistence';
-
-export function updateAdminNotes(userName: string, notes: string): void {
-  BackendService.sendModeratorCommand('Command_UpdateAdminNotes', { userName, notes }, {
-    onSuccess: () => {
-      ModeratorPersistence.updateAdminNotes(userName, notes);
-    },
-  });
-}
diff --git a/webclient/src/websocket/commands/moderator/viewLogHistory.ts b/webclient/src/websocket/commands/moderator/viewLogHistory.ts
index 19a930608..29e3c4bd6 100644
--- a/webclient/src/websocket/commands/moderator/viewLogHistory.ts
+++ b/webclient/src/websocket/commands/moderator/viewLogHistory.ts
@@ -1,12 +1,28 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { ModeratorPersistence } from '../../persistence';
 import { LogFilters } from 'types';
 
 export function viewLogHistory(filters: LogFilters): void {
-  BackendService.sendModeratorCommand('Command_ViewLogHistory', filters, {
-    responseName: 'Response_ViewLogHistory',
-    onSuccess: (response) => {
-      ModeratorPersistence.viewLogs(response.logMessage);
-    },
+  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
index 0e0271d4b..bef9ee003 100644
--- a/webclient/src/websocket/commands/moderator/warnUser.ts
+++ b/webclient/src/websocket/commands/moderator/warnUser.ts
@@ -1,10 +1,26 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { ModeratorPersistence } from '../../persistence';
 
-export function warnUser(userName: string, reason: string, clientid?: string, removeMessages?: number): void {
-  BackendService.sendModeratorCommand('Command_WarnUser', { userName, reason, clientid, removeMessages }, {
-    onSuccess: () => {
-      ModeratorPersistence.warnUser(userName);
-    },
+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
index 62565e0e6..e5fd66f80 100644
--- a/webclient/src/websocket/commands/room/createGame.ts
+++ b/webclient/src/websocket/commands/room/createGame.ts
@@ -1,11 +1,21 @@
-import { BackendService } from '../../services/BackendService';
 import { RoomPersistence } from '../../persistence';
+import webClient from '../../WebClient';
 import { GameConfig } from 'types';
 
 export function createGame(roomId: number, gameConfig: GameConfig): void {
-  BackendService.sendRoomCommand(roomId, 'Command_CreateGame', gameConfig, {
-    onSuccess: () => {
-      RoomPersistence.gameCreated(roomId);
-    },
+  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/joinGame.ts b/webclient/src/websocket/commands/room/joinGame.ts
index ef4b1fff2..19a672924 100644
--- a/webclient/src/websocket/commands/room/joinGame.ts
+++ b/webclient/src/websocket/commands/room/joinGame.ts
@@ -1,11 +1,21 @@
-import { BackendService } from '../../services/BackendService';
 import { RoomPersistence } from '../../persistence';
-import { JoinGameParams } from 'types';
+import webClient from '../../WebClient';
+import { GameConfig, JoinGameParams } from 'types';
 
 export function joinGame(roomId: number, joinGameParams: JoinGameParams): void {
-  BackendService.sendRoomCommand(roomId, 'Command_JoinGame', joinGameParams, {
-    onSuccess: () => {
-      RoomPersistence.joinedGame(roomId, joinGameParams.gameId);
-    },
+  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
index 7cd64a0e2..477ee39a0 100644
--- a/webclient/src/websocket/commands/room/leaveRoom.ts
+++ b/webclient/src/websocket/commands/room/leaveRoom.ts
@@ -1,10 +1,19 @@
-import { BackendService } from '../../services/BackendService';
 import { RoomPersistence } from '../../persistence';
+import webClient from '../../WebClient';
 
 export function leaveRoom(roomId: number): void {
-  BackendService.sendRoomCommand(roomId, 'Command_LeaveRoom', {}, {
-    onSuccess: () => {
-      RoomPersistence.leaveRoom(roomId);
-    },
+  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
index a429845be..c06abd3ab 100644
--- a/webclient/src/websocket/commands/room/roomSay.ts
+++ b/webclient/src/websocket/commands/room/roomSay.ts
@@ -1,4 +1,4 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 
 export function roomSay(roomId: number, message: string): void {
   const trimmed = message.trim();
@@ -7,5 +7,8 @@ export function roomSay(roomId: number, message: string): void {
     return;
   }
 
-  BackendService.sendRoomCommand(roomId, 'Command_RoomSay', { message: trimmed }, {});
+  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
index 31bf2d3f6..f9210cb9c 100644
--- a/webclient/src/websocket/commands/session/accountEdit.ts
+++ b/webclient/src/websocket/commands/session/accountEdit.ts
@@ -1,10 +1,25 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function accountEdit(passwordCheck: string, realName?: string, email?: string, country?: string): void {
-  BackendService.sendSessionCommand('Command_AccountEdit', { passwordCheck, realName, email, country }, {
-    onSuccess: () => {
-      SessionPersistence.accountEditChanged(realName, email, country);
-    },
+  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
index cd0e24403..b735696a9 100644
--- a/webclient/src/websocket/commands/session/accountImage.ts
+++ b/webclient/src/websocket/commands/session/accountImage.ts
@@ -1,10 +1,27 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
+import { common } from 'protobufjs';
+import IBytesValue = common.IBytesValue;
 
-export function accountImage(image: Uint8Array): void {
-  BackendService.sendSessionCommand('Command_AccountImage', { image }, {
-    onSuccess: () => {
-      SessionPersistence.accountImageChanged(image);
-    },
+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
index 81c7a993b..0b5ef0111 100644
--- a/webclient/src/websocket/commands/session/accountPassword.ts
+++ b/webclient/src/websocket/commands/session/accountPassword.ts
@@ -1,10 +1,19 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function accountPassword(oldPassword: string, newPassword: string, hashedNewPassword: string): void {
-  BackendService.sendSessionCommand('Command_AccountPassword', { oldPassword, newPassword, hashedNewPassword }, {
-    onSuccess: () => {
-      SessionPersistence.accountPasswordChange();
-    },
+  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
index 4cd0e8c4e..74e41afeb 100644
--- a/webclient/src/websocket/commands/session/activate.ts
+++ b/webclient/src/websocket/commands/session/activate.ts
@@ -2,8 +2,6 @@ import { AccountActivationParams } from 'store';
 import { StatusEnum, WebSocketConnectOptions } from 'types';
 
 import webClient from '../../WebClient';
-import { BackendService } from '../../services/BackendService';
-import { ProtoController } from '../../services/ProtoController';
 import { SessionPersistence } from '../../persistence';
 
 import { disconnect, login, updateStatus } from './';
@@ -11,21 +9,23 @@ import { disconnect, login, updateStatus } from './';
 export function activate(options: WebSocketConnectOptions, passwordSalt?: string): void {
   const { userName, token } = options as unknown as AccountActivationParams;
 
-  BackendService.sendSessionCommand('Command_Activate', {
+  const accountActivationConfig = {
     ...webClient.clientConfig,
     userName,
     token,
-  }, {
-    onResponseCode: {
-      [ProtoController.root.Response.ResponseCode.RespActivationAccepted]: () => {
-        SessionPersistence.accountActivationSuccess();
-        login(options, passwordSalt);
-      },
-    },
-    onError: () => {
+  };
+
+  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
index c5bc3c5f0..6696d39d4 100644
--- a/webclient/src/websocket/commands/session/addToList.ts
+++ b/webclient/src/websocket/commands/session/addToList.ts
@@ -1,4 +1,4 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function addToBuddyList(userName: string): void {
@@ -10,9 +10,16 @@ export function addToIgnoreList(userName: string): void {
 }
 
 export function addToList(list: string, userName: string): void {
-  BackendService.sendSessionCommand('Command_AddToList', { list, userName }, {
-    onSuccess: () => {
-      SessionPersistence.addToList(list, userName);
-    },
+  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/deckDel.ts b/webclient/src/websocket/commands/session/deckDel.ts
index 752ce78d5..c77d89aa3 100644
--- a/webclient/src/websocket/commands/session/deckDel.ts
+++ b/webclient/src/websocket/commands/session/deckDel.ts
@@ -1,10 +1,19 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function deckDel(deckId: number): void {
-  BackendService.sendSessionCommand('Command_DeckDel', { deckId }, {
-    onSuccess: () => {
-      SessionPersistence.deleteServerDeck(deckId);
-    },
+  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
index df5bbc223..ff4b25ec3 100644
--- a/webclient/src/websocket/commands/session/deckDelDir.ts
+++ b/webclient/src/websocket/commands/session/deckDelDir.ts
@@ -1,10 +1,19 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function deckDelDir(path: string): void {
-  BackendService.sendSessionCommand('Command_DeckDelDir', { path }, {
-    onSuccess: () => {
-      SessionPersistence.deleteServerDeckDir(path);
-    },
+  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
index 3d5a3499a..e84b8efb3 100644
--- a/webclient/src/websocket/commands/session/deckList.ts
+++ b/webclient/src/websocket/commands/session/deckList.ts
@@ -1,11 +1,22 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function deckList(): void {
-  BackendService.sendSessionCommand('Command_DeckList', {}, {
-    responseName: 'Response_DeckList',
-    onSuccess: (response) => {
-      SessionPersistence.updateServerDecks(response);
-    },
+  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
index 85ab16afb..b9bca6208 100644
--- a/webclient/src/websocket/commands/session/deckNewDir.ts
+++ b/webclient/src/websocket/commands/session/deckNewDir.ts
@@ -1,10 +1,19 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function deckNewDir(path: string, dirName: string): void {
-  BackendService.sendSessionCommand('Command_DeckNewDir', { path, dirName }, {
-    onSuccess: () => {
-      SessionPersistence.createServerDeckDir(path, dirName);
-    },
+  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
index 2679c4e8e..af526c8fc 100644
--- a/webclient/src/websocket/commands/session/deckUpload.ts
+++ b/webclient/src/websocket/commands/session/deckUpload.ts
@@ -1,11 +1,23 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function deckUpload(path: string, deckId: number, deckList: string): void {
-  BackendService.sendSessionCommand('Command_DeckUpload', { path, deckId, deckList }, {
-    responseName: 'Response_DeckUpload',
-    onSuccess: (response) => {
-      SessionPersistence.uploadServerDeck(path, response.newFile);
-    },
+  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/forgotPasswordChallenge.ts b/webclient/src/websocket/commands/session/forgotPasswordChallenge.ts
index 05af1ccf9..f6399e6a7 100644
--- a/webclient/src/websocket/commands/session/forgotPasswordChallenge.ts
+++ b/webclient/src/websocket/commands/session/forgotPasswordChallenge.ts
@@ -2,27 +2,30 @@ import { ForgotPasswordChallengeParams } from 'store';
 import { StatusEnum, WebSocketConnectOptions } from 'types';
 
 import webClient from '../../WebClient';
-import { BackendService } from '../../services/BackendService';
 import { SessionPersistence } from '../../persistence';
 import { disconnect, updateStatus } from './';
 
 export function forgotPasswordChallenge(options: WebSocketConnectOptions): void {
   const { userName, email } = options as unknown as ForgotPasswordChallengeParams;
 
-  BackendService.sendSessionCommand('Command_ForgotPasswordChallenge', {
+  const forgotPasswordChallengeConfig = {
     ...webClient.clientConfig,
     userName,
     email,
-  }, {
-    onSuccess: () => {
+  };
+
+  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();
-      disconnect();
-    },
-    onError: () => {
+    } else {
       updateStatus(StatusEnum.DISCONNECTED, null);
       SessionPersistence.resetPasswordFailed();
-      disconnect();
-    },
+    }
+
+    disconnect();
   });
 }
diff --git a/webclient/src/websocket/commands/session/forgotPasswordRequest.ts b/webclient/src/websocket/commands/session/forgotPasswordRequest.ts
index 23d301450..5e5fe3bbd 100644
--- a/webclient/src/websocket/commands/session/forgotPasswordRequest.ts
+++ b/webclient/src/websocket/commands/session/forgotPasswordRequest.ts
@@ -2,7 +2,6 @@ import { ForgotPasswordParams } from 'store';
 import { StatusEnum, WebSocketConnectOptions } from 'types';
 
 import webClient from '../../WebClient';
-import { BackendService } from '../../services/BackendService';
 import { SessionPersistence } from '../../persistence';
 
 import { disconnect, updateStatus } from './';
@@ -10,25 +9,30 @@ import { disconnect, updateStatus } from './';
 export function forgotPasswordRequest(options: WebSocketConnectOptions): void {
   const { userName } = options as unknown as ForgotPasswordParams;
 
-  BackendService.sendSessionCommand('Command_ForgotPasswordRequest', {
+  const forgotPasswordConfig = {
     ...webClient.clientConfig,
     userName,
-  }, {
-    responseName: 'Response_ForgotPasswordRequest',
-    onSuccess: (resp) => {
-      if (resp?.challengeEmail) {
+  };
+
+  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();
       }
-      disconnect();
-    },
-    onError: () => {
+    } else {
       updateStatus(StatusEnum.DISCONNECTED, null);
       SessionPersistence.resetPasswordFailed();
-      disconnect();
-    },
+    }
+
+    disconnect();
   });
 }
diff --git a/webclient/src/websocket/commands/session/forgotPasswordReset.ts b/webclient/src/websocket/commands/session/forgotPasswordReset.ts
index d9a775816..9312b71af 100644
--- a/webclient/src/websocket/commands/session/forgotPasswordReset.ts
+++ b/webclient/src/websocket/commands/session/forgotPasswordReset.ts
@@ -2,7 +2,6 @@ import { ForgotPasswordResetParams } from 'store';
 import { StatusEnum, WebSocketConnectOptions } from 'types';
 
 import webClient from '../../WebClient';
-import { BackendService } from '../../services/BackendService';
 import { SessionPersistence } from '../../persistence';
 import { hashPassword } from '../../utils';
 
@@ -11,28 +10,30 @@ import { disconnect, updateStatus } from '.';
 export function forgotPasswordReset(options: WebSocketConnectOptions, passwordSalt?: string): void {
   const { userName, token, newPassword } = options as unknown as ForgotPasswordResetParams;
 
-  const params: any = {
+  const forgotPasswordResetConfig: any = {
     ...webClient.clientConfig,
     userName,
     token,
   };
 
   if (passwordSalt) {
-    params.hashedNewPassword = hashPassword(passwordSalt, newPassword);
+    forgotPasswordResetConfig.hashedNewPassword = hashPassword(passwordSalt, newPassword);
   } else {
-    params.newPassword = newPassword;
+    forgotPasswordResetConfig.newPassword = newPassword;
   }
 
-  BackendService.sendSessionCommand('Command_ForgotPasswordReset', params, {
-    onSuccess: () => {
+  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();
-      disconnect();
-    },
-    onError: () => {
+    } else {
       updateStatus(StatusEnum.DISCONNECTED, null);
       SessionPersistence.resetPasswordFailed();
-      disconnect();
-    },
+    }
+
+    disconnect();
   });
 }
diff --git a/webclient/src/websocket/commands/session/getGamesOfUser.ts b/webclient/src/websocket/commands/session/getGamesOfUser.ts
index 8fb8aeb5b..507ba3e20 100644
--- a/webclient/src/websocket/commands/session/getGamesOfUser.ts
+++ b/webclient/src/websocket/commands/session/getGamesOfUser.ts
@@ -1,11 +1,26 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function getGamesOfUser(userName: string): void {
-  BackendService.sendSessionCommand('Command_GetGamesOfUser', { userName }, {
-    responseName: 'Response_GetGamesOfUser',
-    onSuccess: (response) => {
-      SessionPersistence.getGamesOfUser(userName, response);
-    },
+  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
index 5b0f178ae..709cc0baa 100644
--- a/webclient/src/websocket/commands/session/getUserInfo.ts
+++ b/webclient/src/websocket/commands/session/getUserInfo.ts
@@ -1,11 +1,26 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function getUserInfo(userName: string): void {
-  BackendService.sendSessionCommand('Command_GetUserInfo', { userName }, {
-    responseName: 'Response_GetUserInfo',
-    onSuccess: (response) => {
-      SessionPersistence.getUserInfo(response.userInfo);
-    },
+  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
index 74d0d062c..829a74b71 100644
--- a/webclient/src/websocket/commands/session/index.ts
+++ b/webclient/src/websocket/commands/session/index.ts
@@ -6,11 +6,12 @@ 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 './forgotPasswordChallenge'
 export * from './forgotPasswordRequest';
 export * from './forgotPasswordReset';
 export * from './getGamesOfUser';
@@ -23,8 +24,12 @@ export * from './message';
 export * from './ping';
 export * from './register';
 export * from './removeFromList';
-export * from './replayDeleteMatch';
-export * from './replayList';
-export * from './replayModifyMatch';
 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
index be79976a0..9f4699708 100644
--- a/webclient/src/websocket/commands/session/joinRoom.ts
+++ b/webclient/src/websocket/commands/session/joinRoom.ts
@@ -1,11 +1,37 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { RoomPersistence } from '../../persistence';
 
 export function joinRoom(roomId: number): void {
-  BackendService.sendSessionCommand('Command_JoinRoom', { roomId }, {
-    responseName: 'Response_JoinRoom',
-    onSuccess: (response) => {
-      RoomPersistence.joinRoom(response.roomInfo);
-    },
+  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
index 367dada9b..b1e31621f 100644
--- a/webclient/src/websocket/commands/session/listRooms.ts
+++ b/webclient/src/websocket/commands/session/listRooms.ts
@@ -1,5 +1,8 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 
 export function listRooms(): void {
-  BackendService.sendSessionCommand('Command_ListRooms', {}, {});
+  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
index 9b95c1344..027a251d4 100644
--- a/webclient/src/websocket/commands/session/listUsers.ts
+++ b/webclient/src/websocket/commands/session/listUsers.ts
@@ -1,11 +1,23 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function listUsers(): void {
-  BackendService.sendSessionCommand('Command_ListUsers', {}, {
-    responseName: 'Response_ListUsers',
-    onSuccess: (response) => {
-      SessionPersistence.updateUsers(response.userList);
-    },
+  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
index 6f3ec5ef5..db24b4f46 100644
--- a/webclient/src/websocket/commands/session/login.ts
+++ b/webclient/src/websocket/commands/session/login.ts
@@ -1,7 +1,5 @@
 import { StatusEnum, WebSocketConnectOptions } from 'types';
 import webClient from '../../WebClient';
-import { BackendService } from '../../services/BackendService';
-import { ProtoController } from '../../services/ProtoController';
 import { hashPassword } from '../../utils';
 import { SessionPersistence } from '../../persistence';
 
@@ -27,18 +25,13 @@ export function login(options: WebSocketConnectOptions, passwordSalt?: string):
     loginConfig.password = password;
   }
 
-  const { ResponseCode } = ProtoController.root.Response;
+  const command = webClient.protobuf.controller.Command_Login.create(loginConfig);
+  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_Login.ext': command });
 
-  const onLoginError = (message: string, extra?: () => void) => {
-    updateStatus(StatusEnum.DISCONNECTED, message);
-    extra?.();
-    SessionPersistence.loginFailed();
-    disconnect();
-  };
+  webClient.protobuf.sendSessionCommand(sc, raw => {
+    const resp = raw['.Response_Login.ext'];
 
-  BackendService.sendSessionCommand('Command_Login', loginConfig, {
-    responseName: 'Response_Login',
-    onSuccess: (resp) => {
+    if (raw.responseCode === webClient.protobuf.controller.Response.ResponseCode.RespOk) {
       const { buddyList, ignoreList, userInfo } = resp;
 
       SessionPersistence.updateBuddyList(buddyList);
@@ -50,30 +43,50 @@ export function login(options: WebSocketConnectOptions, passwordSalt?: string):
       listRooms();
 
       updateStatus(StatusEnum.LOGGED_IN, 'Logged in.');
-    },
-    onResponseCode: {
-      [ResponseCode.RespClientUpdateRequired]: () =>
-        onLoginError('Login failed: missing features'),
-      [ResponseCode.RespWrongPassword]: () =>
-        onLoginError('Login failed: incorrect username or password'),
-      [ResponseCode.RespUsernameInvalid]: () =>
-        onLoginError('Login failed: incorrect username or password'),
-      [ResponseCode.RespWouldOverwriteOldSession]: () =>
-        onLoginError('Login failed: duplicated user session'),
-      [ResponseCode.RespUserIsBanned]: () =>
-        onLoginError('Login failed: banned user'),
-      [ResponseCode.RespRegistrationRequired]: () =>
-        onLoginError('Login failed: registration required'),
-      [ResponseCode.RespClientIdRequired]: () =>
-        onLoginError('Login failed: missing client ID'),
-      [ResponseCode.RespContextError]: () =>
-        onLoginError('Login failed: server error'),
-      [ResponseCode.RespAccountNotActivated]: () =>
-        onLoginError('Login failed: account not activated',
-          () => SessionPersistence.accountAwaitingActivation(options)
-        ),
-    },
-    onError: (responseCode) =>
-      onLoginError(`Login failed: unknown error: ${responseCode}`),
+
+      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
index 075fc3c4b..99b615562 100644
--- a/webclient/src/websocket/commands/session/message.ts
+++ b/webclient/src/websocket/commands/session/message.ts
@@ -1,10 +1,31 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function message(userName: string, message: string): void {
-  BackendService.sendSessionCommand('Command_Message', { userName, message }, {
-    onSuccess: () => {
-      SessionPersistence.directMessageSent(userName, message);
-    },
+  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
index fea2784a2..795e0f71f 100644
--- a/webclient/src/websocket/commands/session/ping.ts
+++ b/webclient/src/websocket/commands/session/ping.ts
@@ -1,7 +1,8 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 
 export function ping(pingReceived: Function): void {
-  BackendService.sendSessionCommand('Command_Ping', {}, {
-    onResponse: (raw) => pingReceived(raw),
-  });
+  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
index a25b85868..45b2fa977 100644
--- a/webclient/src/websocket/commands/session/register.ts
+++ b/webclient/src/websocket/commands/session/register.ts
@@ -1,18 +1,17 @@
 import { ServerRegisterParams } from 'store';
-import { StatusEnum, WebSocketConnectOptions } from 'types';
+import { WebSocketConnectOptions } from 'types';
 
 import webClient from '../../WebClient';
-import { BackendService } from '../../services/BackendService';
-import { ProtoController } from '../../services/ProtoController';
 import { SessionPersistence } from '../../persistence';
 import { hashPassword } from '../../utils';
+import NormalizeService from '../../utils/NormalizeService';
 
-import { login, disconnect, updateStatus } from './';
+import { login, disconnect } from './';
 
 export function register(options: WebSocketConnectOptions, passwordSalt?: string): void {
   const { userName, password, email, country, realName } = options as ServerRegisterParams;
 
-  const params: any = {
+  const registerConfig: any = {
     ...webClient.clientConfig,
     userName,
     email,
@@ -21,57 +20,55 @@ export function register(options: WebSocketConnectOptions, passwordSalt?: string
   };
 
   if (passwordSalt) {
-    params.hashedPassword = hashPassword(passwordSalt, password);
+    registerConfig.hashedPassword = hashPassword(passwordSalt, password);
   } else {
-    params.password = password;
+    registerConfig.password = password;
   }
 
-  const { ResponseCode } = ProtoController.root.Response;
+  const command = webClient.protobuf.controller.Command_Register.create(registerConfig);
+  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_Register.ext': command });
 
-  const onRegistrationError = (action: () => void) => {
-    action();
-    updateStatus(StatusEnum.DISCONNECTED, 'Registration failed');
-    disconnect();
-  };
+  webClient.protobuf.sendSessionCommand(sc, raw => {
+    if (raw.responseCode === webClient.protobuf.controller.Response.ResponseCode.RespRegistrationAccepted) {
+      login(options, passwordSalt);
+      SessionPersistence.registrationSuccess()
+      return;
+    }
 
-  BackendService.sendSessionCommand('Command_Register', params, {
-    onResponseCode: {
-      [ResponseCode.RespRegistrationAccepted]: () => {
-        login(options, passwordSalt);
-        SessionPersistence.registrationSuccess();
-      },
-      [ResponseCode.RespRegistrationAcceptedNeedsActivation]: () => {
-        updateStatus(StatusEnum.DISCONNECTED, 'Registration accepted, awaiting activation');
+    switch (raw.responseCode) {
+      case webClient.protobuf.controller.Response.ResponseCode.RespRegistrationAcceptedNeedsActivation:
         SessionPersistence.accountAwaitingActivation(options);
-        disconnect();
-      },
-      [ResponseCode.RespUserAlreadyExists]: () => onRegistrationError(
-        () => SessionPersistence.registrationUserNameError('Username is taken')
-      ),
-      [ResponseCode.RespUsernameInvalid]: () => onRegistrationError(
-        () => SessionPersistence.registrationUserNameError('Invalid username')
-      ),
-      [ResponseCode.RespPasswordTooShort]: () => onRegistrationError(
-        () => SessionPersistence.registrationPasswordError('Your password was too short')
-      ),
-      [ResponseCode.RespEmailRequiredToRegister]: () => onRegistrationError(
-        () => SessionPersistence.registrationRequiresEmail()
-      ),
-      [ResponseCode.RespEmailBlackListed]: () => onRegistrationError(
-        () => SessionPersistence.registrationEmailError('This email provider has been blocked')
-      ),
-      [ResponseCode.RespTooManyRequests]: () => onRegistrationError(
-        () => SessionPersistence.registrationEmailError('Max accounts reached for this email')
-      ),
-      [ResponseCode.RespRegistrationDisabled]: () => onRegistrationError(
-        () => SessionPersistence.registrationFailed('Registration is currently disabled')
-      ),
-      [ResponseCode.RespUserIsBanned]: (raw) => onRegistrationError(
-        () => SessionPersistence.registrationFailed(raw.reasonStr, raw.endTime)
-      ),
-    },
-    onError: () => onRegistrationError(
-      () => SessionPersistence.registrationFailed('Registration failed due to a server issue')
-    ),
+        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
index aede49c49..222d9c57d 100644
--- a/webclient/src/websocket/commands/session/removeFromList.ts
+++ b/webclient/src/websocket/commands/session/removeFromList.ts
@@ -1,4 +1,4 @@
-import { BackendService } from '../../services/BackendService';
+import webClient from '../../WebClient';
 import { SessionPersistence } from '../../persistence';
 
 export function removeFromBuddyList(userName: string): void {
@@ -10,9 +10,16 @@ export function removeFromIgnoreList(userName: string): void {
 }
 
 export function removeFromList(list: string, userName: string): void {
-  BackendService.sendSessionCommand('Command_RemoveFromList', { list, userName }, {
-    onSuccess: () => {
-      SessionPersistence.removeFromList(list, userName);
-    },
+  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/replayDeleteMatch.ts b/webclient/src/websocket/commands/session/replayDeleteMatch.ts
deleted file mode 100644
index 24ac48f1c..000000000
--- a/webclient/src/websocket/commands/session/replayDeleteMatch.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { BackendService } from '../../services/BackendService';
-import { SessionPersistence } from '../../persistence';
-
-export function replayDeleteMatch(gameId: number): void {
-  BackendService.sendSessionCommand('Command_ReplayDeleteMatch', { gameId }, {
-    onSuccess: () => {
-      SessionPersistence.replayDeleteMatch(gameId);
-    },
-  });
-}
diff --git a/webclient/src/websocket/commands/session/replayList.ts b/webclient/src/websocket/commands/session/replayList.ts
deleted file mode 100644
index f39eb279f..000000000
--- a/webclient/src/websocket/commands/session/replayList.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BackendService } from '../../services/BackendService';
-import { SessionPersistence } from '../../persistence';
-
-export function replayList(): void {
-  BackendService.sendSessionCommand('Command_ReplayList', {}, {
-    responseName: 'Response_ReplayList',
-    onSuccess: (response) => {
-      SessionPersistence.replayList(response.matchList);
-    },
-  });
-}
diff --git a/webclient/src/websocket/commands/session/replayModifyMatch.ts b/webclient/src/websocket/commands/session/replayModifyMatch.ts
deleted file mode 100644
index 9825047f3..000000000
--- a/webclient/src/websocket/commands/session/replayModifyMatch.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { BackendService } from '../../services/BackendService';
-import { SessionPersistence } from '../../persistence';
-
-export function replayModifyMatch(gameId: number, doNotHide: boolean): void {
-  BackendService.sendSessionCommand('Command_ReplayModifyMatch', { gameId, doNotHide }, {
-    onSuccess: () => {
-      SessionPersistence.replayModifyMatch(gameId, doNotHide);
-    },
-  });
-}
diff --git a/webclient/src/websocket/commands/session/requestPasswordSalt.ts b/webclient/src/websocket/commands/session/requestPasswordSalt.ts
index a3d1fc05c..b7ab5ef92 100644
--- a/webclient/src/websocket/commands/session/requestPasswordSalt.ts
+++ b/webclient/src/websocket/commands/session/requestPasswordSalt.ts
@@ -2,8 +2,6 @@ import { RequestPasswordSaltParams } from 'store';
 import { StatusEnum, WebSocketConnectOptions, WebSocketConnectReason } from 'types';
 
 import webClient from '../../WebClient';
-import { BackendService } from '../../services/BackendService';
-import { ProtoController } from '../../services/ProtoController';
 import { SessionPersistence } from '../../persistence';
 
 import {
@@ -17,48 +15,64 @@ import {
 export function requestPasswordSalt(options: WebSocketConnectOptions): void {
   const { userName } = options as RequestPasswordSaltParams;
 
-  const onFailure = () => {
-    switch (options.reason) {
-      case WebSocketConnectReason.ACTIVATE_ACCOUNT:
-        SessionPersistence.accountActivationFailed();
-        break;
-      case WebSocketConnectReason.PASSWORD_RESET:
-        SessionPersistence.resetPasswordFailed();
-        break;
-      default:
-        SessionPersistence.loginFailed();
-    }
-    disconnect();
-  };
-
-  BackendService.sendSessionCommand('Command_RequestPasswordSalt', {
+  const registerConfig = {
     ...webClient.clientConfig,
     userName,
-  }, {
-    responseName: 'Response_PasswordSalt',
-    onSuccess: (resp) => {
-      const passwordSalt = resp?.passwordSalt;
+  };
 
-      switch (options.reason) {
-        case WebSocketConnectReason.ACTIVATE_ACCOUNT:
-          activate(options, passwordSalt);
-          break;
-        case WebSocketConnectReason.PASSWORD_RESET:
-          forgotPasswordReset(options, passwordSalt);
-          break;
-        default:
-          login(options, passwordSalt);
+  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;
       }
-    },
-    onResponseCode: {
-      [ProtoController.root.Response.ResponseCode.RespRegistrationRequired]: () => {
+      case webClient.protobuf.controller.Response.ResponseCode.RespRegistrationRequired: {
         updateStatus(StatusEnum.DISCONNECTED, 'Login failed: registration required');
-        onFailure();
-      },
-    },
-    onError: () => {
-      updateStatus(StatusEnum.DISCONNECTED, 'Login failed: Unknown Reason');
-      onFailure();
-    },
+        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/events/game/index.ts b/webclient/src/websocket/events/game/index.ts
index a7b3277a5..895eadfef 100644
--- a/webclient/src/websocket/events/game/index.ts
+++ b/webclient/src/websocket/events/game/index.ts
@@ -4,8 +4,8 @@ import { leaveGame } from './leaveGame';
 
 
 export const GameEvents: ProtobufEvents = {
-  '.Event_Join.ext': joinGame,
-  '.Event_Leave.ext': leaveGame,
+  '.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'),
diff --git a/webclient/src/websocket/events/session/connectionClosed.ts b/webclient/src/websocket/events/session/connectionClosed.ts
index 227113059..9c39db940 100644
--- a/webclient/src/websocket/events/session/connectionClosed.ts
+++ b/webclient/src/websocket/events/session/connectionClosed.ts
@@ -1,5 +1,5 @@
 import { StatusEnum } from 'types';
-import { ProtoController } from '../../services/ProtoController';
+import webClient from '../../WebClient';
 import { updateStatus } from '../../commands/session';
 import { ConnectionClosedData } from './interfaces';
 
@@ -10,30 +10,29 @@ export function connectionClosed({ reason, reasonStr }: ConnectionClosedData): v
   if (reasonStr) {
     message = reasonStr;
   } else {
-    const { CloseReason } = ProtoController.root.Event_ConnectionClosed;
     switch (reason) {
-      case CloseReason.USER_LIMIT_REACHED:
+      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.USER_LIMIT_REACHED:
         message = 'The server has reached its maximum user capacity';
         break;
-      case CloseReason.TOO_MANY_CONNECTIONS:
+      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.TOO_MANY_CONNECTIONS:
         message = 'There are too many concurrent connections from your address';
         break;
-      case CloseReason.BANNED:
+      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.BANNED:
         message = 'You are banned';
         break;
-      case CloseReason.DEMOTED:
+      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.DEMOTED:
         message = 'You were demoted';
         break;
-      case CloseReason.SERVER_SHUTDOWN:
+      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.SERVER_SHUTDOWN:
         message = 'Scheduled server shutdown';
         break;
-      case CloseReason.USERNAMEINVALID:
+      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.USERNAMEINVALID:
         message = 'Invalid username';
         break;
-      case CloseReason.LOGGEDINELSEWERE:
+      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.LOGGEDINELSEWERE:
         message = 'You have been logged out due to logging in at another location';
         break;
-      case CloseReason.OTHER:
+      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.OTHER:
       default:
         message = 'Unknown reason';
         break;
diff --git a/webclient/src/websocket/events/session/index.ts b/webclient/src/websocket/events/session/index.ts
index 5b3ab198e..9fe7bb1da 100644
--- a/webclient/src/websocket/events/session/index.ts
+++ b/webclient/src/websocket/events/session/index.ts
@@ -3,9 +3,8 @@ 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 { replayAdded } from './replayAdded';
-import { serverCompleteList } from './serverCompleteList';
 import { serverIdentification } from './serverIdentification';
 import { serverMessage } from './serverMessage';
 import { serverShutdown } from './serverShutdown';
@@ -21,8 +20,8 @@ export const SessionEvents: ProtobufEvents = {
   '.Event_ListRooms.ext': listRooms,
   '.Event_NotifyUser.ext': notifyUser,
   '.Event_RemoveFromList.ext': removeFromList,
-  '.Event_ReplayAdded.ext': replayAdded,
-  '.Event_ServerCompleteList.ext': serverCompleteList,
+  '.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,
diff --git a/webclient/src/websocket/events/session/interfaces.ts b/webclient/src/websocket/events/session/interfaces.ts
index ddc10d103..8a1827cbd 100644
--- a/webclient/src/websocket/events/session/interfaces.ts
+++ b/webclient/src/websocket/events/session/interfaces.ts
@@ -1,4 +1,4 @@
-import { Game, NotificationType, ReplayMatch, Room, User } from 'types';
+import { Game, NotificationType, Room, User } from 'types';
 
 export interface AddToListData {
   listName: string;
@@ -13,8 +13,6 @@ export interface ConnectionClosedData {
 
 export interface GameJoinedData {
   gameInfo: Game;
-  gameTypes: any[];
-  hostId: number;
   playerId: number;
   spectator: boolean;
   resuming: boolean;
@@ -78,13 +76,3 @@ export interface UserMessageData {
   receiverName: string;
   message: string;
 }
-
-export interface ReplayAddedData {
-  matchInfo: ReplayMatch;
-}
-
-export interface ServerCompleteListData {
-  serverId: number;
-  userList: User[];
-  roomList: Room[];
-}
diff --git a/webclient/src/websocket/events/session/replayAdded.ts b/webclient/src/websocket/events/session/replayAdded.ts
deleted file mode 100644
index 18a4ea82d..000000000
--- a/webclient/src/websocket/events/session/replayAdded.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { SessionPersistence } from '../../persistence';
-import { ReplayAddedData } from './interfaces';
-
-export function replayAdded({ matchInfo }: ReplayAddedData): void {
-  SessionPersistence.replayAdded(matchInfo);
-}
diff --git a/webclient/src/websocket/events/session/serverCompleteList.ts b/webclient/src/websocket/events/session/serverCompleteList.ts
deleted file mode 100644
index 77d37a31e..000000000
--- a/webclient/src/websocket/events/session/serverCompleteList.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { RoomPersistence, SessionPersistence } from '../../persistence';
-import { ServerCompleteListData } from './interfaces';
-
-export function serverCompleteList({ userList, roomList }: ServerCompleteListData): void {
-  SessionPersistence.updateUsers(userList);
-  RoomPersistence.updateRooms(roomList);
-}
diff --git a/webclient/src/websocket/events/session/serverIdentification.ts b/webclient/src/websocket/events/session/serverIdentification.ts
index 87ae79453..ce89e1f3c 100644
--- a/webclient/src/websocket/events/session/serverIdentification.ts
+++ b/webclient/src/websocket/events/session/serverIdentification.ts
@@ -1,4 +1,4 @@
-import { StatusEnum, WebSocketConnectOptions, WebSocketConnectReason } from 'types';
+import { StatusEnum, WebSocketConnectReason } from 'types';
 
 import webClient from '../../WebClient';
 import {
@@ -24,48 +24,48 @@ export function serverIdentification(info: ServerIdentificationData): void {
     return;
   }
 
-  const getPasswordSalt = passwordSaltSupported(serverOptions);
-  const connectOptions = { ...webClient.options };
+  const getPasswordSalt = passwordSaltSupported(serverOptions, webClient);
+  const { options } = webClient;
 
-  switch (connectOptions.reason) {
+  switch (options.reason) {
     case WebSocketConnectReason.LOGIN:
       updateStatus(StatusEnum.LOGGING_IN, 'Logging In...');
       if (getPasswordSalt) {
-        requestPasswordSalt(connectOptions);
+        requestPasswordSalt(options);
       } else {
-        login(connectOptions);
+        login(options);
       }
       break;
     case WebSocketConnectReason.REGISTER:
       const passwordSalt = getPasswordSalt ? generateSalt() : null;
-      register(connectOptions, passwordSalt);
+      register(options, passwordSalt);
       break;
     case WebSocketConnectReason.ACTIVATE_ACCOUNT:
       if (getPasswordSalt) {
-        requestPasswordSalt(connectOptions);
+        requestPasswordSalt(options);
       } else {
-        activate(connectOptions);
+        activate(options);
       }
       break;
     case WebSocketConnectReason.PASSWORD_RESET_REQUEST:
-      forgotPasswordRequest(connectOptions);
+      forgotPasswordRequest(options);
       break;
     case WebSocketConnectReason.PASSWORD_RESET_CHALLENGE:
-      forgotPasswordChallenge(connectOptions);
+      forgotPasswordChallenge(options);
       break;
     case WebSocketConnectReason.PASSWORD_RESET:
       if (getPasswordSalt) {
-        requestPasswordSalt(connectOptions);
+        requestPasswordSalt(options);
       } else {
-        forgotPasswordReset(connectOptions);
+        forgotPasswordReset(options);
       }
       break;
     default:
-      updateStatus(StatusEnum.DISCONNECTED, 'Unknown Connection Reason: ' + connectOptions.reason);
+      updateStatus(StatusEnum.DISCONNECTED, 'Unknown Connection Reason: ' + options.reason);
       disconnect();
       break;
   }
 
-  webClient.options = {} as WebSocketConnectOptions;
+  webClient.options = {};
   SessionPersistence.updateInfo(serverName, serverVersion);
 }
diff --git a/webclient/src/websocket/persistence/AdminPersistence.ts b/webclient/src/websocket/persistence/AdminPresistence.ts
similarity index 100%
rename from webclient/src/websocket/persistence/AdminPersistence.ts
rename to webclient/src/websocket/persistence/AdminPresistence.ts
diff --git a/webclient/src/websocket/persistence/ModeratorPersistence.ts b/webclient/src/websocket/persistence/ModeratorPresistence.ts
similarity index 61%
rename from webclient/src/websocket/persistence/ModeratorPersistence.ts
rename to webclient/src/websocket/persistence/ModeratorPresistence.ts
index d1b991fa0..e6a57f601 100644
--- a/webclient/src/websocket/persistence/ModeratorPersistence.ts
+++ b/webclient/src/websocket/persistence/ModeratorPresistence.ts
@@ -27,20 +27,4 @@ export class ModeratorPersistence {
   static warnUser(userName: string): void {
     ServerDispatch.warnUser(userName);
   }
-
-  static grantReplayAccess(replayId: number, moderatorName: string): void {
-    ServerDispatch.grantReplayAccess(replayId, moderatorName);
-  }
-
-  static forceActivateUser(usernameToActivate: string, moderatorName: string): void {
-    ServerDispatch.forceActivateUser(usernameToActivate, moderatorName);
-  }
-
-  static getAdminNotes(userName: string, notes: string): void {
-    ServerDispatch.getAdminNotes(userName, notes);
-  }
-
-  static updateAdminNotes(userName: string, notes: string): void {
-    ServerDispatch.updateAdminNotes(userName, notes);
-  }
 }
diff --git a/webclient/src/websocket/persistence/SessionPersistence.ts b/webclient/src/websocket/persistence/SessionPersistence.ts
index 9962af968..c9248745c 100644
--- a/webclient/src/websocket/persistence/SessionPersistence.ts
+++ b/webclient/src/websocket/persistence/SessionPersistence.ts
@@ -1,5 +1,5 @@
 import { ServerDispatch } from 'store';
-import { DeckList, DeckStorageTreeItem, ReplayMatch, StatusEnum, User, WebSocketConnectOptions } from 'types';
+import { DeckStorageTreeItem, StatusEnum, User, WebSocketConnectOptions } from 'types';
 
 import { sanitizeHtml } from 'websocket/utils';
 import {
@@ -10,6 +10,9 @@ import {
   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() {
@@ -162,7 +165,7 @@ export class SessionPersistence {
     ServerDispatch.accountEditChanged({ realName, email, country });
   }
 
-  static accountImageChanged(avatarBmp: Uint8Array): void {
+  static accountImageChanged(avatarBmp: IBytesValue): void {
     ServerDispatch.accountImageChanged({ avatarBmp });
   }
 
@@ -175,8 +178,7 @@ export class SessionPersistence {
   }
 
   static getGamesOfUser(userName: string, response: any): void {
-    // Response_GetGamesOfUser contains a gameList field — log for now until game layer is complete
-    console.log('getGamesOfUser', userName, response);
+    console.log('getGamesOfUser');
   }
 
   static gameJoined(gameJoinedData: GameJoinedData): void {
@@ -207,40 +209,28 @@ export class SessionPersistence {
     ServerDispatch.removeFromList(list, userName);
   }
 
-  static deleteServerDeck(deckId: number): void {
-    ServerDispatch.deckDelete(deckId);
+  static deckDelete(deckId: number): void {
+    console.log('deckDelete', deckId);
   }
 
-  static updateServerDecks(deckList: DeckList): void {
-    ServerDispatch.backendDecks(deckList);
+  static deckDeleteDir(path: string): void {
+    console.log('deckDeleteDir', path);
   }
 
-  static uploadServerDeck(path: string, treeItem: DeckStorageTreeItem): void {
-    ServerDispatch.deckUpload(path, treeItem);
+  static deckDownload(deckId: number): void {
+    console.log('deckDownload', deckId);
   }
 
-  static createServerDeckDir(path: string, dirName: string): void {
-    ServerDispatch.deckNewDir(path, dirName);
+  static deckList(deckList: DeckList): void {
+    console.log('deckList', deckList);
   }
 
-  static deleteServerDeckDir(path: string): void {
-    ServerDispatch.deckDelDir(path);
+  static deckNewDir(path: string, dirName: string): void {
+    console.log('deckNewDir', path, dirName);
   }
 
-  static replayList(matchList: ReplayMatch[]): void {
-    ServerDispatch.replayList(matchList);
-  }
-
-  static replayAdded(matchInfo: ReplayMatch): void {
-    ServerDispatch.replayAdded(matchInfo);
-  }
-
-  static replayModifyMatch(gameId: number, doNotHide: boolean): void {
-    ServerDispatch.replayModifyMatch(gameId, doNotHide);
-  }
-
-  static replayDeleteMatch(gameId: number): void {
-    ServerDispatch.replayDeleteMatch(gameId);
+  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
index a1e34fffa..f4df52645 100644
--- a/webclient/src/websocket/persistence/index.ts
+++ b/webclient/src/websocket/persistence/index.ts
@@ -1,5 +1,5 @@
-export { AdminPersistence } from './AdminPersistence';
+export { AdminPersistence } from './AdminPresistence';
 export { RoomPersistence } from './RoomPersistence';
 export { SessionPersistence } from './SessionPersistence';
-export { ModeratorPersistence } from './ModeratorPersistence';
+export { ModeratorPersistence } from './ModeratorPresistence';
 export { GamePersistence } from './GamePersistence';
diff --git a/webclient/src/websocket/services/BackendService.ts b/webclient/src/websocket/services/BackendService.ts
deleted file mode 100644
index fce741d35..000000000
--- a/webclient/src/websocket/services/BackendService.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import webClient from '../WebClient';
-import { ProtoController } from './ProtoController';
-
-export interface CommandOptions {
-  responseName?: string;
-  onSuccess?: (response: any, raw: any) => void;
-  onError?: (responseCode: number, raw: any) => void;
-  onResponseCode?: { [code: number]: (raw: any) => void };
-  onResponse?: (raw: any) => void;
-}
-
-export class BackendService {
-  static sendSessionCommand(commandName: string, params: any, options: CommandOptions): void {
-    const command = ProtoController.root[commandName].create(params || {});
-    const sc = ProtoController.root.SessionCommand.create({
-      [`.${commandName}.ext`]: command,
-    });
-    webClient.protobuf.sendSessionCommand(sc, raw => {
-      BackendService.handleResponse(commandName, raw, options);
-    });
-  }
-
-  static sendRoomCommand(roomId: number, commandName: string, params: any, options: CommandOptions): void {
-    const command = ProtoController.root[commandName].create(params || {});
-    const rc = ProtoController.root.RoomCommand.create({
-      [`.${commandName}.ext`]: command,
-    });
-    webClient.protobuf.sendRoomCommand(roomId, rc, raw => {
-      BackendService.handleResponse(commandName, raw, options);
-    });
-  }
-
-  static sendModeratorCommand(commandName: string, params: any, options: CommandOptions): void {
-    const command = ProtoController.root[commandName].create(params || {});
-    const mc = ProtoController.root.ModeratorCommand.create({
-      [`.${commandName}.ext`]: command,
-    });
-    webClient.protobuf.sendModeratorCommand(mc, raw => {
-      BackendService.handleResponse(commandName, raw, options);
-    });
-  }
-
-  static sendAdminCommand(commandName: string, params: any, options: CommandOptions): void {
-    const command = ProtoController.root[commandName].create(params || {});
-    const ac = ProtoController.root.AdminCommand.create({
-      [`.${commandName}.ext`]: command,
-    });
-    webClient.protobuf.sendAdminCommand(ac, raw => {
-      BackendService.handleResponse(commandName, raw, options);
-    });
-  }
-
-  private static handleResponse(commandName: string, raw: any, options: CommandOptions): void {
-    if (options.onResponse) {
-      options.onResponse(raw);
-      return;
-    }
-
-    const { responseCode } = raw;
-
-    if (responseCode === ProtoController.root.Response.ResponseCode.RespOk) {
-      if (options.onSuccess) {
-        const response = options.responseName
-          ? raw[`.${options.responseName}.ext`]
-          : raw;
-        options.onSuccess(response, raw);
-      }
-      return;
-    }
-
-    if (options.onResponseCode?.[responseCode]) {
-      options.onResponseCode[responseCode](raw);
-      return;
-    }
-
-    if (options.onError) {
-      options.onError(responseCode, raw);
-    } else {
-      console.error(`${commandName} failed with response code: ${responseCode}`);
-    }
-  }
-}
diff --git a/webclient/src/websocket/services/ProtoController.ts b/webclient/src/websocket/services/ProtoController.ts
deleted file mode 100644
index 130d5e196..000000000
--- a/webclient/src/websocket/services/ProtoController.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import protobuf from 'protobufjs';
-
-import { SessionPersistence } from '../persistence';
-import ProtoFiles from '../../proto-files.json';
-
-const PB_FILE_DIR = `${process.env.PUBLIC_URL}/pb`;
-
-// Leaf module — no imports from the websocket layer other than persistence.
-// Both BackendService and ProtobufService import this; neither should import
-// the other for controller access, avoiding circular dependency cycles.
-export const ProtoController = {
-  root: null as any,
-
-  load(): void {
-    const files = ProtoFiles.map(file => `${PB_FILE_DIR}/${file}`);
-    ProtoController.root = new protobuf.Root();
-    ProtoController.root.load(files, { keepCase: false }, (err: Error) => {
-      if (err) {
-        throw err;
-      }
-      SessionPersistence.initialized();
-    });
-  },
-};
diff --git a/webclient/src/websocket/services/ProtobufService.ts b/webclient/src/websocket/services/ProtobufService.ts
index 20c4e8599..341bbeae3 100644
--- a/webclient/src/websocket/services/ProtobufService.ts
+++ b/webclient/src/websocket/services/ProtobufService.ts
@@ -1,13 +1,19 @@
+import protobuf from 'protobufjs';
+
 import { CommonEvents, GameEvents, RoomEvents, SessionEvents } from '../events';
+import { SessionPersistence } from '../persistence';
 import { WebClient } from '../WebClient';
 import { SessionCommands } from 'websocket';
-import { ProtoController } from './ProtoController';
+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 } = {};
 
@@ -15,7 +21,8 @@ export class ProtobufService {
 
   constructor(webClient: WebClient) {
     this.webClient = webClient;
-    ProtoController.load();
+
+    this.loadProtobufFiles();
   }
 
   public resetCommands() {
@@ -23,8 +30,8 @@ export class ProtobufService {
     this.pendingCommands = {};
   }
 
-  public sendRoomCommand(roomId: number, roomCmd: any, callback?: Function) {
-    const cmd = ProtoController.root.CommandContainer.create({
+  public sendRoomCommand(roomId: number, roomCmd: number, callback?: Function) {
+    const cmd = this.controller.CommandContainer.create({
       'roomId': roomId,
       'roomCommand': [roomCmd]
     });
@@ -32,38 +39,38 @@ export class ProtobufService {
     this.sendCommand(cmd, raw => callback && callback(raw));
   }
 
-  public sendSessionCommand(sesCmd: any, callback?: Function) {
-    const cmd = ProtoController.root.CommandContainer.create({
+  public sendSessionCommand(sesCmd: number, callback?: Function) {
+    const cmd = this.controller.CommandContainer.create({
       'sessionCommand': [sesCmd]
     });
 
     this.sendCommand(cmd, (raw) => callback && callback(raw));
   }
 
-  public sendModeratorCommand(modCmd: any, callback?: Function) {
-    const cmd = ProtoController.root.CommandContainer.create({
+  public sendModeratorCommand(modCmd: number, callback?: Function) {
+    const cmd = this.controller.CommandContainer.create({
       'moderatorCommand': [modCmd]
     });
 
     this.sendCommand(cmd, (raw) => callback && callback(raw));
   }
 
-  public sendAdminCommand(adminCmd: any, callback?: Function) {
-    const cmd = ProtoController.root.CommandContainer.create({
+  public sendAdminCommand(adminCmd: number, callback?: Function) {
+    const cmd = this.controller.CommandContainer.create({
       'adminCommand': [adminCmd]
     });
 
     this.sendCommand(cmd, (raw) => callback && callback(raw));
   }
 
-  public sendCommand(cmd: any, callback: Function) {
+  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(ProtoController.root.CommandContainer.encode(cmd).finish());
+      this.webClient.socket.send(this.controller.CommandContainer.encode(cmd).finish());
     }
   }
 
@@ -74,20 +81,20 @@ export class ProtobufService {
   public handleMessageEvent({ data }: MessageEvent): void {
     try {
       const uint8msg = new Uint8Array(data);
-      const msg = ProtoController.root.ServerMessage.decode(uint8msg);
+      const msg = this.controller.ServerMessage.decode(uint8msg);
 
       if (msg) {
         switch (msg.messageType) {
-          case ProtoController.root.ServerMessage.MessageType.RESPONSE:
+          case this.controller.ServerMessage.MessageType.RESPONSE:
             this.processServerResponse(msg.response);
             break;
-          case ProtoController.root.ServerMessage.MessageType.ROOM_EVENT:
+          case this.controller.ServerMessage.MessageType.ROOM_EVENT:
             this.processRoomEvent(msg.roomEvent, msg);
             break;
-          case ProtoController.root.ServerMessage.MessageType.SESSION_EVENT:
+          case this.controller.ServerMessage.MessageType.SESSION_EVENT:
             this.processSessionEvent(msg.sessionEvent, msg);
             break;
-          case ProtoController.root.ServerMessage.MessageType.GAME_EVENT_CONTAINER:
+          case this.controller.ServerMessage.MessageType.GAME_EVENT_CONTAINER:
             this.processGameEvent(msg.gameEvent, msg);
             break;
           default:
@@ -135,4 +142,17 @@ export class ProtobufService {
       }
     }
   }
+
+  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/utils/passwordHasher.ts b/webclient/src/websocket/utils/passwordHasher.ts
index 164a91823..77645694f 100644
--- a/webclient/src/websocket/utils/passwordHasher.ts
+++ b/webclient/src/websocket/utils/passwordHasher.ts
@@ -1,6 +1,5 @@
 import sha512 from 'crypto-js/sha512';
 import Base64 from 'crypto-js/enc-base64';
-import { ProtoController } from '../services/ProtoController';
 
 const HASH_ROUNDS = 1_000;
 const SALT_LENGTH = 16;
@@ -26,7 +25,7 @@ export const generateSalt = (): string => {
   return salt;
 }
 
-export const passwordSaltSupported = (serverOptions: number): number => {
+export const passwordSaltSupported = (serverOptions, webClient): number => {
   // Intentional use of Bitwise operator b/c of how Servatrice Enums work
-  return serverOptions & ProtoController.root.Event_ServerIdentification.ServerOptions.SupportsPasswordHash;
+  return serverOptions & webClient.protobuf.controller.Event_ServerIdentification.ServerOptions.SupportsPasswordHash;
 }